server-esm: Change simple local import statements

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')();

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 () => {

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 () => {

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');
 

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 () => {

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" });
 

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", () => {

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<string>, cur = 0): Array<any> {
     return toks.map((arg) => {

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;

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();
 

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 () => {

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');

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;

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<void>((res, rej) => {
     sqlInit.dbReady.then(() => {

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];

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;

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',

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 {

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?

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';
 
 /**

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.

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);
 

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';
 
 /**

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.

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 {

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<any>;
 

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;
 

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) => {

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';

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';

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[]) {

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) => {

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) {

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';

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 {

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';
 

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.`);

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) {

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;

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) {

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) {

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") {

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() {

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';
 
 /**

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;

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 {

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;

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();

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();

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;

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) {

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');

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) {

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) {

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();

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';
 

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)) {

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) {

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

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<string, number> = {};

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) {

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';
 

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) {

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<string, string>;

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 {

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 {

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);

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';
 

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() {

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;

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) {

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`);

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) {

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 {

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<string>) {
     const noteIds = new Set(_noteIds);

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<express.Response<any, Record<string, any>>>) => {

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) {

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) => {

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) {

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';
 

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({

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({

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) {

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() {

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

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;

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"

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}`;

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'];

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';
 

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';

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;

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");

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 }) {

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) {

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;

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");
 

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();

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<string, string>;
 

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';