From 35d11cc0d2fb97fcf4c2ff1115d5db61399ef054 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 18 Jul 2024 21:35:17 +0300 Subject: [PATCH] server-esm: Change simple local import statements --- electron.ts | 8 +- spec/etapi/app_info.spec.ts | 2 +- spec/etapi/backup.spec.ts | 2 +- spec/etapi/import.spec.ts | 2 +- spec/etapi/notes.spec.ts | 2 +- spec/search/becca_mocking.ts | 10 +- spec/search/lexer.spec.ts | 2 +- spec/search/parser.spec.ts | 6 +- spec/search/search.spec.ts | 14 +-- spec/search/value_extractor.spec.ts | 8 +- src/anonymize.ts | 4 +- src/app.ts | 4 +- src/becca/becca-interface.ts | 26 ++-- src/becca/becca_loader.ts | 26 ++-- src/becca/becca_service.ts | 6 +- src/becca/entities/abstract_becca_entity.ts | 18 +-- src/becca/entities/battachment.ts | 16 +-- src/becca/entities/battribute.ts | 10 +- src/becca/entities/bblob.ts | 2 +- src/becca/entities/bbranch.ts | 14 +-- src/becca/entities/betapi_token.ts | 4 +- src/becca/entities/bnote.ts | 24 ++-- src/becca/entities/boption.ts | 4 +- src/becca/entities/brecent_note.ts | 4 +- src/becca/entities/brevision.ts | 14 +-- src/becca/entity_constructor.ts | 20 +-- src/becca/similarity.ts | 10 +- src/etapi/app_info.ts | 4 +- src/etapi/attachments.ts | 10 +- src/etapi/attributes.ts | 10 +- src/etapi/auth.ts | 8 +- src/etapi/backup.ts | 4 +- src/etapi/branches.ts | 12 +- src/etapi/etapi_utils.ts | 12 +- src/etapi/mappers.ts | 8 +- src/etapi/notes.ts | 24 ++-- src/etapi/special_notes.ts | 8 +- src/etapi/validators.ts | 4 +- src/routes/api/app_info.ts | 2 +- src/routes/api/attachments.ts | 8 +- src/routes/api/attributes.ts | 12 +- src/routes/api/autocomplete.ts | 14 +-- src/routes/api/backend_log.ts | 4 +- src/routes/api/branches.ts | 22 ++-- src/routes/api/bulk_action.ts | 4 +- src/routes/api/clipper.ts | 28 ++--- src/routes/api/cloning.ts | 2 +- src/routes/api/database.ts | 12 +- src/routes/api/etapi_tokens.ts | 2 +- src/routes/api/export.ts | 16 +-- src/routes/api/files.ts | 18 +-- src/routes/api/fonts.ts | 2 +- src/routes/api/image.ts | 8 +- src/routes/api/import.ts | 22 ++-- src/routes/api/keys.ts | 4 +- src/routes/api/login.ts | 24 ++-- src/routes/api/note_map.ts | 8 +- src/routes/api/notes.ts | 22 ++-- src/routes/api/options.ts | 8 +- src/routes/api/other.ts | 4 +- src/routes/api/password.ts | 4 +- src/routes/api/recent_changes.ts | 8 +- src/routes/api/recent_notes.ts | 6 +- src/routes/api/relation-map.ts | 4 +- src/routes/api/revisions.ts | 20 +-- src/routes/api/script.ts | 10 +- src/routes/api/search.ts | 16 +-- src/routes/api/sender.ts | 8 +- src/routes/api/setup.ts | 8 +- src/routes/api/similar_notes.ts | 4 +- src/routes/api/special_notes.ts | 10 +- src/routes/api/sql.ts | 6 +- src/routes/api/stats.ts | 4 +- src/routes/api/sync.ts | 24 ++-- src/routes/api/tree.ts | 8 +- src/routes/assets.ts | 4 +- src/routes/custom.ts | 12 +- src/routes/error_handlers.ts | 2 +- src/routes/index.ts | 22 ++-- src/routes/login.ts | 16 +-- src/routes/routes.ts | 118 +++++++++--------- src/routes/session_parser.ts | 4 +- src/routes/setup.ts | 10 +- src/services/anonymization.ts | 8 +- src/services/app_icon.ts | 8 +- src/services/app_info.ts | 6 +- src/services/app_path.ts | 4 +- src/services/asset_path.ts | 2 +- src/services/attributes.ts | 14 +-- src/services/auth.ts | 14 +-- src/services/backend_script_api.ts | 58 ++++----- src/services/backend_script_api_interface.ts | 4 +- src/services/backup.ts | 14 +-- src/services/blob.ts | 8 +- src/services/branches.ts | 6 +- src/services/bulk_actions.ts | 14 +-- src/services/config.ts | 4 +- src/services/consistency_checks.ts | 28 ++--- src/services/content_hash.ts | 8 +- src/services/date_notes.ts | 18 +-- src/services/date_utils.ts | 2 +- src/services/encryption/data_encryption.ts | 2 +- src/services/encryption/my_scrypt.ts | 2 +- src/services/encryption/password.ts | 10 +- .../encryption/password_encryption.ts | 8 +- src/services/entity_changes.ts | 16 +-- src/services/erase.ts | 16 +-- src/services/etapi_tokens.ts | 6 +- src/services/export/opml.ts | 8 +- src/services/export/single.ts | 10 +- src/services/export/zip.ts | 26 ++-- src/services/handlers.ts | 20 +-- src/services/hidden_subtree.ts | 10 +- src/services/hoisted_note.ts | 4 +- src/services/host.ts | 2 +- src/services/image.ts | 14 +-- src/services/import/enex.ts | 20 +-- src/services/import/markdown.ts | 4 +- src/services/import/opml.ts | 10 +- src/services/import/single.ts | 20 +-- src/services/import/zip.ts | 34 ++--- src/services/instance_id.ts | 2 +- src/services/keyboard_actions.ts | 6 +- src/services/log.ts | 4 +- src/services/meta/note_meta.ts | 4 +- src/services/migration.ts | 14 +-- src/services/notes.ts | 42 +++---- src/services/options.ts | 4 +- src/services/options_init.ts | 12 +- src/services/port.ts | 8 +- src/services/protected_session.ts | 4 +- src/services/request.ts | 6 +- src/services/resource_dir.ts | 2 +- src/services/revisions.ts | 10 +- src/services/scheduler.ts | 18 +-- src/services/script.ts | 10 +- src/services/script_context.ts | 6 +- src/services/search/expressions/ancestor.ts | 10 +- src/services/search/expressions/and.ts | 8 +- .../search/expressions/attribute_exists.ts | 8 +- src/services/search/expressions/child_of.ts | 6 +- .../search/expressions/descendant_of.ts | 8 +- src/services/search/expressions/expression.ts | 4 +- src/services/search/expressions/is_hidden.ts | 6 +- .../search/expressions/label_comparison.ts | 8 +- src/services/search/expressions/not.ts | 6 +- .../expressions/note_content_fulltext.ts | 16 +-- .../search/expressions/note_flat_text.ts | 12 +- src/services/search/expressions/or.ts | 8 +- .../search/expressions/order_by_and_limit.ts | 8 +- src/services/search/expressions/parent_of.ts | 6 +- .../search/expressions/property_comparison.ts | 6 +- .../search/expressions/relation_where.ts | 8 +- src/services/search/expressions/true.ts | 6 +- src/services/search/note_set.ts | 2 +- src/services/search/search_context.ts | 2 +- src/services/search/search_result.ts | 4 +- src/services/search/services/parse.ts | 42 +++---- src/services/search/services/search.ts | 28 ++--- src/services/search/value_extractor.ts | 2 +- src/services/session_secret.ts | 4 +- src/services/setup.ts | 18 +-- src/services/special_notes.ts | 20 +-- src/services/sql.ts | 6 +- src/services/sql_init.ts | 22 ++-- src/services/sync.ts | 34 ++--- src/services/sync_options.ts | 4 +- src/services/sync_update.ts | 12 +- src/services/task_context.ts | 2 +- src/services/tray.ts | 4 +- src/services/tree.ts | 12 +- src/services/window.ts | 14 +-- src/services/ws.ts | 20 +-- src/share/content_renderer.ts | 8 +- src/share/routes.ts | 24 ++-- src/share/shaca/entities/sattachment.ts | 8 +- src/share/shaca/entities/sattribute.ts | 2 +- src/share/shaca/entities/sbranch.ts | 4 +- src/share/shaca/entities/snote.ts | 12 +- src/share/shaca/shaca-interface.ts | 8 +- src/share/shaca/shaca_loader.ts | 18 +-- src/share/sql.ts | 2 +- src/www.ts | 18 +-- webpack.config.ts | 2 +- 184 files changed, 1023 insertions(+), 1023 deletions(-) diff --git a/electron.ts b/electron.ts index 994890537..1872e7167 100644 --- a/electron.ts +++ b/electron.ts @@ -1,10 +1,10 @@ "use strict"; import electron = require('electron'); -import sqlInit = require('./src/services/sql_init'); -import appIconService = require('./src/services/app_icon'); -import windowService = require('./src/services/window'); -import tray = require('./src/services/tray'); +import sqlInit from "./src/services/sql_init.js"; +import appIconService from "./src/services/app_icon.js"; +import windowService from "./src/services/window.js"; +import tray from "./src/services/tray.js"; // Adds debug features like hotkeys for triggering dev tools and reload require('electron-debug')(); diff --git a/spec/etapi/app_info.spec.ts b/spec/etapi/app_info.spec.ts index 536d77df8..6ba049357 100644 --- a/spec/etapi/app_info.spec.ts +++ b/spec/etapi/app_info.spec.ts @@ -1,4 +1,4 @@ -import etapi = require('../support/etapi'); +import etapi from "../support/etapi.js"; etapi.describeEtapi("app_info", () => { it("get", async () => { diff --git a/spec/etapi/backup.spec.ts b/spec/etapi/backup.spec.ts index 56ef63827..2f9532f71 100644 --- a/spec/etapi/backup.spec.ts +++ b/spec/etapi/backup.spec.ts @@ -1,4 +1,4 @@ -import etapi = require('../support/etapi'); +import etapi from "../support/etapi.js"; etapi.describeEtapi("backup", () => { it("create", async () => { diff --git a/spec/etapi/import.spec.ts b/spec/etapi/import.spec.ts index 1f70eaf31..735e328d1 100644 --- a/spec/etapi/import.spec.ts +++ b/spec/etapi/import.spec.ts @@ -1,4 +1,4 @@ -import etapi = require('../support/etapi'); +import etapi from "../support/etapi.js"; import fs = require('fs'); import path = require('path'); diff --git a/spec/etapi/notes.spec.ts b/spec/etapi/notes.spec.ts index 1b4774d66..8fcfc4c77 100644 --- a/spec/etapi/notes.spec.ts +++ b/spec/etapi/notes.spec.ts @@ -1,5 +1,5 @@ import crypto = require('crypto'); -import etapi = require('../support/etapi'); +import etapi from "../support/etapi.js"; etapi.describeEtapi("notes", () => { it("create", async () => { diff --git a/spec/search/becca_mocking.ts b/spec/search/becca_mocking.ts index a39a81162..984ea2940 100644 --- a/spec/search/becca_mocking.ts +++ b/spec/search/becca_mocking.ts @@ -1,9 +1,9 @@ -import BNote = require('../../src/becca/entities/bnote'); -import BBranch = require('../../src/becca/entities/bbranch'); -import BAttribute = require('../../src/becca/entities/battribute'); -import becca = require('../../src/becca/becca'); +import BNote from "../../src/becca/entities/bnote.js"; +import BBranch from "../../src/becca/entities/bbranch.js"; +import BAttribute from "../../src/becca/entities/battribute.js"; +import becca from "../../src/becca/becca.js"; import randtoken = require('rand-token'); -import SearchResult = require('../../src/services/search/search_result'); +import SearchResult from "../../src/services/search/search_result.js"; import { NoteType } from "../../src/becca/entities/rows"; randtoken.generator({ source: "crypto" }); diff --git a/spec/search/lexer.spec.ts b/spec/search/lexer.spec.ts index 553140538..d97f435c3 100644 --- a/spec/search/lexer.spec.ts +++ b/spec/search/lexer.spec.ts @@ -1,4 +1,4 @@ -import lex = require('../../src/services/search/services/lex'); +import lex from "../../src/services/search/services/lex.js"; describe("Lexer fulltext", () => { it("simple lexing", () => { diff --git a/spec/search/parser.spec.ts b/spec/search/parser.spec.ts index d8ba2d7a6..003036664 100644 --- a/spec/search/parser.spec.ts +++ b/spec/search/parser.spec.ts @@ -2,9 +2,9 @@ // There are many issues with the types of the parser e.g. "parse" function returns "Expression" // but we access properties like "subExpressions" which is not defined in the "Expression" class. -import Expression = require('../../src/services/search/expressions/expression'); -import SearchContext = require('../../src/services/search/search_context'); -import parse = require('../../src/services/search/services/parse'); +import Expression from "../../src/services/search/expressions/expression.js"; +import SearchContext from "../../src/services/search/search_context.js"; +import parse from "../../src/services/search/services/parse.js"; function tokens(toks: Array, cur = 0): Array { return toks.map((arg) => { diff --git a/spec/search/search.spec.ts b/spec/search/search.spec.ts index c7f142b04..45c0f3acd 100644 --- a/spec/search/search.spec.ts +++ b/spec/search/search.spec.ts @@ -1,11 +1,11 @@ -import searchService = require('../../src/services/search/services/search'); -import BNote = require('../../src/becca/entities/bnote'); -import BBranch = require('../../src/becca/entities/bbranch'); -import SearchContext = require('../../src/services/search/search_context'); -import dateUtils = require('../../src/services/date_utils'); -import becca = require('../../src/becca/becca'); +import searchService from "../../src/services/search/services/search.js"; +import BNote from "../../src/becca/entities/bnote.js"; +import BBranch from "../../src/becca/entities/bbranch.js"; +import SearchContext from "../../src/services/search/search_context.js"; +import dateUtils from "../../src/services/date_utils.js"; +import becca from "../../src/becca/becca.js"; // const { NoteBuilder, findNoteByTitle, note } = require('./becca_mocking'); -import becca_mocking = require('./becca_mocking'); +import becca_mocking from "./becca_mocking.js"; describe('Search', () => { let rootNote: any; diff --git a/spec/search/value_extractor.spec.ts b/spec/search/value_extractor.spec.ts index 28343bab8..1672ddbb6 100644 --- a/spec/search/value_extractor.spec.ts +++ b/spec/search/value_extractor.spec.ts @@ -1,7 +1,7 @@ -import becca_mocking = require('./becca_mocking'); -import ValueExtractor = require('../../src/services/search/value_extractor'); -import becca = require('../../src/becca/becca'); -import SearchContext = require('../../src/services/search/search_context'); +import becca_mocking from "./becca_mocking.js"; +import ValueExtractor from "../../src/services/search/value_extractor.js"; +import becca from "../../src/becca/becca.js"; +import SearchContext from "../../src/services/search/search_context.js"; const dsc = new SearchContext(); diff --git a/src/anonymize.ts b/src/anonymize.ts index cd449e479..89f9d2d0c 100644 --- a/src/anonymize.ts +++ b/src/anonymize.ts @@ -1,5 +1,5 @@ -import anonymizationService = require('./services/anonymization'); -import sqlInit = require('./services/sql_init'); +import anonymizationService from "./services/anonymization.js"; +import sqlInit from "./services/sql_init.js"; require('./becca/entity_constructor'); sqlInit.dbReady.then(async () => { diff --git a/src/app.ts b/src/app.ts index ceabe33f9..ebda1a44c 100644 --- a/src/app.ts +++ b/src/app.ts @@ -4,8 +4,8 @@ import favicon = require('serve-favicon'); import cookieParser = require('cookie-parser'); import helmet = require('helmet'); import compression = require('compression'); -import sessionParser = require('./routes/session_parser'); -import utils = require('./services/utils'); +import sessionParser from "./routes/session_parser.js"; +import utils from "./services/utils.js"; require('./services/handlers'); require('./becca/becca_loader'); diff --git a/src/becca/becca-interface.ts b/src/becca/becca-interface.ts index 21892676d..09ae01959 100644 --- a/src/becca/becca-interface.ts +++ b/src/becca/becca-interface.ts @@ -1,17 +1,17 @@ -import sql = require('../services/sql'); -import NoteSet = require('../services/search/note_set'); -import NotFoundError = require('../errors/not_found_error'); -import BOption = require('./entities/boption'); -import BNote = require('./entities/bnote'); -import BEtapiToken = require('./entities/betapi_token'); -import BAttribute = require('./entities/battribute'); -import BBranch = require('./entities/bbranch'); -import BRevision = require('./entities/brevision'); -import BAttachment = require('./entities/battachment'); +import sql from "../services/sql.js"; +import NoteSet from "../services/search/note_set.js"; +import NotFoundError from "../errors/not_found_error.js"; +import BOption from "./entities/boption.js"; +import BNote from "./entities/bnote.js"; +import BEtapiToken from "./entities/betapi_token.js"; +import BAttribute from "./entities/battribute.js"; +import BBranch from "./entities/bbranch.js"; +import BRevision from "./entities/brevision.js"; +import BAttachment from "./entities/battachment.js"; import { AttachmentRow, RevisionRow } from './entities/rows'; -import BBlob = require('./entities/bblob'); -import BRecentNote = require('./entities/brecent_note'); -import AbstractBeccaEntity = require('./entities/abstract_becca_entity'); +import BBlob from "./entities/bblob.js"; +import BRecentNote from "./entities/brecent_note.js"; +import AbstractBeccaEntity from "./entities/abstract_becca_entity.js"; interface AttachmentOpts { includeContentLength?: boolean; diff --git a/src/becca/becca_loader.ts b/src/becca/becca_loader.ts index b7ea941c8..24eb1ca21 100644 --- a/src/becca/becca_loader.ts +++ b/src/becca/becca_loader.ts @@ -1,19 +1,19 @@ "use strict"; -import sql = require('../services/sql'); -import eventService = require('../services/events'); -import becca = require('./becca'); -import sqlInit = require('../services/sql_init'); -import log = require('../services/log'); -import BNote = require('./entities/bnote'); -import BBranch = require('./entities/bbranch'); -import BAttribute = require('./entities/battribute'); -import BOption = require('./entities/boption'); -import BEtapiToken = require('./entities/betapi_token'); -import cls = require('../services/cls'); -import entityConstructor = require('../becca/entity_constructor'); +import sql from "../services/sql.js"; +import eventService from "../services/events.js"; +import becca from "./becca.js"; +import sqlInit from "../services/sql_init.js"; +import log from "../services/log.js"; +import BNote from "./entities/bnote.js"; +import BBranch from "./entities/bbranch.js"; +import BAttribute from "./entities/battribute.js"; +import BOption from "./entities/boption.js"; +import BEtapiToken from "./entities/betapi_token.js"; +import cls from "../services/cls.js"; +import entityConstructor from "../becca/entity_constructor.js"; import { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from './entities/rows'; -import AbstractBeccaEntity = require('./entities/abstract_becca_entity'); +import AbstractBeccaEntity from "./entities/abstract_becca_entity.js"; const beccaLoaded = new Promise((res, rej) => { sqlInit.dbReady.then(() => { diff --git a/src/becca/becca_service.ts b/src/becca/becca_service.ts index 2a9eb2781..0643f87ea 100644 --- a/src/becca/becca_service.ts +++ b/src/becca/becca_service.ts @@ -1,8 +1,8 @@ "use strict"; -import becca = require('./becca'); -import cls = require('../services/cls'); -import log = require('../services/log'); +import becca from "./becca.js"; +import cls from "../services/cls.js"; +import log from "../services/log.js"; function isNotePathArchived(notePath: string[]) { const noteId = notePath[notePath.length - 1]; diff --git a/src/becca/entities/abstract_becca_entity.ts b/src/becca/entities/abstract_becca_entity.ts index ad4eeae03..80a4a1bee 100644 --- a/src/becca/entities/abstract_becca_entity.ts +++ b/src/becca/entities/abstract_becca_entity.ts @@ -1,14 +1,14 @@ "use strict"; -import utils = require('../../services/utils'); -import sql = require('../../services/sql'); -import entityChangesService = require('../../services/entity_changes'); -import eventService = require('../../services/events'); -import dateUtils = require('../../services/date_utils'); -import cls = require('../../services/cls'); -import log = require('../../services/log'); -import protectedSessionService = require('../../services/protected_session'); -import blobService = require('../../services/blob'); +import utils from "../../services/utils.js"; +import sql from "../../services/sql.js"; +import entityChangesService from "../../services/entity_changes.js"; +import eventService from "../../services/events.js"; +import dateUtils from "../../services/date_utils.js"; +import cls from "../../services/cls.js"; +import log from "../../services/log.js"; +import protectedSessionService from "../../services/protected_session.js"; +import blobService from "../../services/blob.js"; import Becca, { ConstructorData } from '../becca-interface'; let becca: Becca; diff --git a/src/becca/entities/battachment.ts b/src/becca/entities/battachment.ts index 09f026ff0..9e7b60209 100644 --- a/src/becca/entities/battachment.ts +++ b/src/becca/entities/battachment.ts @@ -1,14 +1,14 @@ "use strict"; -import utils = require('../../services/utils'); -import dateUtils = require('../../services/date_utils'); -import AbstractBeccaEntity = require('./abstract_becca_entity'); -import sql = require('../../services/sql'); -import protectedSessionService = require('../../services/protected_session'); -import log = require('../../services/log'); +import utils from "../../services/utils.js"; +import dateUtils from "../../services/date_utils.js"; +import AbstractBeccaEntity from "./abstract_becca_entity.js"; +import sql from "../../services/sql.js"; +import protectedSessionService from "../../services/protected_session.js"; +import log from "../../services/log.js"; import { AttachmentRow } from './rows'; -import BNote = require('./bnote'); -import BBranch = require('./bbranch'); +import BNote from "./bnote.js"; +import BBranch from "./bbranch.js"; const attachmentRoleToNoteTypeMapping = { 'image': 'image', diff --git a/src/becca/entities/battribute.ts b/src/becca/entities/battribute.ts index 6ad1965ed..2c37b8228 100644 --- a/src/becca/entities/battribute.ts +++ b/src/becca/entities/battribute.ts @@ -1,10 +1,10 @@ "use strict"; -import BNote = require('./bnote'); -import AbstractBeccaEntity = require('./abstract_becca_entity'); -import dateUtils = require('../../services/date_utils'); -import promotedAttributeDefinitionParser = require('../../services/promoted_attribute_definition_parser'); -import sanitizeAttributeName = require('../../services/sanitize_attribute_name'); +import BNote from "./bnote.js"; +import AbstractBeccaEntity from "./abstract_becca_entity.js"; +import dateUtils from "../../services/date_utils.js"; +import promotedAttributeDefinitionParser from "../../services/promoted_attribute_definition_parser.js"; +import sanitizeAttributeName from "../../services/sanitize_attribute_name.js"; import { AttributeRow, AttributeType } from './rows'; interface SavingOpts { diff --git a/src/becca/entities/bblob.ts b/src/becca/entities/bblob.ts index bb0e2f80e..122afb92e 100644 --- a/src/becca/entities/bblob.ts +++ b/src/becca/entities/bblob.ts @@ -1,4 +1,4 @@ -import AbstractBeccaEntity = require('./abstract_becca_entity'); +import AbstractBeccaEntity from "./abstract_becca_entity.js"; import { BlobRow } from "./rows"; // TODO: Why this does not extend the abstract becca? diff --git a/src/becca/entities/bbranch.ts b/src/becca/entities/bbranch.ts index 0f904de92..cb974ac9a 100644 --- a/src/becca/entities/bbranch.ts +++ b/src/becca/entities/bbranch.ts @@ -1,12 +1,12 @@ "use strict"; -import BNote = require('./bnote'); -import AbstractBeccaEntity = require('./abstract_becca_entity'); -import dateUtils = require('../../services/date_utils'); -import utils = require('../../services/utils'); -import TaskContext = require('../../services/task_context'); -import cls = require('../../services/cls'); -import log = require('../../services/log'); +import BNote from "./bnote.js"; +import AbstractBeccaEntity from "./abstract_becca_entity.js"; +import dateUtils from "../../services/date_utils.js"; +import utils from "../../services/utils.js"; +import TaskContext from "../../services/task_context.js"; +import cls from "../../services/cls.js"; +import log from "../../services/log.js"; import { BranchRow } from './rows'; /** diff --git a/src/becca/entities/betapi_token.ts b/src/becca/entities/betapi_token.ts index 390b580bd..b6f6f01e9 100644 --- a/src/becca/entities/betapi_token.ts +++ b/src/becca/entities/betapi_token.ts @@ -2,8 +2,8 @@ import { EtapiTokenRow } from "./rows"; -import dateUtils = require('../../services/date_utils'); -import AbstractBeccaEntity = require('./abstract_becca_entity'); +import dateUtils from "../../services/date_utils.js"; +import AbstractBeccaEntity from "./abstract_becca_entity.js"; /** * EtapiToken is an entity representing token used to authenticate against Trilium REST API from client applications. diff --git a/src/becca/entities/bnote.ts b/src/becca/entities/bnote.ts index bcf5f0aa3..1c8d229a5 100644 --- a/src/becca/entities/bnote.ts +++ b/src/becca/entities/bnote.ts @@ -1,20 +1,20 @@ "use strict"; -import protectedSessionService = require('../../services/protected_session'); -import log = require('../../services/log'); -import sql = require('../../services/sql'); -import utils = require('../../services/utils'); -import dateUtils = require('../../services/date_utils'); -import AbstractBeccaEntity = require('./abstract_becca_entity'); -import BRevision = require('./brevision'); -import BAttachment = require('./battachment'); -import TaskContext = require('../../services/task_context'); +import protectedSessionService from "../../services/protected_session.js"; +import log from "../../services/log.js"; +import sql from "../../services/sql.js"; +import utils from "../../services/utils.js"; +import dateUtils from "../../services/date_utils.js"; +import AbstractBeccaEntity from "./abstract_becca_entity.js"; +import BRevision from "./brevision.js"; +import BAttachment from "./battachment.js"; +import TaskContext from "../../services/task_context.js"; import dayjs = require('dayjs'); import utc = require('dayjs/plugin/utc'); -import eventService = require('../../services/events'); +import eventService from "../../services/events.js"; import { AttachmentRow, NoteRow, NoteType, RevisionRow } from './rows'; -import BBranch = require('./bbranch'); -import BAttribute = require('./battribute'); +import BBranch from "./bbranch.js"; +import BAttribute from "./battribute.js"; import { NotePojo } from '../becca-interface'; dayjs.extend(utc); diff --git a/src/becca/entities/boption.ts b/src/becca/entities/boption.ts index 48abee024..64ffeea58 100644 --- a/src/becca/entities/boption.ts +++ b/src/becca/entities/boption.ts @@ -1,7 +1,7 @@ "use strict"; -import dateUtils = require('../../services/date_utils'); -import AbstractBeccaEntity = require('./abstract_becca_entity'); +import dateUtils from "../../services/date_utils.js"; +import AbstractBeccaEntity from "./abstract_becca_entity.js"; import { OptionRow } from './rows'; /** diff --git a/src/becca/entities/brecent_note.ts b/src/becca/entities/brecent_note.ts index c19a83603..108c652bd 100644 --- a/src/becca/entities/brecent_note.ts +++ b/src/becca/entities/brecent_note.ts @@ -2,8 +2,8 @@ import { RecentNoteRow } from "./rows"; -import dateUtils = require('../../services/date_utils'); -import AbstractBeccaEntity = require('./abstract_becca_entity'); +import dateUtils from "../../services/date_utils.js"; +import AbstractBeccaEntity from "./abstract_becca_entity.js"; /** * RecentNote represents recently visited note. diff --git a/src/becca/entities/brevision.ts b/src/becca/entities/brevision.ts index 52714cd73..d17a49b60 100644 --- a/src/becca/entities/brevision.ts +++ b/src/becca/entities/brevision.ts @@ -1,12 +1,12 @@ "use strict"; -import protectedSessionService = require('../../services/protected_session'); -import utils = require('../../services/utils'); -import dateUtils = require('../../services/date_utils'); -import becca = require('../becca'); -import AbstractBeccaEntity = require('./abstract_becca_entity'); -import sql = require('../../services/sql'); -import BAttachment = require('./battachment'); +import protectedSessionService from "../../services/protected_session.js"; +import utils from "../../services/utils.js"; +import dateUtils from "../../services/date_utils.js"; +import becca from "../becca.js"; +import AbstractBeccaEntity from "./abstract_becca_entity.js"; +import sql from "../../services/sql.js"; +import BAttachment from "./battachment.js"; import { AttachmentRow, RevisionRow } from './rows'; interface ContentOpts { diff --git a/src/becca/entity_constructor.ts b/src/becca/entity_constructor.ts index 01c51363a..7c5bb8d38 100644 --- a/src/becca/entity_constructor.ts +++ b/src/becca/entity_constructor.ts @@ -1,14 +1,14 @@ import { ConstructorData } from './becca-interface'; -import AbstractBeccaEntity = require('./entities/abstract_becca_entity'); -import BAttachment = require('./entities/battachment'); -import BAttribute = require('./entities/battribute'); -import BBlob = require('./entities/bblob'); -import BBranch = require('./entities/bbranch'); -import BEtapiToken = require('./entities/betapi_token'); -import BNote = require('./entities/bnote'); -import BOption = require('./entities/boption'); -import BRecentNote = require('./entities/brecent_note'); -import BRevision = require('./entities/brevision'); +import AbstractBeccaEntity from "./entities/abstract_becca_entity.js"; +import BAttachment from "./entities/battachment.js"; +import BAttribute from "./entities/battribute.js"; +import BBlob from "./entities/bblob.js"; +import BBranch from "./entities/bbranch.js"; +import BEtapiToken from "./entities/betapi_token.js"; +import BNote from "./entities/bnote.js"; +import BOption from "./entities/boption.js"; +import BRecentNote from "./entities/brecent_note.js"; +import BRevision from "./entities/brevision.js"; type EntityClass = new (row?: any) => AbstractBeccaEntity; diff --git a/src/becca/similarity.ts b/src/becca/similarity.ts index e6721d0df..baf4f2e78 100644 --- a/src/becca/similarity.ts +++ b/src/becca/similarity.ts @@ -1,9 +1,9 @@ -import becca = require('./becca'); -import log = require('../services/log'); -import beccaService = require('./becca_service'); -import dateUtils = require('../services/date_utils'); +import becca from "./becca.js"; +import log from "../services/log.js"; +import beccaService from "./becca_service.js"; +import dateUtils from "../services/date_utils.js"; import { JSDOM } from "jsdom"; -import BNote = require('./entities/bnote'); +import BNote from "./entities/bnote.js"; const DEBUG = false; diff --git a/src/etapi/app_info.ts b/src/etapi/app_info.ts index 81830fec2..325725871 100644 --- a/src/etapi/app_info.ts +++ b/src/etapi/app_info.ts @@ -1,6 +1,6 @@ import { Router } from 'express'; -import appInfo = require('../services/app_info'); -import eu = require('./etapi_utils'); +import appInfo from "../services/app_info.js"; +import eu from "./etapi_utils.js"; function register(router: Router) { eu.route(router, 'get', '/etapi/app-info', (req, res, next) => { diff --git a/src/etapi/attachments.ts b/src/etapi/attachments.ts index 802e9975f..bb92f7375 100644 --- a/src/etapi/attachments.ts +++ b/src/etapi/attachments.ts @@ -1,8 +1,8 @@ -import becca = require('../becca/becca'); -import eu = require('./etapi_utils'); -import mappers = require('./mappers'); -import v = require('./validators'); -import utils = require('../services/utils'); +import becca from "../becca/becca.js"; +import eu from "./etapi_utils.js"; +import mappers from "./mappers.js"; +import v from "./validators.js"; +import utils from "../services/utils.js"; import { Router } from 'express'; import { AttachmentRow } from '../becca/entities/rows'; import { ValidatorMap } from './etapi-interface'; diff --git a/src/etapi/attributes.ts b/src/etapi/attributes.ts index 59865da62..b9eaa2ed5 100644 --- a/src/etapi/attributes.ts +++ b/src/etapi/attributes.ts @@ -1,8 +1,8 @@ -import becca = require('../becca/becca'); -import eu = require('./etapi_utils'); -import mappers = require('./mappers'); -import attributeService = require('../services/attributes'); -import v = require('./validators'); +import becca from "../becca/becca.js"; +import eu from "./etapi_utils.js"; +import mappers from "./mappers.js"; +import attributeService from "../services/attributes.js"; +import v from "./validators.js"; import { Router } from 'express'; import { AttributeRow } from '../becca/entities/rows'; import { ValidatorMap } from './etapi-interface'; diff --git a/src/etapi/auth.ts b/src/etapi/auth.ts index e6c440e52..dafb8af3e 100644 --- a/src/etapi/auth.ts +++ b/src/etapi/auth.ts @@ -1,7 +1,7 @@ -import becca = require('../becca/becca'); -import eu = require('./etapi_utils'); -import passwordEncryptionService = require('../services/encryption/password_encryption'); -import etapiTokenService = require('../services/etapi_tokens'); +import becca from "../becca/becca.js"; +import eu from "./etapi_utils.js"; +import passwordEncryptionService from "../services/encryption/password_encryption.js"; +import etapiTokenService from "../services/etapi_tokens.js"; import { RequestHandler, Router } from 'express'; function register(router: Router, loginMiddleware: RequestHandler[]) { diff --git a/src/etapi/backup.ts b/src/etapi/backup.ts index 50c2bd49c..e8ed2a0e2 100644 --- a/src/etapi/backup.ts +++ b/src/etapi/backup.ts @@ -1,7 +1,7 @@ import { Router } from "express"; -import eu = require('./etapi_utils'); -import backupService = require('../services/backup'); +import eu from "./etapi_utils.js"; +import backupService from "../services/backup.js"; function register(router: Router) { eu.route(router, 'put', '/etapi/backup/:backupName', async (req, res, next) => { diff --git a/src/etapi/branches.ts b/src/etapi/branches.ts index d41a5857b..6b4a0cdc3 100644 --- a/src/etapi/branches.ts +++ b/src/etapi/branches.ts @@ -1,11 +1,11 @@ import { Router } from "express"; -import becca = require('../becca/becca'); -import eu = require('./etapi_utils'); -import mappers = require('./mappers'); -import BBranch = require('../becca/entities/bbranch'); -import entityChangesService = require('../services/entity_changes'); -import v = require('./validators'); +import becca from "../becca/becca.js"; +import eu from "./etapi_utils.js"; +import mappers from "./mappers.js"; +import BBranch from "../becca/entities/bbranch.js"; +import entityChangesService from "../services/entity_changes.js"; +import v from "./validators.js"; import { BranchRow } from "../becca/entities/rows"; function register(router: Router) { diff --git a/src/etapi/etapi_utils.ts b/src/etapi/etapi_utils.ts index 9799deef0..38681c093 100644 --- a/src/etapi/etapi_utils.ts +++ b/src/etapi/etapi_utils.ts @@ -1,9 +1,9 @@ -import cls = require('../services/cls'); -import sql = require('../services/sql'); -import log = require('../services/log'); -import becca = require('../becca/becca'); -import etapiTokenService = require('../services/etapi_tokens'); -import config = require('../services/config'); +import cls from "../services/cls.js"; +import sql from "../services/sql.js"; +import log from "../services/log.js"; +import becca from "../becca/becca.js"; +import etapiTokenService from "../services/etapi_tokens.js"; +import config from "../services/config.js"; import { NextFunction, Request, RequestHandler, Response, Router } from 'express'; import { AppRequest, AppRequestHandler } from '../routes/route-interface'; import { ValidatorMap } from './etapi-interface'; diff --git a/src/etapi/mappers.ts b/src/etapi/mappers.ts index b7cbc9f8d..80bd65bc2 100644 --- a/src/etapi/mappers.ts +++ b/src/etapi/mappers.ts @@ -1,7 +1,7 @@ -import BAttachment = require('../becca/entities/battachment'); -import BAttribute = require('../becca/entities/battribute'); -import BBranch = require('../becca/entities/bbranch'); -import BNote = require('../becca/entities/bnote'); +import BAttachment from "../becca/entities/battachment.js"; +import BAttribute from "../becca/entities/battribute.js"; +import BBranch from "../becca/entities/bbranch.js"; +import BNote from "../becca/entities/bnote.js"; function mapNoteToPojo(note: BNote) { return { diff --git a/src/etapi/notes.ts b/src/etapi/notes.ts index 62263983f..30007f993 100644 --- a/src/etapi/notes.ts +++ b/src/etapi/notes.ts @@ -1,19 +1,19 @@ -import becca = require('../becca/becca'); -import utils = require('../services/utils'); -import eu = require('./etapi_utils'); -import mappers = require('./mappers'); -import noteService = require('../services/notes'); -import TaskContext = require('../services/task_context'); -import v = require('./validators'); -import searchService = require('../services/search/services/search'); -import SearchContext = require('../services/search/search_context'); -import zipExportService = require('../services/export/zip'); -import zipImportService = require('../services/import/zip'); +import becca from "../becca/becca.js"; +import utils from "../services/utils.js"; +import eu from "./etapi_utils.js"; +import mappers from "./mappers.js"; +import noteService from "../services/notes.js"; +import TaskContext from "../services/task_context.js"; +import v from "./validators.js"; +import searchService from "../services/search/services/search.js"; +import SearchContext from "../services/search/search_context.js"; +import zipExportService from "../services/export/zip.js"; +import zipImportService from "../services/import/zip.js"; import { Router } from 'express'; import { AppRequest } from '../routes/route-interface'; import { ParsedQs } from 'qs'; import { NoteParams } from '../services/note-interface'; -import BNote = require('../becca/entities/bnote'); +import BNote from "../becca/entities/bnote.js"; import { SearchParams } from '../services/search/services/types'; import { ValidatorMap } from './etapi-interface'; diff --git a/src/etapi/special_notes.ts b/src/etapi/special_notes.ts index 4de5d77df..e3dd87c34 100644 --- a/src/etapi/special_notes.ts +++ b/src/etapi/special_notes.ts @@ -1,7 +1,7 @@ -import specialNotesService = require('../services/special_notes'); -import dateNotesService = require('../services/date_notes'); -import eu = require('./etapi_utils'); -import mappers = require('./mappers'); +import specialNotesService from "../services/special_notes.js"; +import dateNotesService from "../services/date_notes.js"; +import eu from "./etapi_utils.js"; +import mappers from "./mappers.js"; import { Router } from 'express'; const getDateInvalidError = (date: string) => new eu.EtapiError(400, "DATE_INVALID", `Date "${date}" is not valid.`); diff --git a/src/etapi/validators.ts b/src/etapi/validators.ts index ce6935c7c..f45c36bc9 100644 --- a/src/etapi/validators.ts +++ b/src/etapi/validators.ts @@ -1,5 +1,5 @@ -import noteTypeService = require('../services/note_types'); -import dateUtils = require('../services/date_utils'); +import noteTypeService from "../services/note_types.js"; +import dateUtils from "../services/date_utils.js"; function mandatory(obj: unknown) { if (obj === undefined) { diff --git a/src/routes/api/app_info.ts b/src/routes/api/app_info.ts index 66a9bc366..988c832ac 100644 --- a/src/routes/api/app_info.ts +++ b/src/routes/api/app_info.ts @@ -1,6 +1,6 @@ "use strict"; -import appInfo = require('../../services/app_info'); +import appInfo from "../../services/app_info.js"; function getAppInfo() { return appInfo; diff --git a/src/routes/api/attachments.ts b/src/routes/api/attachments.ts index 8ccbefc85..5f7586ded 100644 --- a/src/routes/api/attachments.ts +++ b/src/routes/api/attachments.ts @@ -1,7 +1,7 @@ -import becca = require('../../becca/becca'); -import blobService = require('../../services/blob'); -import ValidationError = require('../../errors/validation_error'); -import imageService = require('../../services/image'); +import becca from "../../becca/becca.js"; +import blobService from "../../services/blob.js"; +import ValidationError from "../../errors/validation_error.js"; +import imageService from "../../services/image.js"; import { Request } from 'express'; function getAttachmentBlob(req: Request) { diff --git a/src/routes/api/attributes.ts b/src/routes/api/attributes.ts index e66906f37..593417bf9 100644 --- a/src/routes/api/attributes.ts +++ b/src/routes/api/attributes.ts @@ -1,11 +1,11 @@ "use strict"; -import sql = require('../../services/sql'); -import log = require('../../services/log'); -import attributeService = require('../../services/attributes'); -import BAttribute = require('../../becca/entities/battribute'); -import becca = require('../../becca/becca'); -import ValidationError = require('../../errors/validation_error'); +import sql from "../../services/sql.js"; +import log from "../../services/log.js"; +import attributeService from "../../services/attributes.js"; +import BAttribute from "../../becca/entities/battribute.js"; +import becca from "../../becca/becca.js"; +import ValidationError from "../../errors/validation_error.js"; import { Request } from 'express'; function getEffectiveNoteAttributes(req: Request) { diff --git a/src/routes/api/autocomplete.ts b/src/routes/api/autocomplete.ts index 0aaa3f537..0a45b7806 100644 --- a/src/routes/api/autocomplete.ts +++ b/src/routes/api/autocomplete.ts @@ -1,13 +1,13 @@ "use strict"; -import beccaService = require('../../becca/becca_service'); -import searchService = require('../../services/search/services/search'); -import log = require('../../services/log'); -import utils = require('../../services/utils'); -import cls = require('../../services/cls'); -import becca = require('../../becca/becca'); +import beccaService from "../../becca/becca_service.js"; +import searchService from "../../services/search/services/search.js"; +import log from "../../services/log.js"; +import utils from "../../services/utils.js"; +import cls from "../../services/cls.js"; +import becca from "../../becca/becca.js"; import { Request } from 'express'; -import ValidationError = require('../../errors/validation_error'); +import ValidationError from "../../errors/validation_error.js"; function getAutocomplete(req: Request) { if (typeof req.query.query !== "string") { diff --git a/src/routes/api/backend_log.ts b/src/routes/api/backend_log.ts index a4dbac9ab..d55602e13 100644 --- a/src/routes/api/backend_log.ts +++ b/src/routes/api/backend_log.ts @@ -1,8 +1,8 @@ "use strict"; import fs = require('fs'); -import dateUtils = require('../../services/date_utils'); -import dataDir = require('../../services/data_dir'); +import dateUtils from "../../services/date_utils.js"; +import dataDir from "../../services/data_dir.js"; const { LOG_DIR } = dataDir; function getBackendLog() { diff --git a/src/routes/api/branches.ts b/src/routes/api/branches.ts index 102ffde7d..67b50211e 100644 --- a/src/routes/api/branches.ts +++ b/src/routes/api/branches.ts @@ -1,16 +1,16 @@ "use strict"; -import sql = require('../../services/sql'); -import utils = require('../../services/utils'); -import entityChangesService = require('../../services/entity_changes'); -import treeService = require('../../services/tree'); -import eraseService = require('../../services/erase'); -import becca = require('../../becca/becca'); -import TaskContext = require('../../services/task_context'); -import branchService = require('../../services/branches'); -import log = require('../../services/log'); -import ValidationError = require('../../errors/validation_error'); -import eventService = require('../../services/events'); +import sql from "../../services/sql.js"; +import utils from "../../services/utils.js"; +import entityChangesService from "../../services/entity_changes.js"; +import treeService from "../../services/tree.js"; +import eraseService from "../../services/erase.js"; +import becca from "../../becca/becca.js"; +import TaskContext from "../../services/task_context.js"; +import branchService from "../../services/branches.js"; +import log from "../../services/log.js"; +import ValidationError from "../../errors/validation_error.js"; +import eventService from "../../services/events.js"; import { Request } from 'express'; /** diff --git a/src/routes/api/bulk_action.ts b/src/routes/api/bulk_action.ts index 4d1a3e98f..adbc15d32 100644 --- a/src/routes/api/bulk_action.ts +++ b/src/routes/api/bulk_action.ts @@ -1,6 +1,6 @@ import { Request } from 'express'; -import becca = require('../../becca/becca'); -import bulkActionService = require('../../services/bulk_actions'); +import becca from "../../becca/becca.js"; +import bulkActionService from "../../services/bulk_actions.js"; function execute(req: Request) { const {noteIds, includeDescendants} = req.body; diff --git a/src/routes/api/clipper.ts b/src/routes/api/clipper.ts index c8c635633..31926afb0 100644 --- a/src/routes/api/clipper.ts +++ b/src/routes/api/clipper.ts @@ -2,22 +2,22 @@ import { Request } from "express"; -import attributeService = require('../../services/attributes'); -import cloneService = require('../../services/cloning'); -import noteService = require('../../services/notes'); -import dateNoteService = require('../../services/date_notes'); -import dateUtils = require('../../services/date_utils'); -import imageService = require('../../services/image'); -import appInfo = require('../../services/app_info'); -import ws = require('../../services/ws'); -import log = require('../../services/log'); -import utils = require('../../services/utils'); +import attributeService from "../../services/attributes.js"; +import cloneService from "../../services/cloning.js"; +import noteService from "../../services/notes.js"; +import dateNoteService from "../../services/date_notes.js"; +import dateUtils from "../../services/date_utils.js"; +import imageService from "../../services/image.js"; +import appInfo from "../../services/app_info.js"; +import ws from "../../services/ws.js"; +import log from "../../services/log.js"; +import utils from "../../services/utils.js"; import path = require('path'); -import htmlSanitizer = require('../../services/html_sanitizer'); -import attributeFormatter = require('../../services/attribute_formatter'); +import htmlSanitizer from "../../services/html_sanitizer.js"; +import attributeFormatter from "../../services/attribute_formatter.js"; import jsdom = require('jsdom'); -import BNote = require('../../becca/entities/bnote'); -import ValidationError = require('../../errors/validation_error'); +import BNote from "../../becca/entities/bnote.js"; +import ValidationError from "../../errors/validation_error.js"; const { JSDOM } = jsdom; interface Image { diff --git a/src/routes/api/cloning.ts b/src/routes/api/cloning.ts index 8ab02900d..e6f9c16cc 100644 --- a/src/routes/api/cloning.ts +++ b/src/routes/api/cloning.ts @@ -1,7 +1,7 @@ "use strict"; import { Request } from 'express'; -import cloningService = require('../../services/cloning'); +import cloningService from "../../services/cloning.js"; function cloneNoteToBranch(req: Request) { const {noteId, parentBranchId} = req.params; diff --git a/src/routes/api/database.ts b/src/routes/api/database.ts index 199862b41..660afab47 100644 --- a/src/routes/api/database.ts +++ b/src/routes/api/database.ts @@ -1,12 +1,12 @@ "use strict"; -import sql = require('../../services/sql'); -import log = require('../../services/log'); -import backupService = require('../../services/backup'); -import anonymizationService = require('../../services/anonymization'); -import consistencyChecksService = require('../../services/consistency_checks'); +import sql from "../../services/sql.js"; +import log from "../../services/log.js"; +import backupService from "../../services/backup.js"; +import anonymizationService from "../../services/anonymization.js"; +import consistencyChecksService from "../../services/consistency_checks.js"; import { Request } from 'express'; -import ValidationError = require('../../errors/validation_error'); +import ValidationError from "../../errors/validation_error.js"; function getExistingBackups() { return backupService.getExistingBackups(); diff --git a/src/routes/api/etapi_tokens.ts b/src/routes/api/etapi_tokens.ts index d7dd078bd..28f74a28a 100644 --- a/src/routes/api/etapi_tokens.ts +++ b/src/routes/api/etapi_tokens.ts @@ -1,5 +1,5 @@ import { Request } from 'express'; -import etapiTokenService = require('../../services/etapi_tokens'); +import etapiTokenService from "../../services/etapi_tokens.js"; function getTokens() { const tokens = etapiTokenService.getTokens(); diff --git a/src/routes/api/export.ts b/src/routes/api/export.ts index 7d6b3f683..905ef686b 100644 --- a/src/routes/api/export.ts +++ b/src/routes/api/export.ts @@ -1,14 +1,14 @@ "use strict"; -import zipExportService = require('../../services/export/zip'); -import singleExportService = require('../../services/export/single'); -import opmlExportService = require('../../services/export/opml'); -import becca = require('../../becca/becca'); -import TaskContext = require('../../services/task_context'); -import log = require('../../services/log'); -import NotFoundError = require('../../errors/not_found_error'); +import zipExportService from "../../services/export/zip.js"; +import singleExportService from "../../services/export/single.js"; +import opmlExportService from "../../services/export/opml.js"; +import becca from "../../becca/becca.js"; +import TaskContext from "../../services/task_context.js"; +import log from "../../services/log.js"; +import NotFoundError from "../../errors/not_found_error.js"; import { Request, Response } from 'express'; -import ValidationError = require('../../errors/validation_error'); +import ValidationError from "../../errors/validation_error.js"; function exportBranch(req: Request, res: Response) { const {branchId, type, format, version, taskId} = req.params; diff --git a/src/routes/api/files.ts b/src/routes/api/files.ts index 3bb269f7d..e889cc8a4 100644 --- a/src/routes/api/files.ts +++ b/src/routes/api/files.ts @@ -1,19 +1,19 @@ "use strict"; -import protectedSessionService = require('../../services/protected_session'); -import utils = require('../../services/utils'); -import log = require('../../services/log'); -import noteService = require('../../services/notes'); +import protectedSessionService from "../../services/protected_session.js"; +import utils from "../../services/utils.js"; +import log from "../../services/log.js"; +import noteService from "../../services/notes.js"; import tmp = require('tmp'); import fs = require('fs'); import { Readable } from 'stream'; import chokidar = require('chokidar'); -import ws = require('../../services/ws'); -import becca = require('../../becca/becca'); -import ValidationError = require('../../errors/validation_error'); +import ws from "../../services/ws.js"; +import becca from "../../becca/becca.js"; +import ValidationError from "../../errors/validation_error.js"; import { Request, Response } from 'express'; -import BNote = require('../../becca/entities/bnote'); -import BAttachment = require('../../becca/entities/battachment'); +import BNote from "../../becca/entities/bnote.js"; +import BAttachment from "../../becca/entities/battachment.js"; import { AppRequest } from '../route-interface'; function updateFile(req: AppRequest) { diff --git a/src/routes/api/fonts.ts b/src/routes/api/fonts.ts index fc68dc920..9d3a7a157 100644 --- a/src/routes/api/fonts.ts +++ b/src/routes/api/fonts.ts @@ -1,5 +1,5 @@ import { Request, Response } from 'express'; -import optionService = require('../../services/options'); +import optionService from "../../services/options.js"; function getFontCss(req: Request, res: Response) { res.setHeader('Content-Type', 'text/css'); diff --git a/src/routes/api/image.ts b/src/routes/api/image.ts index b00c7fd7f..e8df615c1 100644 --- a/src/routes/api/image.ts +++ b/src/routes/api/image.ts @@ -1,12 +1,12 @@ "use strict"; -import imageService = require('../../services/image'); -import becca = require('../../becca/becca'); +import imageService from "../../services/image.js"; +import becca from "../../becca/becca.js"; const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR; import fs = require('fs'); import { Request, Response } from 'express'; -import BNote = require('../../becca/entities/bnote'); -import BRevision = require('../../becca/entities/brevision'); +import BNote from "../../becca/entities/bnote.js"; +import BRevision from "../../becca/entities/brevision.js"; import { AppRequest } from '../route-interface'; function returnImageFromNote(req: Request, res: Response) { diff --git a/src/routes/api/import.ts b/src/routes/api/import.ts index f4e0b446e..51864738a 100644 --- a/src/routes/api/import.ts +++ b/src/routes/api/import.ts @@ -1,18 +1,18 @@ "use strict"; -import enexImportService = require('../../services/import/enex'); -import opmlImportService = require('../../services/import/opml'); -import zipImportService = require('../../services/import/zip'); -import singleImportService = require('../../services/import/single'); -import cls = require('../../services/cls'); +import enexImportService from "../../services/import/enex.js"; +import opmlImportService from "../../services/import/opml.js"; +import zipImportService from "../../services/import/zip.js"; +import singleImportService from "../../services/import/single.js"; +import cls from "../../services/cls.js"; import path = require('path'); -import becca = require('../../becca/becca'); -import beccaLoader = require('../../becca/becca_loader'); -import log = require('../../services/log'); -import TaskContext = require('../../services/task_context'); -import ValidationError = require('../../errors/validation_error'); +import becca from "../../becca/becca.js"; +import beccaLoader from "../../becca/becca_loader.js"; +import log from "../../services/log.js"; +import TaskContext from "../../services/task_context.js"; +import ValidationError from "../../errors/validation_error.js"; import { Request } from 'express'; -import BNote = require('../../becca/entities/bnote'); +import BNote from "../../becca/entities/bnote.js"; import { AppRequest } from '../route-interface'; async function importNotesToBranch(req: AppRequest) { diff --git a/src/routes/api/keys.ts b/src/routes/api/keys.ts index fe4f208f9..09102c3ac 100644 --- a/src/routes/api/keys.ts +++ b/src/routes/api/keys.ts @@ -1,7 +1,7 @@ "use strict"; -import keyboardActions = require('../../services/keyboard_actions'); -import becca = require('../../becca/becca'); +import keyboardActions from "../../services/keyboard_actions.js"; +import becca from "../../becca/becca.js"; function getKeyboardActions() { return keyboardActions.getKeyboardActions(); diff --git a/src/routes/api/login.ts b/src/routes/api/login.ts index a769c4627..8e4018b97 100644 --- a/src/routes/api/login.ts +++ b/src/routes/api/login.ts @@ -1,17 +1,17 @@ "use strict"; -import options = require('../../services/options'); -import utils = require('../../services/utils'); -import dateUtils = require('../../services/date_utils'); -import instanceId = require('../../services/instance_id'); -import passwordEncryptionService = require('../../services/encryption/password_encryption'); -import protectedSessionService = require('../../services/protected_session'); -import appInfo = require('../../services/app_info'); -import eventService = require('../../services/events'); -import sqlInit = require('../../services/sql_init'); -import sql = require('../../services/sql'); -import ws = require('../../services/ws'); -import etapiTokenService = require('../../services/etapi_tokens'); +import options from "../../services/options.js"; +import utils from "../../services/utils.js"; +import dateUtils from "../../services/date_utils.js"; +import instanceId from "../../services/instance_id.js"; +import passwordEncryptionService from "../../services/encryption/password_encryption.js"; +import protectedSessionService from "../../services/protected_session.js"; +import appInfo from "../../services/app_info.js"; +import eventService from "../../services/events.js"; +import sqlInit from "../../services/sql_init.js"; +import sql from "../../services/sql.js"; +import ws from "../../services/ws.js"; +import etapiTokenService from "../../services/etapi_tokens.js"; import { Request } from 'express'; import { AppRequest } from '../route-interface'; diff --git a/src/routes/api/note_map.ts b/src/routes/api/note_map.ts index 97a0bf6f6..557eabc7d 100644 --- a/src/routes/api/note_map.ts +++ b/src/routes/api/note_map.ts @@ -1,11 +1,11 @@ "use strict"; -import becca = require('../../becca/becca'); +import becca from "../../becca/becca.js"; import { JSDOM } from "jsdom"; -import BNote = require('../../becca/entities/bnote'); -import BAttribute = require('../../becca/entities/battribute'); +import BNote from "../../becca/entities/bnote.js"; +import BAttribute from "../../becca/entities/battribute.js"; import { Request } from 'express'; -import ValidationError = require('../../errors/validation_error'); +import ValidationError from "../../errors/validation_error.js"; function buildDescendantCountMap(noteIdsToCount: string[]) { if (!Array.isArray(noteIdsToCount)) { diff --git a/src/routes/api/notes.ts b/src/routes/api/notes.ts index c5e3e1c37..a4081606b 100644 --- a/src/routes/api/notes.ts +++ b/src/routes/api/notes.ts @@ -1,17 +1,17 @@ "use strict"; -import noteService = require('../../services/notes'); -import eraseService = require('../../services/erase'); -import treeService = require('../../services/tree'); -import sql = require('../../services/sql'); -import utils = require('../../services/utils'); -import log = require('../../services/log'); -import TaskContext = require('../../services/task_context'); -import becca = require('../../becca/becca'); -import ValidationError = require('../../errors/validation_error'); -import blobService = require('../../services/blob'); +import noteService from "../../services/notes.js"; +import eraseService from "../../services/erase.js"; +import treeService from "../../services/tree.js"; +import sql from "../../services/sql.js"; +import utils from "../../services/utils.js"; +import log from "../../services/log.js"; +import TaskContext from "../../services/task_context.js"; +import becca from "../../becca/becca.js"; +import ValidationError from "../../errors/validation_error.js"; +import blobService from "../../services/blob.js"; import { Request } from 'express'; -import BBranch = require('../../becca/entities/bbranch'); +import BBranch from "../../becca/entities/bbranch.js"; import { AttributeRow } from '../../becca/entities/rows'; function getNote(req: Request) { diff --git a/src/routes/api/options.ts b/src/routes/api/options.ts index 54630e825..2d96fc87a 100644 --- a/src/routes/api/options.ts +++ b/src/routes/api/options.ts @@ -1,9 +1,9 @@ "use strict"; -import optionService = require('../../services/options'); -import log = require('../../services/log'); -import searchService = require('../../services/search/services/search'); -import ValidationError = require('../../errors/validation_error'); +import optionService from "../../services/options.js"; +import log from "../../services/log.js"; +import searchService from "../../services/search/services/search.js"; +import ValidationError from "../../errors/validation_error.js"; import { Request } from 'express'; // options allowed to be updated directly in the Options dialog diff --git a/src/routes/api/other.ts b/src/routes/api/other.ts index 1d157f291..71a44bf78 100644 --- a/src/routes/api/other.ts +++ b/src/routes/api/other.ts @@ -1,7 +1,7 @@ import { Request } from "express"; -import becca = require('../../becca/becca'); -import markdownService = require('../../services/import/markdown'); +import becca from "../../becca/becca.js"; +import markdownService from "../../services/import/markdown.js"; function getIconUsage() { const iconClassToCountMap: Record = {}; diff --git a/src/routes/api/password.ts b/src/routes/api/password.ts index 5fb4c89d6..547031936 100644 --- a/src/routes/api/password.ts +++ b/src/routes/api/password.ts @@ -1,7 +1,7 @@ "use strict"; -import passwordService = require('../../services/encryption/password'); -import ValidationError = require('../../errors/validation_error'); +import passwordService from "../../services/encryption/password.js"; +import ValidationError from "../../errors/validation_error.js"; import { Request } from 'express'; function changePassword(req: Request) { diff --git a/src/routes/api/recent_changes.ts b/src/routes/api/recent_changes.ts index bf662a784..0efd95b05 100644 --- a/src/routes/api/recent_changes.ts +++ b/src/routes/api/recent_changes.ts @@ -1,9 +1,9 @@ "use strict"; -import sql = require('../../services/sql'); -import protectedSessionService = require('../../services/protected_session'); -import noteService = require('../../services/notes'); -import becca = require('../../becca/becca'); +import sql from "../../services/sql.js"; +import protectedSessionService from "../../services/protected_session.js"; +import noteService from "../../services/notes.js"; +import becca from "../../becca/becca.js"; import { Request } from 'express'; import { RevisionRow } from '../../becca/entities/rows'; diff --git a/src/routes/api/recent_notes.ts b/src/routes/api/recent_notes.ts index 627bdd357..a5bbd03c4 100644 --- a/src/routes/api/recent_notes.ts +++ b/src/routes/api/recent_notes.ts @@ -1,8 +1,8 @@ "use strict"; -import BRecentNote = require('../../becca/entities/brecent_note'); -import sql = require('../../services/sql'); -import dateUtils = require('../../services/date_utils'); +import BRecentNote from "../../becca/entities/brecent_note.js"; +import sql from "../../services/sql.js"; +import dateUtils from "../../services/date_utils.js"; import { Request } from 'express'; function addRecentNote(req: Request) { diff --git a/src/routes/api/relation-map.ts b/src/routes/api/relation-map.ts index c81496349..59f8d685d 100644 --- a/src/routes/api/relation-map.ts +++ b/src/routes/api/relation-map.ts @@ -1,6 +1,6 @@ import { Request } from 'express'; -import becca = require('../../becca/becca'); -import sql = require('../../services/sql'); +import becca from "../../becca/becca.js"; +import sql from "../../services/sql.js"; interface ResponseData { noteTitles: Record; diff --git a/src/routes/api/revisions.ts b/src/routes/api/revisions.ts index d8854ec8a..0be6d6399 100644 --- a/src/routes/api/revisions.ts +++ b/src/routes/api/revisions.ts @@ -1,17 +1,17 @@ "use strict"; -import beccaService = require('../../becca/becca_service'); -import revisionService = require('../../services/revisions'); -import utils = require('../../services/utils'); -import sql = require('../../services/sql'); -import cls = require('../../services/cls'); +import beccaService from "../../becca/becca_service.js"; +import revisionService from "../../services/revisions.js"; +import utils from "../../services/utils.js"; +import sql from "../../services/sql.js"; +import cls from "../../services/cls.js"; import path = require('path'); -import becca = require('../../becca/becca'); -import blobService = require('../../services/blob'); -import eraseService = require('../../services/erase'); +import becca from "../../becca/becca.js"; +import blobService from "../../services/blob.js"; +import eraseService from "../../services/erase.js"; import { Request, Response } from 'express'; -import BRevision = require('../../becca/entities/brevision'); -import BNote = require('../../becca/entities/bnote'); +import BRevision from "../../becca/entities/brevision.js"; +import BNote from "../../becca/entities/bnote.js"; import { NotePojo } from '../../becca/becca-interface'; interface NotePath { diff --git a/src/routes/api/script.ts b/src/routes/api/script.ts index 8a1b3d072..ea0c25d2d 100644 --- a/src/routes/api/script.ts +++ b/src/routes/api/script.ts @@ -1,10 +1,10 @@ "use strict"; -import scriptService = require('../../services/script'); -import attributeService = require('../../services/attributes'); -import becca = require('../../becca/becca'); -import syncService = require('../../services/sync'); -import sql = require('../../services/sql'); +import scriptService from "../../services/script.js"; +import attributeService from "../../services/attributes.js"; +import becca from "../../becca/becca.js"; +import syncService from "../../services/sync.js"; +import sql from "../../services/sql.js"; import { Request } from 'express'; interface ScriptBody { diff --git a/src/routes/api/search.ts b/src/routes/api/search.ts index 93d3e9bc5..7e1fcab5b 100644 --- a/src/routes/api/search.ts +++ b/src/routes/api/search.ts @@ -2,14 +2,14 @@ import { Request } from "express"; -import becca = require('../../becca/becca'); -import SearchContext = require('../../services/search/search_context'); -import searchService = require('../../services/search/services/search'); -import bulkActionService = require('../../services/bulk_actions'); -import cls = require('../../services/cls'); -import attributeFormatter = require('../../services/attribute_formatter'); -import ValidationError = require('../../errors/validation_error'); -import SearchResult = require('../../services/search/search_result'); +import becca from "../../becca/becca.js"; +import SearchContext from "../../services/search/search_context.js"; +import searchService from "../../services/search/services/search.js"; +import bulkActionService from "../../services/bulk_actions.js"; +import cls from "../../services/cls.js"; +import attributeFormatter from "../../services/attribute_formatter.js"; +import ValidationError from "../../errors/validation_error.js"; +import SearchResult from "../../services/search/search_result.js"; function searchFromNote(req: Request) { const note = becca.getNoteOrThrow(req.params.noteId); diff --git a/src/routes/api/sender.ts b/src/routes/api/sender.ts index 8d20c1fd9..a20526498 100644 --- a/src/routes/api/sender.ts +++ b/src/routes/api/sender.ts @@ -1,10 +1,10 @@ "use strict"; import imageType = require('image-type'); -import imageService = require('../../services/image'); -import noteService = require('../../services/notes'); -import sanitize_attribute_name = require('../../services/sanitize_attribute_name'); -import specialNotesService = require('../../services/special_notes'); +import imageService from "../../services/image.js"; +import noteService from "../../services/notes.js"; +import sanitize_attribute_name from "../../services/sanitize_attribute_name.js"; +import specialNotesService from "../../services/special_notes.js"; import { Request } from 'express'; import { AppRequest } from '../route-interface'; diff --git a/src/routes/api/setup.ts b/src/routes/api/setup.ts index 9e63a2331..31a98efa4 100644 --- a/src/routes/api/setup.ts +++ b/src/routes/api/setup.ts @@ -1,9 +1,9 @@ "use strict"; -import sqlInit = require('../../services/sql_init'); -import setupService = require('../../services/setup'); -import log = require('../../services/log'); -import appInfo = require('../../services/app_info'); +import sqlInit from "../../services/sql_init.js"; +import setupService from "../../services/setup.js"; +import log from "../../services/log.js"; +import appInfo from "../../services/app_info.js"; import { Request } from 'express'; function getStatus() { diff --git a/src/routes/api/similar_notes.ts b/src/routes/api/similar_notes.ts index f60d7f7c6..8a81a11ea 100644 --- a/src/routes/api/similar_notes.ts +++ b/src/routes/api/similar_notes.ts @@ -2,8 +2,8 @@ import { Request } from "express"; -import similarityService = require('../../becca/similarity'); -import becca = require('../../becca/becca'); +import similarityService from "../../becca/similarity.js"; +import becca from "../../becca/becca.js"; async function getSimilarNotes(req: Request) { const noteId = req.params.noteId; diff --git a/src/routes/api/special_notes.ts b/src/routes/api/special_notes.ts index 445cd7315..89fd420c3 100644 --- a/src/routes/api/special_notes.ts +++ b/src/routes/api/special_notes.ts @@ -1,10 +1,10 @@ "use strict"; -import dateNoteService = require('../../services/date_notes'); -import sql = require('../../services/sql'); -import cls = require('../../services/cls'); -import specialNotesService = require('../../services/special_notes'); -import becca = require('../../becca/becca'); +import dateNoteService from "../../services/date_notes.js"; +import sql from "../../services/sql.js"; +import cls from "../../services/cls.js"; +import specialNotesService from "../../services/special_notes.js"; +import becca from "../../becca/becca.js"; import { Request } from 'express'; function getInboxNote(req: Request) { diff --git a/src/routes/api/sql.ts b/src/routes/api/sql.ts index 3bd1d3eca..eecffe6e3 100644 --- a/src/routes/api/sql.ts +++ b/src/routes/api/sql.ts @@ -1,9 +1,9 @@ "use strict"; -import sql = require('../../services/sql'); -import becca = require('../../becca/becca'); +import sql from "../../services/sql.js"; +import becca from "../../becca/becca.js"; import { Request } from 'express'; -import ValidationError = require('../../errors/validation_error'); +import ValidationError from "../../errors/validation_error.js"; 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.ts b/src/routes/api/stats.ts index 053647daa..6740ed535 100644 --- a/src/routes/api/stats.ts +++ b/src/routes/api/stats.ts @@ -1,5 +1,5 @@ -import sql = require('../../services/sql'); -import becca = require('../../becca/becca'); +import sql from "../../services/sql.js"; +import becca from "../../becca/becca.js"; import { Request } from 'express'; function getNoteSize(req: Request) { diff --git a/src/routes/api/sync.ts b/src/routes/api/sync.ts index 728065336..1c1db7c2e 100644 --- a/src/routes/api/sync.ts +++ b/src/routes/api/sync.ts @@ -1,19 +1,19 @@ "use strict"; -import syncService = require('../../services/sync'); -import syncUpdateService = require('../../services/sync_update'); -import entityChangesService = require('../../services/entity_changes'); -import sql = require('../../services/sql'); -import sqlInit = require('../../services/sql_init'); -import optionService = require('../../services/options'); -import contentHashService = require('../../services/content_hash'); -import log = require('../../services/log'); -import syncOptions = require('../../services/sync_options'); -import utils = require('../../services/utils'); -import ws = require('../../services/ws'); +import syncService from "../../services/sync.js"; +import syncUpdateService from "../../services/sync_update.js"; +import entityChangesService from "../../services/entity_changes.js"; +import sql from "../../services/sql.js"; +import sqlInit from "../../services/sql_init.js"; +import optionService from "../../services/options.js"; +import contentHashService from "../../services/content_hash.js"; +import log from "../../services/log.js"; +import syncOptions from "../../services/sync_options.js"; +import utils from "../../services/utils.js"; +import ws from "../../services/ws.js"; import { Request } from 'express'; import { EntityChange, EntityChangeRecord } from '../../services/entity_changes_interface'; -import ValidationError = require('../../errors/validation_error'); +import ValidationError from "../../errors/validation_error.js"; async function testSync() { try { diff --git a/src/routes/api/tree.ts b/src/routes/api/tree.ts index 1b172f10b..7711c25ff 100644 --- a/src/routes/api/tree.ts +++ b/src/routes/api/tree.ts @@ -1,10 +1,10 @@ "use strict"; -import becca = require('../../becca/becca'); -import log = require('../../services/log'); -import NotFoundError = require('../../errors/not_found_error'); +import becca from "../../becca/becca.js"; +import log from "../../services/log.js"; +import NotFoundError from "../../errors/not_found_error.js"; import { Request } from 'express'; -import BNote = require('../../becca/entities/bnote'); +import BNote from "../../becca/entities/bnote.js"; function getNotesAndBranchesAndAttributes(_noteIds: string[] | Set) { const noteIds = new Set(_noteIds); diff --git a/src/routes/assets.ts b/src/routes/assets.ts index 806309ac8..c84c7e31d 100644 --- a/src/routes/assets.ts +++ b/src/routes/assets.ts @@ -1,7 +1,7 @@ -import assetPath = require('../services/asset_path'); +import assetPath from "../services/asset_path.js"; import path = require('path'); import express = require('express'); -import env = require('../services/env'); +import env from "../services/env.js"; import serveStatic = require('serve-static'); const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOptions>>) => { diff --git a/src/routes/custom.ts b/src/routes/custom.ts index 1bdb94ac0..3a0bead49 100644 --- a/src/routes/custom.ts +++ b/src/routes/custom.ts @@ -1,9 +1,9 @@ -import log = require('../services/log'); -import fileService = require('./api/files'); -import scriptService = require('../services/script'); -import cls = require('../services/cls'); -import sql = require('../services/sql'); -import becca = require('../becca/becca'); +import log from "../services/log.js"; +import fileService from "./api/files.js"; +import scriptService from "../services/script.js"; +import cls from "../services/cls.js"; +import sql from "../services/sql.js"; +import becca from "../becca/becca.js"; import { Request, Response, Router } from 'express'; function handleRequest(req: Request, res: Response) { diff --git a/src/routes/error_handlers.ts b/src/routes/error_handlers.ts index 96d326bd9..cd19deadb 100644 --- a/src/routes/error_handlers.ts +++ b/src/routes/error_handlers.ts @@ -1,5 +1,5 @@ import { Application, NextFunction, Request, Response } from 'express'; -import log = require('../services/log'); +import log from "../services/log.js"; function register(app: Application) { app.use((err: any, req: Request, res: Response, next: NextFunction) => { diff --git a/src/routes/index.ts b/src/routes/index.ts index 2ede70f42..0434a6de4 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -1,16 +1,16 @@ "use strict"; -import sql = require('../services/sql'); -import attributeService = require('../services/attributes'); -import config = require('../services/config'); -import optionService = require('../services/options'); -import log = require('../services/log'); -import env = require('../services/env'); -import utils = require('../services/utils'); -import protectedSessionService = require('../services/protected_session'); -import packageJson = require('../../package.json'); -import assetPath = require('../services/asset_path'); -import appPath = require('../services/app_path'); +import sql from "../services/sql.js"; +import attributeService from "../services/attributes.js"; +import config from "../services/config.js"; +import optionService from "../services/options.js"; +import log from "../services/log.js"; +import env from "../services/env.js"; +import utils from "../services/utils.js"; +import protectedSessionService from "../services/protected_session.js"; +import packageJson from "../../package.json.js"; +import assetPath from "../services/asset_path.js"; +import appPath from "../services/app_path.js"; import { Request, Response } from 'express'; function index(req: Request, res: Response) { diff --git a/src/routes/login.ts b/src/routes/login.ts index cce214fbe..9589113f0 100644 --- a/src/routes/login.ts +++ b/src/routes/login.ts @@ -1,13 +1,13 @@ "use strict"; -import utils = require('../services/utils'); -import optionService = require('../services/options'); -import myScryptService = require('../services/encryption/my_scrypt'); -import log = require('../services/log'); -import passwordService = require('../services/encryption/password'); -import assetPath = require('../services/asset_path'); -import appPath = require('../services/app_path'); -import ValidationError = require('../errors/validation_error'); +import utils from "../services/utils.js"; +import optionService from "../services/options.js"; +import myScryptService from "../services/encryption/my_scrypt.js"; +import log from "../services/log.js"; +import passwordService from "../services/encryption/password.js"; +import assetPath from "../services/asset_path.js"; +import appPath from "../services/app_path.js"; +import ValidationError from "../errors/validation_error.js"; import { Request, Response } from 'express'; import { AppRequest } from './route-interface'; diff --git a/src/routes/routes.ts b/src/routes/routes.ts index 55b40cd2b..5e78de447 100644 --- a/src/routes/routes.ts +++ b/src/routes/routes.ts @@ -1,75 +1,75 @@ "use strict"; -import utils = require('../services/utils'); +import utils from "../services/utils.js"; import multer = require('multer'); -import log = require('../services/log'); +import log from "../services/log.js"; import express = require('express'); const router = express.Router(); -import auth = require('../services/auth'); -import cls = require('../services/cls'); -import sql = require('../services/sql'); -import entityChangesService = require('../services/entity_changes'); +import auth from "../services/auth.js"; +import cls from "../services/cls.js"; +import sql from "../services/sql.js"; +import entityChangesService from "../services/entity_changes.js"; import csurf = require('csurf'); import { createPartialContentHandler } from "express-partial-content"; import rateLimit = require('express-rate-limit'); -import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity'); -import NotFoundError = require('../errors/not_found_error'); -import ValidationError = require('../errors/validation_error'); +import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js"; +import NotFoundError from "../errors/not_found_error.js"; +import ValidationError from "../errors/validation_error.js"; // page routes -import setupRoute = require('./setup'); -import loginRoute = require('./login'); -import indexRoute = require('./index'); +import setupRoute from "./setup.js"; +import loginRoute from "./login.js"; +import indexRoute from "./index.js"; // API routes -import treeApiRoute = require('./api/tree'); -import notesApiRoute = require('./api/notes'); -import branchesApiRoute = require('./api/branches'); -import attachmentsApiRoute = require('./api/attachments'); -import autocompleteApiRoute = require('./api/autocomplete'); -import cloningApiRoute = require('./api/cloning'); -import revisionsApiRoute = require('./api/revisions'); -import recentChangesApiRoute = require('./api/recent_changes'); -import optionsApiRoute = require('./api/options'); -import passwordApiRoute = require('./api/password'); -import syncApiRoute = require('./api/sync'); -import loginApiRoute = require('./api/login'); -import recentNotesRoute = require('./api/recent_notes'); -import appInfoRoute = require('./api/app_info'); -import exportRoute = require('./api/export'); -import importRoute = require('./api/import'); -import setupApiRoute = require('./api/setup'); -import sqlRoute = require('./api/sql'); -import databaseRoute = require('./api/database'); -import imageRoute = require('./api/image'); -import attributesRoute = require('./api/attributes'); -import scriptRoute = require('./api/script'); -import senderRoute = require('./api/sender'); -import filesRoute = require('./api/files'); -import searchRoute = require('./api/search'); -import bulkActionRoute = require('./api/bulk_action'); -import specialNotesRoute = require('./api/special_notes'); -import noteMapRoute = require('./api/note_map'); -import clipperRoute = require('./api/clipper'); -import similarNotesRoute = require('./api/similar_notes'); -import keysRoute = require('./api/keys'); -import backendLogRoute = require('./api/backend_log'); -import statsRoute = require('./api/stats'); -import fontsRoute = require('./api/fonts'); -import etapiTokensApiRoutes = require('./api/etapi_tokens'); -import relationMapApiRoute = require('./api/relation-map'); -import otherRoute = require('./api/other'); -import shareRoutes = require('../share/routes'); +import treeApiRoute from "./api/tree.js"; +import notesApiRoute from "./api/notes.js"; +import branchesApiRoute from "./api/branches.js"; +import attachmentsApiRoute from "./api/attachments.js"; +import autocompleteApiRoute from "./api/autocomplete.js"; +import cloningApiRoute from "./api/cloning.js"; +import revisionsApiRoute from "./api/revisions.js"; +import recentChangesApiRoute from "./api/recent_changes.js"; +import optionsApiRoute from "./api/options.js"; +import passwordApiRoute from "./api/password.js"; +import syncApiRoute from "./api/sync.js"; +import loginApiRoute from "./api/login.js"; +import recentNotesRoute from "./api/recent_notes.js"; +import appInfoRoute from "./api/app_info.js"; +import exportRoute from "./api/export.js"; +import importRoute from "./api/import.js"; +import setupApiRoute from "./api/setup.js"; +import sqlRoute from "./api/sql.js"; +import databaseRoute from "./api/database.js"; +import imageRoute from "./api/image.js"; +import attributesRoute from "./api/attributes.js"; +import scriptRoute from "./api/script.js"; +import senderRoute from "./api/sender.js"; +import filesRoute from "./api/files.js"; +import searchRoute from "./api/search.js"; +import bulkActionRoute from "./api/bulk_action.js"; +import specialNotesRoute from "./api/special_notes.js"; +import noteMapRoute from "./api/note_map.js"; +import clipperRoute from "./api/clipper.js"; +import similarNotesRoute from "./api/similar_notes.js"; +import keysRoute from "./api/keys.js"; +import backendLogRoute from "./api/backend_log.js"; +import statsRoute from "./api/stats.js"; +import fontsRoute from "./api/fonts.js"; +import etapiTokensApiRoutes from "./api/etapi_tokens.js"; +import relationMapApiRoute from "./api/relation-map.js"; +import otherRoute from "./api/other.js"; +import shareRoutes from "../share/routes.js"; -import etapiAuthRoutes = require('../etapi/auth'); -import etapiAppInfoRoutes = require('../etapi/app_info'); -import etapiAttachmentRoutes = require('../etapi/attachments'); -import etapiAttributeRoutes = require('../etapi/attributes'); -import etapiBranchRoutes = require('../etapi/branches'); -import etapiNoteRoutes = require('../etapi/notes'); -import etapiSpecialNoteRoutes = require('../etapi/special_notes'); -import etapiSpecRoute = require('../etapi/spec'); -import etapiBackupRoute = require('../etapi/backup'); +import etapiAuthRoutes from "../etapi/auth.js"; +import etapiAppInfoRoutes from "../etapi/app_info.js"; +import etapiAttachmentRoutes from "../etapi/attachments.js"; +import etapiAttributeRoutes from "../etapi/attributes.js"; +import etapiBranchRoutes from "../etapi/branches.js"; +import etapiNoteRoutes from "../etapi/notes.js"; +import etapiSpecialNoteRoutes from "../etapi/special_notes.js"; +import etapiSpecRoute from "../etapi/spec.js"; +import etapiBackupRoute from "../etapi/backup.js"; import { AppRequest, AppRequestHandler } from './route-interface'; const csrfMiddleware = csurf({ diff --git a/src/routes/session_parser.ts b/src/routes/session_parser.ts index 10be1a721..58d26e642 100644 --- a/src/routes/session_parser.ts +++ b/src/routes/session_parser.ts @@ -1,6 +1,6 @@ import session = require('express-session'); -import sessionSecret = require('../services/session_secret'); -import dataDir = require('../services/data_dir'); +import sessionSecret from "../services/session_secret.js"; +import dataDir from "../services/data_dir.js"; const FileStore = require('session-file-store')(session); const sessionParser = session({ diff --git a/src/routes/setup.ts b/src/routes/setup.ts index 1d3521f4a..974e96bc6 100644 --- a/src/routes/setup.ts +++ b/src/routes/setup.ts @@ -1,10 +1,10 @@ "use strict"; -import sqlInit = require('../services/sql_init'); -import setupService = require('../services/setup'); -import utils = require('../services/utils'); -import assetPath = require('../services/asset_path'); -import appPath = require('../services/app_path'); +import sqlInit from "../services/sql_init.js"; +import setupService from "../services/setup.js"; +import utils from "../services/utils.js"; +import assetPath from "../services/asset_path.js"; +import appPath from "../services/app_path.js"; import { Request, Response } from 'express'; function setupPage(req: Request, res: Response) { diff --git a/src/services/anonymization.ts b/src/services/anonymization.ts index a169cd8b8..8a0a8828f 100644 --- a/src/services/anonymization.ts +++ b/src/services/anonymization.ts @@ -1,9 +1,9 @@ -import BUILTIN_ATTRIBUTES = require('./builtin_attributes'); +import BUILTIN_ATTRIBUTES from "./builtin_attributes.js"; import fs = require('fs-extra'); -import dataDir = require('./data_dir'); -import dateUtils = require('./date_utils'); +import dataDir from "./data_dir.js"; +import dateUtils from "./date_utils.js"; import Database = require('better-sqlite3'); -import sql = require('./sql'); +import sql from "./sql.js"; import path = require('path'); function getFullAnonymizationScript() { diff --git a/src/services/app_icon.ts b/src/services/app_icon.ts index 7a2a7dedf..02a0769d2 100644 --- a/src/services/app_icon.ts +++ b/src/services/app_icon.ts @@ -1,12 +1,12 @@ "use strict"; import path = require('path'); -import resourceDir = require('./resource_dir'); -import log = require('./log'); +import resourceDir from "./resource_dir.js"; +import log from "./log.js"; import os = require('os'); import fs = require('fs'); -import config = require('./config'); -import utils = require('./utils'); +import config from "./config.js"; +import utils from "./utils.js"; const template = `[Desktop Entry] Type=Application diff --git a/src/services/app_info.ts b/src/services/app_info.ts index 92bf2dee1..5439df732 100644 --- a/src/services/app_info.ts +++ b/src/services/app_info.ts @@ -1,8 +1,8 @@ "use strict"; -import build = require('./build'); -import packageJson = require('../../package.json'); -import dataDir = require('./data_dir'); +import build from "./build.js"; +import packageJson from "../../package.json.js"; +import dataDir from "./data_dir.js"; const APP_DB_VERSION = 228; const SYNC_VERSION = 32; diff --git a/src/services/app_path.ts b/src/services/app_path.ts index 3bfa7de40..5cc1ec67c 100644 --- a/src/services/app_path.ts +++ b/src/services/app_path.ts @@ -1,5 +1,5 @@ -import assetPath = require('./asset_path'); -import env = require('./env'); +import assetPath from "./asset_path.js"; +import env from "./env.js"; export = env.isDev() ? assetPath + "/app" diff --git a/src/services/asset_path.ts b/src/services/asset_path.ts index 53ffebba9..c62069d38 100644 --- a/src/services/asset_path.ts +++ b/src/services/asset_path.ts @@ -1,3 +1,3 @@ -import packageJson = require('../../package.json'); +import packageJson from "../../package.json.js"; export = `assets/v${packageJson.version}`; diff --git a/src/services/attributes.ts b/src/services/attributes.ts index 0ae77dc36..d8007f411 100644 --- a/src/services/attributes.ts +++ b/src/services/attributes.ts @@ -1,12 +1,12 @@ "use strict"; -import searchService = require('./search/services/search'); -import sql = require('./sql'); -import becca = require('../becca/becca'); -import BAttribute = require('../becca/entities/battribute'); -import attributeFormatter = require('./attribute_formatter'); -import BUILTIN_ATTRIBUTES = require('./builtin_attributes'); -import BNote = require('../becca/entities/bnote'); +import searchService from "./search/services/search.js"; +import sql from "./sql.js"; +import becca from "../becca/becca.js"; +import BAttribute from "../becca/entities/battribute.js"; +import attributeFormatter from "./attribute_formatter.js"; +import BUILTIN_ATTRIBUTES from "./builtin_attributes.js"; +import BNote from "../becca/entities/bnote.js"; import { AttributeRow } from '../becca/entities/rows'; const ATTRIBUTE_TYPES = ['label', 'relation']; diff --git a/src/services/auth.ts b/src/services/auth.ts index 39f2b430e..12912a3f3 100644 --- a/src/services/auth.ts +++ b/src/services/auth.ts @@ -1,12 +1,12 @@ "use strict"; -import etapiTokenService = require('./etapi_tokens'); -import log = require('./log'); -import sqlInit = require('./sql_init'); -import utils = require('./utils'); -import passwordEncryptionService = require('./encryption/password_encryption'); -import config = require('./config'); -import passwordService = require('./encryption/password'); +import etapiTokenService from "./etapi_tokens.js"; +import log from "./log.js"; +import sqlInit from "./sql_init.js"; +import utils from "./utils.js"; +import passwordEncryptionService from "./encryption/password_encryption.js"; +import config from "./config.js"; +import passwordService from "./encryption/password.js"; import type { NextFunction, Request, Response } from 'express'; import { AppRequest } from '../routes/route-interface'; diff --git a/src/services/backend_script_api.ts b/src/services/backend_script_api.ts index 9b72929a4..80f114810 100644 --- a/src/services/backend_script_api.ts +++ b/src/services/backend_script_api.ts @@ -1,35 +1,35 @@ -import log = require('./log'); -import noteService = require('./notes'); -import sql = require('./sql'); -import utils = require('./utils'); -import attributeService = require('./attributes'); -import dateNoteService = require('./date_notes'); -import treeService = require('./tree'); -import config = require('./config'); +import log from "./log.js"; +import noteService from "./notes.js"; +import sql from "./sql.js"; +import utils from "./utils.js"; +import attributeService from "./attributes.js"; +import dateNoteService from "./date_notes.js"; +import treeService from "./tree.js"; +import config from "./config.js"; import axios = require('axios'); import dayjs = require('dayjs'); import xml2js = require('xml2js'); -import cloningService = require('./cloning'); -import appInfo = require('./app_info'); -import searchService = require('./search/services/search'); -import SearchContext = require('./search/search_context'); -import becca = require('../becca/becca'); -import ws = require('./ws'); -import SpacedUpdate = require('./spaced_update'); -import specialNotesService = require('./special_notes'); -import branchService = require('./branches'); -import exportService = require('./export/zip'); -import syncMutex = require('./sync_mutex'); -import backupService = require('./backup'); -import optionsService = require('./options'); -import BNote = require('../becca/entities/bnote'); -import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity'); -import BBranch = require('../becca/entities/bbranch'); -import BAttribute = require('../becca/entities/battribute'); -import BAttachment = require('../becca/entities/battachment'); -import BRevision = require('../becca/entities/brevision'); -import BEtapiToken = require('../becca/entities/betapi_token'); -import BOption = require('../becca/entities/boption'); +import cloningService from "./cloning.js"; +import appInfo from "./app_info.js"; +import searchService from "./search/services/search.js"; +import SearchContext from "./search/search_context.js"; +import becca from "../becca/becca.js"; +import ws from "./ws.js"; +import SpacedUpdate from "./spaced_update.js"; +import specialNotesService from "./special_notes.js"; +import branchService from "./branches.js"; +import exportService from "./export/zip.js"; +import syncMutex from "./sync_mutex.js"; +import backupService from "./backup.js"; +import optionsService from "./options.js"; +import BNote from "../becca/entities/bnote.js"; +import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js"; +import BBranch from "../becca/entities/bbranch.js"; +import BAttribute from "../becca/entities/battribute.js"; +import BAttachment from "../becca/entities/battachment.js"; +import BRevision from "../becca/entities/brevision.js"; +import BEtapiToken from "../becca/entities/betapi_token.js"; +import BOption from "../becca/entities/boption.js"; import { AttributeRow, AttributeType, NoteType } from '../becca/entities/rows'; import Becca from '../becca/becca-interface'; import { NoteParams } from './note-interface'; diff --git a/src/services/backend_script_api_interface.ts b/src/services/backend_script_api_interface.ts index 7c7c4199f..28930ea33 100644 --- a/src/services/backend_script_api_interface.ts +++ b/src/services/backend_script_api_interface.ts @@ -1,6 +1,6 @@ import { Request, Response } from "express"; -import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity'); -import BNote = require('../becca/entities/bnote'); +import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js"; +import BNote from "../becca/entities/bnote.js"; export interface ApiParams { startNote?: BNote; diff --git a/src/services/backup.ts b/src/services/backup.ts index 3000c9c9a..a855fc71f 100644 --- a/src/services/backup.ts +++ b/src/services/backup.ts @@ -1,13 +1,13 @@ "use strict"; -import dateUtils = require('./date_utils'); -import optionService = require('./options'); +import dateUtils from "./date_utils.js"; +import optionService from "./options.js"; import fs = require('fs-extra'); -import dataDir = require('./data_dir'); -import log = require('./log'); -import syncMutexService = require('./sync_mutex'); -import cls = require('./cls'); -import sql = require('./sql'); +import dataDir from "./data_dir.js"; +import log from "./log.js"; +import syncMutexService from "./sync_mutex.js"; +import cls from "./cls.js"; +import sql from "./sql.js"; import path = require('path'); type BackupType = ("daily" | "weekly" | "monthly"); diff --git a/src/services/blob.ts b/src/services/blob.ts index 41d23adc5..784fe3419 100644 --- a/src/services/blob.ts +++ b/src/services/blob.ts @@ -1,7 +1,7 @@ -import becca = require('../becca/becca'); -import NotFoundError = require('../errors/not_found_error'); -import protectedSessionService = require('./protected_session'); -import utils = require('./utils'); +import becca from "../becca/becca.js"; +import NotFoundError from "../errors/not_found_error.js"; +import protectedSessionService from "./protected_session.js"; +import utils from "./utils.js"; import type { Blob } from "./blob-interface"; function getBlobPojo(entityName: string, entityId: string, opts?: { preview: boolean }) { diff --git a/src/services/branches.ts b/src/services/branches.ts index 8e6971560..cb77ad991 100644 --- a/src/services/branches.ts +++ b/src/services/branches.ts @@ -1,6 +1,6 @@ -import treeService = require('./tree'); -import sql = require('./sql'); -import BBranch = require('../becca/entities/bbranch.js'); +import treeService from "./tree.js"; +import sql from "./sql.js"; +import BBranch from "../becca/entities/bbranch.js.js"; function moveBranchToNote(branchToMove: BBranch, targetParentNoteId: string) { if (branchToMove.parentNoteId === targetParentNoteId) { diff --git a/src/services/bulk_actions.ts b/src/services/bulk_actions.ts index 1a4d63dd9..8ece2040e 100644 --- a/src/services/bulk_actions.ts +++ b/src/services/bulk_actions.ts @@ -1,10 +1,10 @@ -import log = require('./log'); -import becca = require('../becca/becca'); -import cloningService = require('./cloning'); -import branchService = require('./branches'); -import utils = require('./utils'); -import eraseService = require('./erase'); -import BNote = require('../becca/entities/bnote'); +import log from "./log.js"; +import becca from "../becca/becca.js"; +import cloningService from "./cloning.js"; +import branchService from "./branches.js"; +import utils from "./utils.js"; +import eraseService from "./erase.js"; +import BNote from "../becca/entities/bnote.js"; interface Action { labelName: string; diff --git a/src/services/config.ts b/src/services/config.ts index f0437a2d1..7936147db 100644 --- a/src/services/config.ts +++ b/src/services/config.ts @@ -2,9 +2,9 @@ import ini = require('ini'); import fs = require('fs'); -import dataDir = require('./data_dir'); +import dataDir from "./data_dir.js"; import path = require('path'); -import resourceDir = require('./resource_dir'); +import resourceDir from "./resource_dir.js"; const configSampleFilePath = path.resolve(resourceDir.RESOURCE_DIR, "config-sample.ini"); diff --git a/src/services/consistency_checks.ts b/src/services/consistency_checks.ts index 1ec432883..e6fdddb14 100644 --- a/src/services/consistency_checks.ts +++ b/src/services/consistency_checks.ts @@ -1,19 +1,19 @@ "use strict"; -import sql = require('./sql'); -import sqlInit = require('./sql_init'); -import log = require('./log'); -import ws = require('./ws'); -import syncMutexService = require('./sync_mutex'); -import cls = require('./cls'); -import entityChangesService = require('./entity_changes'); -import optionsService = require('./options'); -import BBranch = require('../becca/entities/bbranch'); -import becca = require('../becca/becca'); -import utils = require('../services/utils'); -import eraseService = require('../services/erase'); -import sanitizeAttributeName = require('./sanitize_attribute_name'); -import noteTypesService = require('../services/note_types'); +import sql from "./sql.js"; +import sqlInit from "./sql_init.js"; +import log from "./log.js"; +import ws from "./ws.js"; +import syncMutexService from "./sync_mutex.js"; +import cls from "./cls.js"; +import entityChangesService from "./entity_changes.js"; +import optionsService from "./options.js"; +import BBranch from "../becca/entities/bbranch.js"; +import becca from "../becca/becca.js"; +import utils from "../services/utils.js"; +import eraseService from "../services/erase.js"; +import sanitizeAttributeName from "./sanitize_attribute_name.js"; +import noteTypesService from "../services/note_types.js"; import { BranchRow } from '../becca/entities/rows'; import { EntityChange } from './entity_changes_interface'; const noteTypes = noteTypesService.getNoteTypeNames(); diff --git a/src/services/content_hash.ts b/src/services/content_hash.ts index 2067e177f..0e8687517 100644 --- a/src/services/content_hash.ts +++ b/src/services/content_hash.ts @@ -1,9 +1,9 @@ "use strict"; -import sql = require('./sql'); -import utils = require('./utils'); -import log = require('./log'); -import eraseService = require('./erase'); +import sql from "./sql.js"; +import utils from "./utils.js"; +import log from "./log.js"; +import eraseService from "./erase.js"; type SectorHash = Record; diff --git a/src/services/date_notes.ts b/src/services/date_notes.ts index 989106939..6e91e9688 100644 --- a/src/services/date_notes.ts +++ b/src/services/date_notes.ts @@ -1,14 +1,14 @@ "use strict"; -import noteService = require('./notes'); -import attributeService = require('./attributes'); -import dateUtils = require('./date_utils'); -import sql = require('./sql'); -import protectedSessionService = require('./protected_session'); -import searchService = require('../services/search/services/search'); -import SearchContext = require('../services/search/search_context'); -import hoistedNoteService = require('./hoisted_note'); -import BNote = require('../becca/entities/bnote'); +import noteService from "./notes.js"; +import attributeService from "./attributes.js"; +import dateUtils from "./date_utils.js"; +import sql from "./sql.js"; +import protectedSessionService from "./protected_session.js"; +import searchService from "../services/search/services/search.js"; +import SearchContext from "../services/search/search_context.js"; +import hoistedNoteService from "./hoisted_note.js"; +import BNote from "../becca/entities/bnote.js"; const CALENDAR_ROOT_LABEL = 'calendarRoot'; const YEAR_LABEL = 'yearNote'; diff --git a/src/services/date_utils.ts b/src/services/date_utils.ts index 88b6ecb69..b22cb2d88 100644 --- a/src/services/date_utils.ts +++ b/src/services/date_utils.ts @@ -1,5 +1,5 @@ import dayjs = require('dayjs'); -import cls = require('./cls'); +import cls from "./cls.js"; 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/encryption/data_encryption.ts b/src/services/encryption/data_encryption.ts index b82a0e8c6..ce874c119 100644 --- a/src/services/encryption/data_encryption.ts +++ b/src/services/encryption/data_encryption.ts @@ -1,7 +1,7 @@ "use strict"; import crypto = require('crypto'); -import log = require('../log'); +import log from "../log.js"; function arraysIdentical(a: any[] | Buffer, b: any[] | Buffer) { let i = a.length; diff --git a/src/services/encryption/my_scrypt.ts b/src/services/encryption/my_scrypt.ts index c80632bc0..f8a07a930 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'); +import optionService from "../options.js"; import crypto = require('crypto'); function getVerificationHash(password: crypto.BinaryLike) { diff --git a/src/services/encryption/password.ts b/src/services/encryption/password.ts index 4d6bf66a3..2d70b606b 100644 --- a/src/services/encryption/password.ts +++ b/src/services/encryption/password.ts @@ -1,10 +1,10 @@ "use strict"; -import sql = require('../sql'); -import optionService = require('../options'); -import myScryptService = require('./my_scrypt'); -import utils = require('../utils'); -import passwordEncryptionService = require('./password_encryption'); +import sql from "../sql.js"; +import optionService from "../options.js"; +import myScryptService from "./my_scrypt.js"; +import utils from "../utils.js"; +import passwordEncryptionService from "./password_encryption.js"; function isPasswordSet() { return !!sql.getValue("SELECT value FROM options WHERE name = 'passwordVerificationHash'"); diff --git a/src/services/encryption/password_encryption.ts b/src/services/encryption/password_encryption.ts index 36420d03d..7bd12d2f7 100644 --- a/src/services/encryption/password_encryption.ts +++ b/src/services/encryption/password_encryption.ts @@ -1,7 +1,7 @@ -import optionService = require('../options'); -import myScryptService = require('./my_scrypt'); -import utils = require('../utils'); -import dataEncryptionService = require('./data_encryption'); +import optionService from "../options.js"; +import myScryptService from "./my_scrypt.js"; +import utils from "../utils.js"; +import dataEncryptionService from "./data_encryption.js"; function verifyPassword(password: string) { const givenPasswordHash = utils.toBase64(myScryptService.getVerificationHash(password)); diff --git a/src/services/entity_changes.ts b/src/services/entity_changes.ts index 91f84f834..07f5bbf4e 100644 --- a/src/services/entity_changes.ts +++ b/src/services/entity_changes.ts @@ -1,11 +1,11 @@ -import sql = require('./sql'); -import dateUtils = require('./date_utils'); -import log = require('./log'); -import cls = require('./cls'); -import utils = require('./utils'); -import instanceId = require('./instance_id'); -import becca = require('../becca/becca'); -import blobService = require('../services/blob'); +import sql from "./sql.js"; +import dateUtils from "./date_utils.js"; +import log from "./log.js"; +import cls from "./cls.js"; +import utils from "./utils.js"; +import instanceId from "./instance_id.js"; +import becca from "../becca/becca.js"; +import blobService from "../services/blob.js"; import { EntityChange } from './entity_changes_interface'; import type { Blob } from "./blob-interface"; diff --git a/src/services/erase.ts b/src/services/erase.ts index 045f72915..2218d4304 100644 --- a/src/services/erase.ts +++ b/src/services/erase.ts @@ -1,11 +1,11 @@ -import sql = require('./sql'); -import revisionService = require('./revisions'); -import log = require('./log'); -import entityChangesService = require('./entity_changes'); -import optionService = require('./options'); -import dateUtils = require('./date_utils'); -import sqlInit = require('./sql_init'); -import cls = require('./cls'); +import sql from "./sql.js"; +import revisionService from "./revisions.js"; +import log from "./log.js"; +import entityChangesService from "./entity_changes.js"; +import optionService from "./options.js"; +import dateUtils from "./date_utils.js"; +import sqlInit from "./sql_init.js"; +import cls from "./cls.js"; import { EntityChange } from "./entity_changes_interface"; function eraseNotes(noteIdsToErase: string[]) { diff --git a/src/services/etapi_tokens.ts b/src/services/etapi_tokens.ts index a20ab5651..f314a7e8e 100644 --- a/src/services/etapi_tokens.ts +++ b/src/services/etapi_tokens.ts @@ -1,6 +1,6 @@ -import becca = require('../becca/becca'); -import utils = require('./utils'); -import BEtapiToken = require('../becca/entities/betapi_token'); +import becca from "../becca/becca.js"; +import utils from "./utils.js"; +import BEtapiToken from "../becca/entities/betapi_token.js"; import crypto = require('crypto'); function getTokens() { diff --git a/src/services/export/opml.ts b/src/services/export/opml.ts index 63bdf14fd..1f6e6c4d3 100644 --- a/src/services/export/opml.ts +++ b/src/services/export/opml.ts @@ -1,9 +1,9 @@ "use strict"; -import utils = require('../utils'); -import becca = require('../../becca/becca'); -import TaskContext = require('../task_context'); -import BBranch = require('../../becca/entities/bbranch'); +import utils from "../utils.js"; +import becca from "../../becca/becca.js"; +import TaskContext from "../task_context.js"; +import BBranch from "../../becca/entities/bbranch.js"; import { Response } from 'express'; function exportToOpml(taskContext: TaskContext, branch: BBranch, version: string, res: Response) { diff --git a/src/services/export/single.ts b/src/services/export/single.ts index b0f46e6e8..50ff47ca8 100644 --- a/src/services/export/single.ts +++ b/src/services/export/single.ts @@ -2,11 +2,11 @@ import mimeTypes = require('mime-types'); import html = require('html'); -import utils = require('../utils'); -import mdService = require('./md'); -import becca = require('../../becca/becca'); -import TaskContext = require('../task_context'); -import BBranch = require('../../becca/entities/bbranch'); +import utils from "../utils.js"; +import mdService from "./md.js"; +import becca from "../../becca/becca.js"; +import TaskContext from "../task_context.js"; +import BBranch from "../../becca/entities/bbranch.js"; import { Response } from 'express'; function exportSingleNote(taskContext: TaskContext, branch: BBranch, format: "html" | "markdown", res: Response) { diff --git a/src/services/export/zip.ts b/src/services/export/zip.ts index 8e4a2752a..05123beda 100644 --- a/src/services/export/zip.ts +++ b/src/services/export/zip.ts @@ -1,25 +1,25 @@ "use strict"; import html = require('html'); -import dateUtils = require('../date_utils'); +import dateUtils from "../date_utils.js"; import path = require('path'); import mimeTypes = require('mime-types'); -import mdService = require('./md'); -import packageInfo = require('../../../package.json'); -import utils = require('../utils'); -import protectedSessionService = require('../protected_session'); +import mdService from "./md.js"; +import packageInfo from "../../../package.json.js"; +import utils from "../utils.js"; +import protectedSessionService from "../protected_session.js"; import sanitize = require('sanitize-filename'); import fs = require('fs'); -import becca = require('../../becca/becca'); +import becca from "../../becca/becca.js"; const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR; import archiver = require('archiver'); -import log = require('../log'); -import TaskContext = require('../task_context'); -import ValidationError = require('../../errors/validation_error'); -import NoteMeta = require('../meta/note_meta'); -import AttachmentMeta = require('../meta/attachment_meta'); -import AttributeMeta = require('../meta/attribute_meta'); -import BBranch = require('../../becca/entities/bbranch'); +import log from "../log.js"; +import TaskContext from "../task_context.js"; +import ValidationError from "../../errors/validation_error.js"; +import NoteMeta from "../meta/note_meta.js"; +import AttachmentMeta from "../meta/attachment_meta.js"; +import AttributeMeta from "../meta/attribute_meta.js"; +import BBranch from "../../becca/entities/bbranch.js"; import { Response } from 'express'; async function exportToZip(taskContext: TaskContext, branch: BBranch, format: "html" | "markdown", res: Response | fs.WriteStream, setHeaders = true) { diff --git a/src/services/handlers.ts b/src/services/handlers.ts index 9e10b778a..d5fd5afa2 100644 --- a/src/services/handlers.ts +++ b/src/services/handlers.ts @@ -1,13 +1,13 @@ -import eventService = require('./events'); -import scriptService = require('./script'); -import treeService = require('./tree'); -import noteService = require('./notes'); -import becca = require('../becca/becca'); -import BAttribute = require('../becca/entities/battribute'); -import hiddenSubtreeService = require('./hidden_subtree'); -import oneTimeTimer = require('./one_time_timer'); -import BNote = require('../becca/entities/bnote'); -import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity'); +import eventService from "./events.js"; +import scriptService from "./script.js"; +import treeService from "./tree.js"; +import noteService from "./notes.js"; +import becca from "../becca/becca.js"; +import BAttribute from "../becca/entities/battribute.js"; +import hiddenSubtreeService from "./hidden_subtree.js"; +import oneTimeTimer from "./one_time_timer.js"; +import BNote from "../becca/entities/bnote.js"; +import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js"; import { DefinitionObject } from './promoted_attribute_definition_interface'; type Handler = (definition: DefinitionObject, note: BNote, targetNote: BNote) => void; diff --git a/src/services/hidden_subtree.ts b/src/services/hidden_subtree.ts index ff683e003..8080de9bb 100644 --- a/src/services/hidden_subtree.ts +++ b/src/services/hidden_subtree.ts @@ -1,10 +1,10 @@ -import BAttribute = require('../becca/entities/battribute'); +import BAttribute from "../becca/entities/battribute.js"; import { AttributeType, NoteType } from "../becca/entities/rows"; -import becca = require('../becca/becca'); -import noteService = require('./notes'); -import log = require('./log'); -import migrationService = require('./migration'); +import becca from "../becca/becca.js"; +import noteService from "./notes.js"; +import log from "./log.js"; +import migrationService from "./migration.js"; const LBTPL_ROOT = "_lbTplRoot"; const LBTPL_BASE = "_lbTplBase"; diff --git a/src/services/hoisted_note.ts b/src/services/hoisted_note.ts index fca423269..0c76de6e2 100644 --- a/src/services/hoisted_note.ts +++ b/src/services/hoisted_note.ts @@ -1,5 +1,5 @@ -import cls = require('./cls'); -import becca = require('../becca/becca'); +import cls from "./cls.js"; +import becca from "../becca/becca.js"; function getHoistedNoteId() { return cls.getHoistedNoteId(); diff --git a/src/services/host.ts b/src/services/host.ts index 3daef1504..2cff7b59d 100644 --- a/src/services/host.ts +++ b/src/services/host.ts @@ -1,3 +1,3 @@ -import config = require('./config'); +import config from "./config.js"; export = process.env.TRILIUM_HOST || config['Network']['host'] || '0.0.0.0'; diff --git a/src/services/image.ts b/src/services/image.ts index 0a95b87d6..7223d0af0 100644 --- a/src/services/image.ts +++ b/src/services/image.ts @@ -1,17 +1,17 @@ "use strict"; -import becca = require('../becca/becca'); -import log = require('./log'); -import protectedSessionService = require('./protected_session'); -import noteService = require('./notes'); -import optionService = require('./options'); -import sql = require('./sql'); +import becca from "../becca/becca.js"; +import log from "./log.js"; +import protectedSessionService from "./protected_session.js"; +import noteService from "./notes.js"; +import optionService from "./options.js"; +import sql from "./sql.js"; import jimp = require('jimp'); import imageType = require('image-type'); import sanitizeFilename = require('sanitize-filename'); import isSvg = require('is-svg'); import isAnimated = require('is-animated'); -import htmlSanitizer = require('./html_sanitizer'); +import htmlSanitizer from "./html_sanitizer.js"; async function processImage(uploadBuffer: Buffer, originalName: string, shrinkImageSwitch: boolean) { const compressImages = optionService.getOptionBool("compressImages"); diff --git a/src/services/import/enex.ts b/src/services/import/enex.ts index 998545fe9..0c1228aae 100644 --- a/src/services/import/enex.ts +++ b/src/services/import/enex.ts @@ -1,16 +1,16 @@ import sax = require('sax'); import stream = require('stream'); import { Throttle } from 'stream-throttle'; -import log = require('../log'); -import utils = require('../utils'); -import sql = require('../sql'); -import noteService = require('../notes'); -import imageService = require('../image'); -import protectedSessionService = require('../protected_session'); -import htmlSanitizer = require('../html_sanitizer'); -import sanitizeAttributeName = require('../sanitize_attribute_name'); -import TaskContext = require('../task_context'); -import BNote = require('../../becca/entities/bnote'); +import log from "../log.js"; +import utils from "../utils.js"; +import sql from "../sql.js"; +import noteService from "../notes.js"; +import imageService from "../image.js"; +import protectedSessionService from "../protected_session.js"; +import htmlSanitizer from "../html_sanitizer.js"; +import sanitizeAttributeName from "../sanitize_attribute_name.js"; +import TaskContext from "../task_context.js"; +import BNote from "../../becca/entities/bnote.js"; import { File } from "./common"; /** diff --git a/src/services/import/markdown.ts b/src/services/import/markdown.ts index 73c0e4833..97c540be4 100644 --- a/src/services/import/markdown.ts +++ b/src/services/import/markdown.ts @@ -1,8 +1,8 @@ "use strict"; import marked = require('marked'); -import htmlSanitizer = require('../html_sanitizer'); -import importUtils = require('./utils'); +import htmlSanitizer from "../html_sanitizer.js"; +import importUtils from "./utils.js"; function renderToHtml(content: string, title: string) { const html = marked.parse(content, { diff --git a/src/services/import/opml.ts b/src/services/import/opml.ts index 6223ea51d..316290dbf 100644 --- a/src/services/import/opml.ts +++ b/src/services/import/opml.ts @@ -1,11 +1,11 @@ "use strict"; -import noteService = require('../../services/notes'); +import noteService from "../../services/notes.js"; import xml2js = require('xml2js'); -import protectedSessionService = require('../protected_session'); -import htmlSanitizer = require('../html_sanitizer'); -import TaskContext = require('../task_context'); -import BNote = require('../../becca/entities/bnote'); +import protectedSessionService from "../protected_session.js"; +import htmlSanitizer from "../html_sanitizer.js"; +import TaskContext from "../task_context.js"; +import BNote from "../../becca/entities/bnote.js"; const parseString = xml2js.parseString; interface OpmlXml { diff --git a/src/services/import/single.ts b/src/services/import/single.ts index 44ec5e9e9..3550e4cd2 100644 --- a/src/services/import/single.ts +++ b/src/services/import/single.ts @@ -1,16 +1,16 @@ "use strict"; -import BNote = require('../../becca/entities/bnote'); -import TaskContext = require('../task_context'); +import BNote from "../../becca/entities/bnote.js"; +import TaskContext from "../task_context.js"; -import noteService = require('../../services/notes'); -import imageService = require('../../services/image'); -import protectedSessionService = require('../protected_session'); -import markdownService = require('./markdown'); -import mimeService = require('./mime'); -import utils = require('../../services/utils'); -import importUtils = require('./utils'); -import htmlSanitizer = require('../html_sanitizer'); +import noteService from "../../services/notes.js"; +import imageService from "../../services/image.js"; +import protectedSessionService from "../protected_session.js"; +import markdownService from "./markdown.js"; +import mimeService from "./mime.js"; +import utils from "../../services/utils.js"; +import importUtils from "./utils.js"; +import htmlSanitizer from "../html_sanitizer.js"; import { File } from "./common"; function importSingleFile(taskContext: TaskContext, file: File, parentNote: BNote) { diff --git a/src/services/import/zip.ts b/src/services/import/zip.ts index c29c398d6..0f274271c 100644 --- a/src/services/import/zip.ts +++ b/src/services/import/zip.ts @@ -1,24 +1,24 @@ "use strict"; -import BAttribute = require('../../becca/entities/battribute'); -import utils = require('../../services/utils'); -import log = require('../../services/log'); -import noteService = require('../../services/notes'); -import attributeService = require('../../services/attributes'); -import BBranch = require('../../becca/entities/bbranch'); +import BAttribute from "../../becca/entities/battribute.js"; +import utils from "../../services/utils.js"; +import log from "../../services/log.js"; +import noteService from "../../services/notes.js"; +import attributeService from "../../services/attributes.js"; +import BBranch from "../../becca/entities/bbranch.js"; import path = require('path'); -import protectedSessionService = require('../protected_session'); -import mimeService = require('./mime'); -import treeService = require('../tree'); +import protectedSessionService from "../protected_session.js"; +import mimeService from "./mime.js"; +import treeService from "../tree.js"; import yauzl = require('yauzl'); -import htmlSanitizer = require('../html_sanitizer'); -import becca = require('../../becca/becca'); -import BAttachment = require('../../becca/entities/battachment'); -import markdownService = require('./markdown'); -import TaskContext = require('../task_context'); -import BNote = require('../../becca/entities/bnote'); -import NoteMeta = require('../meta/note_meta'); -import AttributeMeta = require('../meta/attribute_meta'); +import htmlSanitizer from "../html_sanitizer.js"; +import becca from "../../becca/becca.js"; +import BAttachment from "../../becca/entities/battachment.js"; +import markdownService from "./markdown.js"; +import TaskContext from "../task_context.js"; +import BNote from "../../becca/entities/bnote.js"; +import NoteMeta from "../meta/note_meta.js"; +import AttributeMeta from "../meta/attribute_meta.js"; import { Stream } from 'stream'; import { ALLOWED_NOTE_TYPES, NoteType } from '../../becca/entities/rows'; diff --git a/src/services/instance_id.ts b/src/services/instance_id.ts index 6e0eb503c..fc1aedacb 100644 --- a/src/services/instance_id.ts +++ b/src/services/instance_id.ts @@ -1,4 +1,4 @@ -import utils = require('./utils'); +import utils from "./utils.js"; const instanceId = utils.randomString(12); diff --git a/src/services/keyboard_actions.ts b/src/services/keyboard_actions.ts index 715c62684..260966030 100644 --- a/src/services/keyboard_actions.ts +++ b/src/services/keyboard_actions.ts @@ -1,8 +1,8 @@ "use strict"; -import optionService = require('./options'); -import log = require('./log'); -import utils = require('./utils'); +import optionService from "./options.js"; +import log from "./log.js"; +import utils from "./utils.js"; import { KeyboardShortcut } from './keyboard_actions_interface'; const isMac = process.platform === "darwin"; diff --git a/src/services/log.ts b/src/services/log.ts index 904aebffb..f352dc175 100644 --- a/src/services/log.ts +++ b/src/services/log.ts @@ -2,8 +2,8 @@ import { Request, Response } from "express"; import fs = require('fs'); -import dataDir = require('./data_dir'); -import cls = require('./cls'); +import dataDir from "./data_dir.js"; +import cls from "./cls.js"; if (!fs.existsSync(dataDir.LOG_DIR)) { fs.mkdirSync(dataDir.LOG_DIR, 0o700); diff --git a/src/services/meta/note_meta.ts b/src/services/meta/note_meta.ts index f6467f213..9f30537b1 100644 --- a/src/services/meta/note_meta.ts +++ b/src/services/meta/note_meta.ts @@ -1,5 +1,5 @@ -import AttachmentMeta = require('./attachment_meta'); -import AttributeMeta = require('./attribute_meta'); +import AttachmentMeta from "./attachment_meta.js"; +import AttributeMeta from "./attribute_meta.js"; interface NoteMeta { noteId?: string; diff --git a/src/services/migration.ts b/src/services/migration.ts index ca647c539..37948953c 100644 --- a/src/services/migration.ts +++ b/src/services/migration.ts @@ -1,11 +1,11 @@ -import backupService = require('./backup'); -import sql = require('./sql'); +import backupService from "./backup.js"; +import sql from "./sql.js"; import fs = require('fs-extra'); -import log = require('./log'); -import utils = require('./utils'); -import resourceDir = require('./resource_dir'); -import appInfo = require('./app_info'); -import cls = require('./cls'); +import log from "./log.js"; +import utils from "./utils.js"; +import resourceDir from "./resource_dir.js"; +import appInfo from "./app_info.js"; +import cls from "./cls.js"; interface MigrationInfo { dbVersion: number; diff --git a/src/services/notes.ts b/src/services/notes.ts index d570237a3..60de35b42 100644 --- a/src/services/notes.ts +++ b/src/services/notes.ts @@ -1,30 +1,30 @@ -import sql = require('./sql'); -import optionService = require('./options'); -import dateUtils = require('./date_utils'); -import entityChangesService = require('./entity_changes'); -import eventService = require('./events'); -import cls = require('../services/cls'); -import protectedSessionService = require('../services/protected_session'); -import log = require('../services/log'); -import utils = require('../services/utils'); -import revisionService = require('./revisions'); -import request = require('./request'); +import sql from "./sql.js"; +import optionService from "./options.js"; +import dateUtils from "./date_utils.js"; +import entityChangesService from "./entity_changes.js"; +import eventService from "./events.js"; +import cls from "../services/cls.js"; +import protectedSessionService from "../services/protected_session.js"; +import log from "../services/log.js"; +import utils from "../services/utils.js"; +import revisionService from "./revisions.js"; +import request from "./request.js"; import path = require('path'); import url = require('url'); -import becca = require('../becca/becca'); -import BBranch = require('../becca/entities/bbranch'); -import BNote = require('../becca/entities/bnote'); -import BAttribute = require('../becca/entities/battribute'); -import BAttachment = require('../becca/entities/battachment'); +import becca from "../becca/becca.js"; +import BBranch from "../becca/entities/bbranch.js"; +import BNote from "../becca/entities/bnote.js"; +import BAttribute from "../becca/entities/battribute.js"; +import BAttachment from "../becca/entities/battachment.js"; import dayjs = require('dayjs'); -import htmlSanitizer = require('./html_sanitizer'); -import ValidationError = require('../errors/validation_error'); -import noteTypesService = require('./note_types'); +import htmlSanitizer from "./html_sanitizer.js"; +import ValidationError from "../errors/validation_error.js"; +import noteTypesService from "./note_types.js"; import fs = require('fs'); -import ws = require('./ws'); +import ws from "./ws.js"; import html2plaintext = require('html2plaintext'); import { AttachmentRow, AttributeRow, BranchRow, NoteRow, NoteType } from '../becca/entities/rows'; -import TaskContext = require('./task_context'); +import TaskContext from "./task_context.js"; import { NoteParams } from './note-interface'; interface FoundLink { diff --git a/src/services/options.ts b/src/services/options.ts index b658e4ff7..2d060ba94 100644 --- a/src/services/options.ts +++ b/src/services/options.ts @@ -1,6 +1,6 @@ -import becca = require('../becca/becca'); +import becca from "../becca/becca.js"; import { OptionRow } from '../becca/entities/rows'; -import sql = require('./sql'); +import sql from "./sql.js"; function getOptionOrNull(name: string): string | null { let option; diff --git a/src/services/options_init.ts b/src/services/options_init.ts index e2ba1520a..ea8dcd252 100644 --- a/src/services/options_init.ts +++ b/src/services/options_init.ts @@ -1,9 +1,9 @@ -import optionService = require('./options'); -import appInfo = require('./app_info'); -import utils = require('./utils'); -import log = require('./log'); -import dateUtils = require('./date_utils'); -import keyboardActions = require('./keyboard_actions'); +import optionService from "./options.js"; +import appInfo from "./app_info.js"; +import utils from "./utils.js"; +import log from "./log.js"; +import dateUtils from "./date_utils.js"; +import keyboardActions from "./keyboard_actions.js"; import { KeyboardShortcutWithRequiredActionName } from './keyboard_actions_interface'; function initDocumentOptions() { diff --git a/src/services/port.ts b/src/services/port.ts index c37992d42..11fa847a0 100644 --- a/src/services/port.ts +++ b/src/services/port.ts @@ -1,7 +1,7 @@ -import config = require('./config'); -import utils = require('./utils'); -import env = require('./env'); -import dataDir = require('./data_dir'); +import config from "./config.js"; +import utils from "./utils.js"; +import env from "./env.js"; +import dataDir from "./data_dir.js"; function parseAndValidate(portStr: string, source: string) { const portNum = parseInt(portStr); diff --git a/src/services/protected_session.ts b/src/services/protected_session.ts index 6c1d6c223..ef6770c79 100644 --- a/src/services/protected_session.ts +++ b/src/services/protected_session.ts @@ -1,7 +1,7 @@ "use strict"; -import log = require('./log'); -import dataEncryptionService = require('./encryption/data_encryption'); +import log from "./log.js"; +import dataEncryptionService from "./encryption/data_encryption.js"; let dataKey: Buffer | null = null; diff --git a/src/services/request.ts b/src/services/request.ts index 85d0889ff..995ed97bb 100644 --- a/src/services/request.ts +++ b/src/services/request.ts @@ -1,9 +1,9 @@ "use strict"; -import utils = require('./utils'); -import log = require('./log'); +import utils from "./utils.js"; +import log from "./log.js"; import url = require('url'); -import syncOptions = require('./sync_options'); +import syncOptions from "./sync_options.js"; import { ExecOpts } from './request_interface'; // this service provides abstraction over node's HTTP/HTTPS and electron net.client APIs diff --git a/src/services/resource_dir.ts b/src/services/resource_dir.ts index cba351ac8..edb805264 100644 --- a/src/services/resource_dir.ts +++ b/src/services/resource_dir.ts @@ -1,4 +1,4 @@ -import log = require('./log'); +import log from "./log.js"; import path = require('path'); import fs = require('fs'); diff --git a/src/services/revisions.ts b/src/services/revisions.ts index 9cd281c13..2c497cc85 100644 --- a/src/services/revisions.ts +++ b/src/services/revisions.ts @@ -1,10 +1,10 @@ "use strict"; -import log = require('./log'); -import sql = require('./sql'); -import protectedSessionService = require('./protected_session'); -import dateUtils = require('./date_utils'); -import BNote = require('../becca/entities/bnote'); +import log from "./log.js"; +import sql from "./sql.js"; +import protectedSessionService from "./protected_session.js"; +import dateUtils from "./date_utils.js"; +import BNote from "../becca/entities/bnote.js"; function protectRevisions(note: BNote) { if (!protectedSessionService.isProtectedSessionAvailable()) { diff --git a/src/services/scheduler.ts b/src/services/scheduler.ts index 819de0e59..6d3dac8b8 100644 --- a/src/services/scheduler.ts +++ b/src/services/scheduler.ts @@ -1,12 +1,12 @@ -import scriptService = require('./script'); -import cls = require('./cls'); -import sqlInit = require('./sql_init'); -import config = require('./config'); -import log = require('./log'); -import attributeService = require('../services/attributes'); -import protectedSessionService = require('../services/protected_session'); -import hiddenSubtreeService = require('./hidden_subtree'); -import BNote = require('../becca/entities/bnote'); +import scriptService from "./script.js"; +import cls from "./cls.js"; +import sqlInit from "./sql_init.js"; +import config from "./config.js"; +import log from "./log.js"; +import attributeService from "../services/attributes.js"; +import protectedSessionService from "../services/protected_session.js"; +import hiddenSubtreeService from "./hidden_subtree.js"; +import BNote from "../becca/entities/bnote.js"; function getRunAtHours(note: BNote): number[] { try { diff --git a/src/services/script.ts b/src/services/script.ts index 975964b18..48e9d9b7e 100644 --- a/src/services/script.ts +++ b/src/services/script.ts @@ -1,8 +1,8 @@ -import ScriptContext = require('./script_context'); -import cls = require('./cls'); -import log = require('./log'); -import becca = require('../becca/becca'); -import BNote = require('../becca/entities/bnote'); +import ScriptContext from "./script_context.js"; +import cls from "./cls.js"; +import log from "./log.js"; +import becca from "../becca/becca.js"; +import BNote from "../becca/entities/bnote.js"; import { ApiParams } from './backend_script_api_interface'; interface Bundle { diff --git a/src/services/script_context.ts b/src/services/script_context.ts index 4de4863d0..f678c630b 100644 --- a/src/services/script_context.ts +++ b/src/services/script_context.ts @@ -1,6 +1,6 @@ -import utils = require('./utils'); -import BackendScriptApi = require('./backend_script_api'); -import BNote = require('../becca/entities/bnote'); +import utils from "./utils.js"; +import BackendScriptApi from "./backend_script_api.js"; +import BNote from "../becca/entities/bnote.js"; import { ApiParams } from './backend_script_api_interface'; type Module = { diff --git a/src/services/search/expressions/ancestor.ts b/src/services/search/expressions/ancestor.ts index 4e7380795..6c543d7dd 100644 --- a/src/services/search/expressions/ancestor.ts +++ b/src/services/search/expressions/ancestor.ts @@ -1,10 +1,10 @@ "use strict"; -import Expression = require('./expression'); -import NoteSet = require('../note_set'); -import log = require('../../log'); -import becca = require('../../../becca/becca'); -import SearchContext = require('../search_context'); +import Expression from "./expression.js"; +import NoteSet from "../note_set.js"; +import log from "../../log.js"; +import becca from "../../../becca/becca.js"; +import SearchContext from "../search_context.js"; class AncestorExp extends Expression { diff --git a/src/services/search/expressions/and.ts b/src/services/search/expressions/and.ts index 82c73fe70..2a9254a2b 100644 --- a/src/services/search/expressions/and.ts +++ b/src/services/search/expressions/and.ts @@ -1,9 +1,9 @@ "use strict"; -import NoteSet = require('../note_set'); -import SearchContext = require('../search_context'); -import Expression = require('./expression'); -import TrueExp = require('./true'); +import NoteSet from "../note_set.js"; +import SearchContext from "../search_context.js"; +import Expression from "./expression.js"; +import TrueExp from "./true.js"; class AndExp extends Expression { private subExpressions: Expression[]; diff --git a/src/services/search/expressions/attribute_exists.ts b/src/services/search/expressions/attribute_exists.ts index d8de33962..0a9419bcb 100644 --- a/src/services/search/expressions/attribute_exists.ts +++ b/src/services/search/expressions/attribute_exists.ts @@ -1,10 +1,10 @@ "use strict"; -import NoteSet = require('../note_set'); -import SearchContext = require('../search_context'); +import NoteSet from "../note_set.js"; +import SearchContext from "../search_context.js"; -import becca = require('../../../becca/becca'); -import Expression = require('./expression'); +import becca from "../../../becca/becca.js"; +import Expression from "./expression.js"; class AttributeExistsExp extends Expression { diff --git a/src/services/search/expressions/child_of.ts b/src/services/search/expressions/child_of.ts index 10d31c00a..91ae19fc0 100644 --- a/src/services/search/expressions/child_of.ts +++ b/src/services/search/expressions/child_of.ts @@ -1,8 +1,8 @@ "use strict"; -import Expression = require('./expression'); -import NoteSet = require('../note_set'); -import SearchContext = require('../search_context'); +import Expression from "./expression.js"; +import NoteSet from "../note_set.js"; +import SearchContext from "../search_context.js"; class ChildOfExp extends Expression { diff --git a/src/services/search/expressions/descendant_of.ts b/src/services/search/expressions/descendant_of.ts index 6994056c8..92b6f4687 100644 --- a/src/services/search/expressions/descendant_of.ts +++ b/src/services/search/expressions/descendant_of.ts @@ -1,9 +1,9 @@ "use strict"; -import Expression = require('./expression'); -import NoteSet = require('../note_set'); -import becca = require('../../../becca/becca'); -import SearchContext = require('../search_context'); +import Expression from "./expression.js"; +import NoteSet from "../note_set.js"; +import becca from "../../../becca/becca.js"; +import SearchContext from "../search_context.js"; class DescendantOfExp extends Expression { private subExpression: Expression; diff --git a/src/services/search/expressions/expression.ts b/src/services/search/expressions/expression.ts index 39c95ed47..a72b65347 100644 --- a/src/services/search/expressions/expression.ts +++ b/src/services/search/expressions/expression.ts @@ -1,7 +1,7 @@ "use strict"; -import NoteSet = require('../note_set'); -import SearchContext = require('../search_context'); +import NoteSet from "../note_set.js"; +import SearchContext from "../search_context.js"; abstract class Expression { name: string; diff --git a/src/services/search/expressions/is_hidden.ts b/src/services/search/expressions/is_hidden.ts index 81bef22b3..a2cccea60 100644 --- a/src/services/search/expressions/is_hidden.ts +++ b/src/services/search/expressions/is_hidden.ts @@ -1,8 +1,8 @@ "use strict"; -import Expression = require('./expression'); -import NoteSet = require('../note_set'); -import SearchContext = require('../search_context'); +import Expression from "./expression.js"; +import NoteSet from "../note_set.js"; +import SearchContext from "../search_context.js"; /** * Note is hidden when all its note paths start in hidden subtree (i.e., the note is not cloned into visible tree) diff --git a/src/services/search/expressions/label_comparison.ts b/src/services/search/expressions/label_comparison.ts index b455f82ca..fa472dcdb 100644 --- a/src/services/search/expressions/label_comparison.ts +++ b/src/services/search/expressions/label_comparison.ts @@ -1,9 +1,9 @@ "use strict"; -import Expression = require('./expression'); -import NoteSet = require('../note_set'); -import becca = require('../../../becca/becca'); -import SearchContext = require('../search_context'); +import Expression from "./expression.js"; +import NoteSet from "../note_set.js"; +import becca from "../../../becca/becca.js"; +import SearchContext from "../search_context.js"; type Comparator = (value: string) => boolean; diff --git a/src/services/search/expressions/not.ts b/src/services/search/expressions/not.ts index e1b31c84e..74a1d73b0 100644 --- a/src/services/search/expressions/not.ts +++ b/src/services/search/expressions/not.ts @@ -1,8 +1,8 @@ "use strict"; -import NoteSet = require('../note_set'); -import SearchContext = require('../search_context'); -import Expression = require('./expression'); +import NoteSet from "../note_set.js"; +import SearchContext from "../search_context.js"; +import Expression from "./expression.js"; class NotExp extends Expression { private subExpression: Expression; diff --git a/src/services/search/expressions/note_content_fulltext.ts b/src/services/search/expressions/note_content_fulltext.ts index 68af72b25..3533efdeb 100644 --- a/src/services/search/expressions/note_content_fulltext.ts +++ b/src/services/search/expressions/note_content_fulltext.ts @@ -1,16 +1,16 @@ "use strict"; import { NoteRow } from "../../../becca/entities/rows"; -import SearchContext = require('../search_context'); +import SearchContext from "../search_context.js"; -import Expression = require('./expression'); -import NoteSet = require('../note_set'); -import log = require('../../log'); -import becca = require('../../../becca/becca'); -import protectedSessionService = require('../../protected_session'); +import Expression from "./expression.js"; +import NoteSet from "../note_set.js"; +import log from "../../log.js"; +import becca from "../../../becca/becca.js"; +import protectedSessionService from "../../protected_session.js"; import striptags = require('striptags'); -import utils = require('../../utils'); -import sql = require('../../sql'); +import utils from "../../utils.js"; +import sql from "../../sql.js"; const ALLOWED_OPERATORS = ['=', '!=', '*=*', '*=', '=*', '%=']; diff --git a/src/services/search/expressions/note_flat_text.ts b/src/services/search/expressions/note_flat_text.ts index a067b456a..a4e794149 100644 --- a/src/services/search/expressions/note_flat_text.ts +++ b/src/services/search/expressions/note_flat_text.ts @@ -1,12 +1,12 @@ "use strict"; -import BNote = require('../../../becca/entities/bnote'); -import SearchContext = require('../search_context'); +import BNote from "../../../becca/entities/bnote.js"; +import SearchContext from "../search_context.js"; -import Expression = require('./expression'); -import NoteSet = require('../note_set'); -import becca = require('../../../becca/becca'); -import utils = require('../../utils'); +import Expression from "./expression.js"; +import NoteSet from "../note_set.js"; +import becca from "../../../becca/becca.js"; +import utils from "../../utils.js"; class NoteFlatTextExp extends Expression { private tokens: string[]; diff --git a/src/services/search/expressions/or.ts b/src/services/search/expressions/or.ts index f89e9070e..284563ee9 100644 --- a/src/services/search/expressions/or.ts +++ b/src/services/search/expressions/or.ts @@ -1,9 +1,9 @@ "use strict"; -import Expression = require('./expression'); -import NoteSet = require('../note_set'); -import TrueExp = require('./true'); -import SearchContext = require('../search_context'); +import Expression from "./expression.js"; +import NoteSet from "../note_set.js"; +import TrueExp from "./true.js"; +import SearchContext from "../search_context.js"; class OrExp extends Expression { private subExpressions: Expression[]; diff --git a/src/services/search/expressions/order_by_and_limit.ts b/src/services/search/expressions/order_by_and_limit.ts index 87e6af093..fac5126f3 100644 --- a/src/services/search/expressions/order_by_and_limit.ts +++ b/src/services/search/expressions/order_by_and_limit.ts @@ -1,9 +1,9 @@ "use strict"; -import BNote = require('../../../becca/entities/bnote'); -import NoteSet = require('../note_set'); -import SearchContext = require('../search_context'); -import Expression = require('./expression'); +import BNote from "../../../becca/entities/bnote.js"; +import NoteSet from "../note_set.js"; +import SearchContext from "../search_context.js"; +import Expression from "./expression.js"; interface ValueExtractor { extract: (note: BNote) => number | string | null; diff --git a/src/services/search/expressions/parent_of.ts b/src/services/search/expressions/parent_of.ts index bd7b9d304..872cfe825 100644 --- a/src/services/search/expressions/parent_of.ts +++ b/src/services/search/expressions/parent_of.ts @@ -1,8 +1,8 @@ "use strict"; -import Expression = require('./expression'); -import NoteSet = require('../note_set'); -import SearchContext = require('../search_context'); +import Expression from "./expression.js"; +import NoteSet from "../note_set.js"; +import SearchContext from "../search_context.js"; class ParentOfExp extends Expression { private subExpression: Expression; diff --git a/src/services/search/expressions/property_comparison.ts b/src/services/search/expressions/property_comparison.ts index 843b5a862..6902df898 100644 --- a/src/services/search/expressions/property_comparison.ts +++ b/src/services/search/expressions/property_comparison.ts @@ -1,8 +1,8 @@ "use strict"; -import Expression = require('./expression'); -import NoteSet = require('../note_set'); -import buildComparator = require('../services/build_comparator'); +import Expression from "./expression.js"; +import NoteSet from "../note_set.js"; +import buildComparator from "../services/build_comparator.js"; /** * Search string is lower cased for case-insensitive comparison. But when retrieving properties, diff --git a/src/services/search/expressions/relation_where.ts b/src/services/search/expressions/relation_where.ts index 9f33dcecf..1676eeafe 100644 --- a/src/services/search/expressions/relation_where.ts +++ b/src/services/search/expressions/relation_where.ts @@ -1,9 +1,9 @@ "use strict"; -import Expression = require('./expression'); -import NoteSet = require('../note_set'); -import becca = require('../../../becca/becca'); -import SearchContext = require('../search_context'); +import Expression from "./expression.js"; +import NoteSet from "../note_set.js"; +import becca from "../../../becca/becca.js"; +import SearchContext from "../search_context.js"; class RelationWhereExp extends Expression { private relationName: string; diff --git a/src/services/search/expressions/true.ts b/src/services/search/expressions/true.ts index 29df7df0f..afc0b8a25 100644 --- a/src/services/search/expressions/true.ts +++ b/src/services/search/expressions/true.ts @@ -1,9 +1,9 @@ "use strict"; -import NoteSet = require('../note_set'); -import SearchContext = require('../search_context'); +import NoteSet from "../note_set.js"; +import SearchContext from "../search_context.js"; -import Expression = require('./expression'); +import Expression from "./expression.js"; class TrueExp extends Expression { execute(inputNoteSet: NoteSet, executionContext: {}, searchContext: SearchContext): NoteSet { diff --git a/src/services/search/note_set.ts b/src/services/search/note_set.ts index 82ea6d723..e5ce38720 100644 --- a/src/services/search/note_set.ts +++ b/src/services/search/note_set.ts @@ -1,6 +1,6 @@ "use strict"; -import BNote = require('../../becca/entities/bnote'); +import BNote from "../../becca/entities/bnote.js"; class NoteSet { diff --git a/src/services/search/search_context.ts b/src/services/search/search_context.ts index f7c1e2198..29e0bd55d 100644 --- a/src/services/search/search_context.ts +++ b/src/services/search/search_context.ts @@ -1,6 +1,6 @@ "use strict"; -import hoistedNoteService = require('../hoisted_note'); +import hoistedNoteService from "../hoisted_note.js"; import { SearchParams } from './services/types'; class SearchContext { diff --git a/src/services/search/search_result.ts b/src/services/search/search_result.ts index cf651d58e..9e7d8311a 100644 --- a/src/services/search/search_result.ts +++ b/src/services/search/search_result.ts @@ -1,7 +1,7 @@ "use strict"; -import beccaService = require('../../becca/becca_service'); -import becca = require('../../becca/becca'); +import beccaService from "../../becca/becca_service.js"; +import becca from "../../becca/becca.js"; class SearchResult { notePathArray: string[]; diff --git a/src/services/search/services/parse.ts b/src/services/search/services/parse.ts index fe1731d24..389e018d7 100644 --- a/src/services/search/services/parse.ts +++ b/src/services/search/services/parse.ts @@ -1,28 +1,28 @@ "use strict"; import dayjs = require('dayjs'); -import AndExp = require('../expressions/and'); -import OrExp = require('../expressions/or'); -import NotExp = require('../expressions/not'); -import ChildOfExp = require('../expressions/child_of'); -import DescendantOfExp = require('../expressions/descendant_of'); -import ParentOfExp = require('../expressions/parent_of'); -import RelationWhereExp = require('../expressions/relation_where'); -import PropertyComparisonExp = require('../expressions/property_comparison'); -import AttributeExistsExp = require('../expressions/attribute_exists'); -import LabelComparisonExp = require('../expressions/label_comparison'); -import NoteFlatTextExp = require('../expressions/note_flat_text'); -import NoteContentFulltextExp = require('../expressions/note_content_fulltext'); -import OrderByAndLimitExp = require('../expressions/order_by_and_limit'); -import AncestorExp = require('../expressions/ancestor'); -import buildComparator = require('./build_comparator'); -import ValueExtractor = require('../value_extractor'); -import utils = require('../../utils'); -import TrueExp = require('../expressions/true'); -import IsHiddenExp = require('../expressions/is_hidden'); -import SearchContext = require('../search_context'); +import AndExp from "../expressions/and.js"; +import OrExp from "../expressions/or.js"; +import NotExp from "../expressions/not.js"; +import ChildOfExp from "../expressions/child_of.js"; +import DescendantOfExp from "../expressions/descendant_of.js"; +import ParentOfExp from "../expressions/parent_of.js"; +import RelationWhereExp from "../expressions/relation_where.js"; +import PropertyComparisonExp from "../expressions/property_comparison.js"; +import AttributeExistsExp from "../expressions/attribute_exists.js"; +import LabelComparisonExp from "../expressions/label_comparison.js"; +import NoteFlatTextExp from "../expressions/note_flat_text.js"; +import NoteContentFulltextExp from "../expressions/note_content_fulltext.js"; +import OrderByAndLimitExp from "../expressions/order_by_and_limit.js"; +import AncestorExp from "../expressions/ancestor.js"; +import buildComparator from "./build_comparator.js"; +import ValueExtractor from "../value_extractor.js"; +import utils from "../../utils.js"; +import TrueExp from "../expressions/true.js"; +import IsHiddenExp from "../expressions/is_hidden.js"; +import SearchContext from "../search_context.js"; import { TokenData } from "./types"; -import Expression = require('../expressions/expression'); +import Expression from "../expressions/expression.js"; function getFulltext(_tokens: TokenData[], searchContext: SearchContext) { const tokens: string[] = _tokens.map(t => utils.removeDiacritic(t.token)); diff --git a/src/services/search/services/search.ts b/src/services/search/services/search.ts index 6d3103a65..6ce2caa8d 100644 --- a/src/services/search/services/search.ts +++ b/src/services/search/services/search.ts @@ -1,21 +1,21 @@ "use strict"; import normalizeString = require('normalize-strings'); -import lex = require('./lex'); -import handleParens = require('./handle_parens'); -import parse = require('./parse'); -import SearchResult = require('../search_result'); -import SearchContext = require('../search_context'); -import becca = require('../../../becca/becca'); -import beccaService = require('../../../becca/becca_service'); -import utils = require('../../utils'); -import log = require('../../log'); -import hoistedNoteService = require('../../hoisted_note'); -import BNote = require('../../../becca/entities/bnote'); -import BAttribute = require('../../../becca/entities/battribute'); +import lex from "./lex.js"; +import handleParens from "./handle_parens.js"; +import parse from "./parse.js"; +import SearchResult from "../search_result.js"; +import SearchContext from "../search_context.js"; +import becca from "../../../becca/becca.js"; +import beccaService from "../../../becca/becca_service.js"; +import utils from "../../utils.js"; +import log from "../../log.js"; +import hoistedNoteService from "../../hoisted_note.js"; +import BNote from "../../../becca/entities/bnote.js"; +import BAttribute from "../../../becca/entities/battribute.js"; import { SearchParams, TokenData } from "./types"; -import Expression = require('../expressions/expression'); -import sql = require('../../sql'); +import Expression from "../expressions/expression.js"; +import sql from "../../sql.js"; function searchFromNote(note: BNote) { let searchResultNoteIds; diff --git a/src/services/search/value_extractor.ts b/src/services/search/value_extractor.ts index 730adadc5..805d658fd 100644 --- a/src/services/search/value_extractor.ts +++ b/src/services/search/value_extractor.ts @@ -1,6 +1,6 @@ "use strict"; -import BNote = require('../../becca/entities/bnote'); +import BNote from "../../becca/entities/bnote.js"; /** * Search string is lower cased for case-insensitive comparison. But when retrieving properties, diff --git a/src/services/session_secret.ts b/src/services/session_secret.ts index 20b35efb2..835aac38f 100644 --- a/src/services/session_secret.ts +++ b/src/services/session_secret.ts @@ -2,8 +2,8 @@ import fs = require('fs'); import crypto = require('crypto'); -import dataDir = require('./data_dir'); -import log = require('./log'); +import dataDir from "./data_dir.js"; +import log from "./log.js"; const sessionSecretPath = `${dataDir.TRILIUM_DATA_DIR}/session_secret.txt`; diff --git a/src/services/setup.ts b/src/services/setup.ts index 08b1ee806..97830bb14 100644 --- a/src/services/setup.ts +++ b/src/services/setup.ts @@ -1,12 +1,12 @@ -import syncService = require('./sync'); -import log = require('./log'); -import sqlInit = require('./sql_init'); -import optionService = require('./options'); -import syncOptions = require('./sync_options'); -import request = require('./request'); -import appInfo = require('./app_info'); -import utils = require('./utils'); -import becca = require('../becca/becca'); +import syncService from "./sync.js"; +import log from "./log.js"; +import sqlInit from "./sql_init.js"; +import optionService from "./options.js"; +import syncOptions from "./sync_options.js"; +import request from "./request.js"; +import appInfo from "./app_info.js"; +import utils from "./utils.js"; +import becca from "../becca/becca.js"; import { SetupStatusResponse, SetupSyncSeedResponse } from './api-interface'; async function hasSyncServerSchemaAndSeed() { diff --git a/src/services/special_notes.ts b/src/services/special_notes.ts index 65cc14c31..cd6b3b61b 100644 --- a/src/services/special_notes.ts +++ b/src/services/special_notes.ts @@ -1,13 +1,13 @@ -import attributeService = require('./attributes'); -import dateNoteService = require('./date_notes'); -import becca = require('../becca/becca'); -import noteService = require('./notes'); -import dateUtils = require('./date_utils'); -import log = require('./log'); -import hoistedNoteService = require('./hoisted_note'); -import searchService = require('./search/services/search'); -import SearchContext = require('./search/search_context'); -import hiddenSubtree = require('./hidden_subtree'); +import attributeService from "./attributes.js"; +import dateNoteService from "./date_notes.js"; +import becca from "../becca/becca.js"; +import noteService from "./notes.js"; +import dateUtils from "./date_utils.js"; +import log from "./log.js"; +import hoistedNoteService from "./hoisted_note.js"; +import searchService from "./search/services/search.js"; +import SearchContext from "./search/search_context.js"; +import hiddenSubtree from "./hidden_subtree.js"; const { LBTPL_NOTE_LAUNCHER, LBTPL_CUSTOM_WIDGET, LBTPL_SPACER, LBTPL_SCRIPT } = hiddenSubtree; function getInboxNote(date: string) { diff --git a/src/services/sql.ts b/src/services/sql.ts index 8565e0bdb..84ea52018 100644 --- a/src/services/sql.ts +++ b/src/services/sql.ts @@ -4,10 +4,10 @@ * @module sql */ -import log = require('./log'); +import log from "./log.js"; import type { Statement, Database as DatabaseType, RunResult } from "better-sqlite3"; -import dataDir = require('./data_dir'); -import cls = require('./cls'); +import dataDir from "./data_dir.js"; +import cls from "./cls.js"; import fs = require('fs-extra'); import Database = require('better-sqlite3'); diff --git a/src/services/sql_init.ts b/src/services/sql_init.ts index 5c9937daa..ad4777105 100644 --- a/src/services/sql_init.ts +++ b/src/services/sql_init.ts @@ -1,15 +1,15 @@ -import log = require('./log'); +import log from "./log.js"; import fs = require('fs'); -import resourceDir = require('./resource_dir'); -import sql = require('./sql'); -import utils = require('./utils'); -import optionService = require('./options'); -import port = require('./port'); -import BOption = require('../becca/entities/boption'); -import TaskContext = require('./task_context'); -import migrationService = require('./migration'); -import cls = require('./cls'); -import config = require('./config'); +import resourceDir from "./resource_dir.js"; +import sql from "./sql.js"; +import utils from "./utils.js"; +import optionService from "./options.js"; +import port from "./port.js"; +import BOption from "../becca/entities/boption.js"; +import TaskContext from "./task_context.js"; +import migrationService from "./migration.js"; +import cls from "./cls.js"; +import config from "./config.js"; import { OptionRow } from '../becca/entities/rows'; const dbReady = utils.deferred(); diff --git a/src/services/sync.ts b/src/services/sync.ts index 8c8183984..f67687b8e 100644 --- a/src/services/sync.ts +++ b/src/services/sync.ts @@ -1,22 +1,22 @@ "use strict"; -import log = require('./log'); -import sql = require('./sql'); -import optionService = require('./options'); -import utils = require('./utils'); -import instanceId = require('./instance_id'); -import dateUtils = require('./date_utils'); -import syncUpdateService = require('./sync_update'); -import contentHashService = require('./content_hash'); -import appInfo = require('./app_info'); -import syncOptions = require('./sync_options'); -import syncMutexService = require('./sync_mutex'); -import cls = require('./cls'); -import request = require('./request'); -import ws = require('./ws'); -import entityChangesService = require('./entity_changes'); -import entityConstructor = require('../becca/entity_constructor'); -import becca = require('../becca/becca'); +import log from "./log.js"; +import sql from "./sql.js"; +import optionService from "./options.js"; +import utils from "./utils.js"; +import instanceId from "./instance_id.js"; +import dateUtils from "./date_utils.js"; +import syncUpdateService from "./sync_update.js"; +import contentHashService from "./content_hash.js"; +import appInfo from "./app_info.js"; +import syncOptions from "./sync_options.js"; +import syncMutexService from "./sync_mutex.js"; +import cls from "./cls.js"; +import request from "./request.js"; +import ws from "./ws.js"; +import entityChangesService from "./entity_changes.js"; +import entityConstructor from "../becca/entity_constructor.js"; +import becca from "../becca/becca.js"; import { EntityChange, EntityChangeRecord, EntityRow } from './entity_changes_interface'; import { CookieJar, ExecOpts } from './request_interface'; diff --git a/src/services/sync_options.ts b/src/services/sync_options.ts index 92aea6c3f..6423e5fb2 100644 --- a/src/services/sync_options.ts +++ b/src/services/sync_options.ts @@ -1,7 +1,7 @@ "use strict"; -import optionService = require('./options'); -import config = require('./config'); +import optionService from "./options.js"; +import config from "./config.js"; /* * Primary configuration for sync is in the options (document), but we allow to override diff --git a/src/services/sync_update.ts b/src/services/sync_update.ts index 888947b8b..4d6728d93 100644 --- a/src/services/sync_update.ts +++ b/src/services/sync_update.ts @@ -1,9 +1,9 @@ -import sql = require('./sql'); -import log = require('./log'); -import entityChangesService = require('./entity_changes'); -import eventService = require('./events'); -import entityConstructor = require('../becca/entity_constructor'); -import ws = require('./ws'); +import sql from "./sql.js"; +import log from "./log.js"; +import entityChangesService from "./entity_changes.js"; +import eventService from "./events.js"; +import entityConstructor from "../becca/entity_constructor.js"; +import ws from "./ws.js"; import { EntityChange, EntityChangeRecord, EntityRow } from './entity_changes_interface'; interface UpdateContext { diff --git a/src/services/task_context.ts b/src/services/task_context.ts index 27f7d1358..37d2de8dd 100644 --- a/src/services/task_context.ts +++ b/src/services/task_context.ts @@ -1,7 +1,7 @@ "use strict"; import { TaskData } from './task_context_interface'; -import ws = require('./ws'); +import ws from "./ws.js"; // taskId => TaskContext const taskContexts: Record = {}; diff --git a/src/services/tray.ts b/src/services/tray.ts index 70d686adb..5939da76d 100644 --- a/src/services/tray.ts +++ b/src/services/tray.ts @@ -1,7 +1,7 @@ import { Menu, Tray } from 'electron'; import path = require('path'); -import windowService = require('./window'); -import optionService = require('./options'); +import windowService from "./window.js"; +import optionService from "./options.js"; let tray: Tray; // `mainWindow.isVisible` doesn't work with `mainWindow.show` and `mainWindow.hide` - it returns `false` when the window diff --git a/src/services/tree.ts b/src/services/tree.ts index d731fe6b0..6bf2dbb29 100644 --- a/src/services/tree.ts +++ b/src/services/tree.ts @@ -1,11 +1,11 @@ "use strict"; -import sql = require('./sql'); -import log = require('./log'); -import BBranch = require('../becca/entities/bbranch'); -import entityChangesService = require('./entity_changes'); -import becca = require('../becca/becca'); -import BNote = require('../becca/entities/bnote'); +import sql from "./sql.js"; +import log from "./log.js"; +import BBranch from "../becca/entities/bbranch.js"; +import entityChangesService from "./entity_changes.js"; +import becca from "../becca/becca.js"; +import BNote from "../becca/entities/bnote.js"; function validateParentChild(parentNoteId: string, childNoteId: string, branchId: string | null = null) { if (['root', '_hidden', '_share', '_lbRoot', '_lbAvailableLaunchers', '_lbVisibleLaunchers'].includes(childNoteId)) { diff --git a/src/services/window.ts b/src/services/window.ts index 80c93a5cc..3a4aece7d 100644 --- a/src/services/window.ts +++ b/src/services/window.ts @@ -1,12 +1,12 @@ import path = require('path'); import url = require('url'); -import port = require('./port'); -import optionService = require('./options'); -import env = require('./env'); -import log = require('./log'); -import sqlInit = require('./sql_init'); -import cls = require('./cls'); -import keyboardActionsService = require('./keyboard_actions'); +import port from "./port.js"; +import optionService from "./options.js"; +import env from "./env.js"; +import log from "./log.js"; +import sqlInit from "./sql_init.js"; +import cls from "./cls.js"; +import keyboardActionsService from "./keyboard_actions.js"; import remoteMain = require('@electron/remote/main') import { App, BrowserWindow, WebContents, ipcMain } from 'electron'; diff --git a/src/services/ws.ts b/src/services/ws.ts index ec7d47187..5f448e97c 100644 --- a/src/services/ws.ts +++ b/src/services/ws.ts @@ -1,15 +1,15 @@ import WebSocket = require('ws'); -import utils = require('./utils'); -import log = require('./log'); -import sql = require('./sql'); -import cls = require('./cls'); -import config = require('./config'); -import syncMutexService = require('./sync_mutex'); -import protectedSessionService = require('./protected_session'); -import becca = require('../becca/becca'); -import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity'); +import utils from "./utils.js"; +import log from "./log.js"; +import sql from "./sql.js"; +import cls from "./cls.js"; +import config from "./config.js"; +import syncMutexService from "./sync_mutex.js"; +import protectedSessionService from "./protected_session.js"; +import becca from "../becca/becca.js"; +import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js"; -import env = require('./env'); +import env from "./env.js"; import { IncomingMessage, Server } from 'http'; import { EntityChange } from './entity_changes_interface'; diff --git a/src/share/content_renderer.ts b/src/share/content_renderer.ts index 238efeae1..1d64dcd0c 100644 --- a/src/share/content_renderer.ts +++ b/src/share/content_renderer.ts @@ -1,9 +1,9 @@ import { JSDOM } from "jsdom"; -import shaca = require('./shaca/shaca'); -import assetPath = require('../services/asset_path'); -import shareRoot = require('./share_root'); +import shaca from "./shaca/shaca.js"; +import assetPath from "../services/asset_path.js"; +import shareRoot from "./share_root.js"; import escapeHtml = require('escape-html'); -import SNote = require('./shaca/entities/snote'); +import SNote from "./shaca/entities/snote.js"; interface Result { header: string; diff --git a/src/share/routes.ts b/src/share/routes.ts index 2b5650c6c..34af79feb 100644 --- a/src/share/routes.ts +++ b/src/share/routes.ts @@ -3,18 +3,18 @@ import ejs = require('ejs'); import type { Request, Response, Router } from "express"; -import shaca = require('./shaca/shaca'); -import shacaLoader = require('./shaca/shaca_loader'); -import shareRoot = require('./share_root'); -import contentRenderer = require('./content_renderer'); -import assetPath = require('../services/asset_path'); -import appPath = require('../services/app_path'); -import searchService = require('../services/search/services/search'); -import SearchContext = require('../services/search/search_context'); -import log = require('../services/log'); -import SNote = require('./shaca/entities/snote'); -import SBranch = require('./shaca/entities/sbranch'); -import SAttachment = require('./shaca/entities/sattachment'); +import shaca from "./shaca/shaca.js"; +import shacaLoader from "./shaca/shaca_loader.js"; +import shareRoot from "./share_root.js"; +import contentRenderer from "./content_renderer.js"; +import assetPath from "../services/asset_path.js"; +import appPath from "../services/app_path.js"; +import searchService from "../services/search/services/search.js"; +import SearchContext from "../services/search/search_context.js"; +import log from "../services/log.js"; +import SNote from "./shaca/entities/snote.js"; +import SBranch from "./shaca/entities/sbranch.js"; +import SAttachment from "./shaca/entities/sattachment.js"; function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } { if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) { diff --git a/src/share/shaca/entities/sattachment.ts b/src/share/shaca/entities/sattachment.ts index 7951fe081..d913d32b2 100644 --- a/src/share/shaca/entities/sattachment.ts +++ b/src/share/shaca/entities/sattachment.ts @@ -1,9 +1,9 @@ "use strict"; -import sql = require('../../sql'); -import utils = require('../../../services/utils'); -import AbstractShacaEntity = require('./abstract_shaca_entity'); -import SNote = require('./snote'); +import sql from "../../sql.js"; +import utils from "../../../services/utils.js"; +import AbstractShacaEntity from "./abstract_shaca_entity.js"; +import SNote from "./snote.js"; import { Blob } from '../../../services/blob-interface'; import { SAttachmentRow } from './rows'; diff --git a/src/share/shaca/entities/sattribute.ts b/src/share/shaca/entities/sattribute.ts index c63de14e6..ccbd60bb1 100644 --- a/src/share/shaca/entities/sattribute.ts +++ b/src/share/shaca/entities/sattribute.ts @@ -1,7 +1,7 @@ "use strict"; import { SAttributeRow } from "./rows"; -import SNote = require('./snote'); +import SNote from "./snote.js"; const AbstractShacaEntity = require('./abstract_shaca_entity'); diff --git a/src/share/shaca/entities/sbranch.ts b/src/share/shaca/entities/sbranch.ts index b4ff9a73b..b24584905 100644 --- a/src/share/shaca/entities/sbranch.ts +++ b/src/share/shaca/entities/sbranch.ts @@ -1,8 +1,8 @@ "use strict"; -import AbstractShacaEntity = require('./abstract_shaca_entity'); +import AbstractShacaEntity from "./abstract_shaca_entity.js"; import { SBranchRow } from './rows'; -import SNote = require('./snote'); +import SNote from "./snote.js"; class SBranch extends AbstractShacaEntity { diff --git a/src/share/shaca/entities/snote.ts b/src/share/shaca/entities/snote.ts index 18182f1d4..02eea8636 100644 --- a/src/share/shaca/entities/snote.ts +++ b/src/share/shaca/entities/snote.ts @@ -1,13 +1,13 @@ "use strict"; -import sql = require('../../sql'); -import utils = require('../../../services/utils'); -import AbstractShacaEntity = require('./abstract_shaca_entity'); +import sql from "../../sql.js"; +import utils from "../../../services/utils.js"; +import AbstractShacaEntity from "./abstract_shaca_entity.js"; import escape = require('escape-html'); import { Blob } from '../../../services/blob-interface'; -import SAttachment = require('./sattachment'); -import SAttribute = require('./sattribute'); -import SBranch = require('./sbranch'); +import SAttachment from "./sattachment.js"; +import SAttribute from "./sattribute.js"; +import SBranch from "./sbranch.js"; import { SNoteRow } from './rows'; const LABEL = 'label'; diff --git a/src/share/shaca/shaca-interface.ts b/src/share/shaca/shaca-interface.ts index a90d52469..43fbf9dfa 100644 --- a/src/share/shaca/shaca-interface.ts +++ b/src/share/shaca/shaca-interface.ts @@ -1,7 +1,7 @@ -import SAttachment = require('./entities/sattachment'); -import SAttribute = require('./entities/sattribute'); -import SBranch = require('./entities/sbranch'); -import SNote = require('./entities/snote'); +import SAttachment from "./entities/sattachment.js"; +import SAttribute from "./entities/sattribute.js"; +import SBranch from "./entities/sbranch.js"; +import SNote from "./entities/snote.js"; export default class Shaca { diff --git a/src/share/shaca/shaca_loader.ts b/src/share/shaca/shaca_loader.ts index 050e5e886..8299d2df6 100644 --- a/src/share/shaca/shaca_loader.ts +++ b/src/share/shaca/shaca_loader.ts @@ -1,14 +1,14 @@ "use strict"; -import sql = require('../sql'); -import shaca = require('./shaca'); -import log = require('../../services/log'); -import SNote = require('./entities/snote'); -import SBranch = require('./entities/sbranch'); -import SAttribute = require('./entities/sattribute'); -import SAttachment = require('./entities/sattachment'); -import shareRoot = require('../share_root'); -import eventService = require('../../services/events'); +import sql from "../sql.js"; +import shaca from "./shaca.js"; +import log from "../../services/log.js"; +import SNote from "./entities/snote.js"; +import SBranch from "./entities/sbranch.js"; +import SAttribute from "./entities/sattribute.js"; +import SAttachment from "./entities/sattachment.js"; +import shareRoot from "../share_root.js"; +import eventService from "../../services/events.js"; import { SAttachmentRow, SAttributeRow, SBranchRow, SNoteRow } from './entities/rows'; function load() { diff --git a/src/share/sql.ts b/src/share/sql.ts index a5465f4c2..9990039c2 100644 --- a/src/share/sql.ts +++ b/src/share/sql.ts @@ -1,7 +1,7 @@ "use strict"; import Database = require('better-sqlite3'); -import dataDir = require('../services/data_dir'); +import dataDir from "../services/data_dir.js"; const dbConnection = new Database(dataDir.DOCUMENT_PATH, { readonly: true }); diff --git a/src/www.ts b/src/www.ts index 4ff6244ff..0e1bae6e9 100644 --- a/src/www.ts +++ b/src/www.ts @@ -18,18 +18,18 @@ function exit() { process.on('SIGINT', exit); process.on('SIGTERM', exit); -import app = require('./app'); -import sessionParser = require('./routes/session_parser'); +import app from "./app.js"; +import sessionParser from "./routes/session_parser.js"; import fs = require('fs'); import http = require('http'); import https = require('https'); -import config = require('./services/config'); -import log = require('./services/log'); -import appInfo = require('./services/app_info'); -import ws = require('./services/ws'); -import utils = require('./services/utils'); -import port = require('./services/port'); -import host = require('./services/host'); +import config from "./services/config.js"; +import log from "./services/log.js"; +import appInfo from "./services/app_info.js"; +import ws from "./services/ws.js"; +import utils from "./services/utils.js"; +import port from "./services/port.js"; +import host from "./services/host.js"; import semver = require('semver'); if (!semver.satisfies(process.version, ">=10.5.0")) { diff --git a/webpack.config.ts b/webpack.config.ts index bd7135e24..56146fbd2 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -1,5 +1,5 @@ import path = require('path'); -import assetPath = require('./src/services/asset_path'); +import assetPath from "./src/services/asset_path.js"; module.exports = { mode: 'production',