server-esm: Change simple library import statements

src/services/anonymization.ts

@@ -1,10 +1,10 @@
 import BUILTIN_ATTRIBUTES from "./builtin_attributes.js";
-import fs = require('fs-extra');
+import fs from "fs-extra";
 import dataDir from "./data_dir.js";
 import dateUtils from "./date_utils.js";
-import Database = require('better-sqlite3');
+import Database from "better-sqlite3";
 import sql from "./sql.js";
-import path = require('path');
+import path from "path";
 
 function getFullAnonymizationScript() {
     // we want to delete all non-builtin attributes because they can contain sensitive names and values

src/services/app_icon.ts

@@ -1,10 +1,10 @@
 "use strict";
 
-import path = require('path');
+import path from "path";
 import resourceDir from "./resource_dir.js";
 import log from "./log.js";
-import os = require('os');
-import fs = require('fs');
+import os from "os";
+import fs from "fs";
 import config from "./config.js";
 import utils from "./utils.js";
 

src/services/backend_script_api.ts

@@ -6,9 +6,9 @@ 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 axios from "axios";
+import dayjs from "dayjs";
+import xml2js from "xml2js";
 import cloningService from "./cloning.js";
 import appInfo from "./app_info.js";
 import searchService from "./search/services/search.js";

src/services/backup.ts

@@ -2,13 +2,13 @@
 
 import dateUtils from "./date_utils.js";
 import optionService from "./options.js";
-import fs = require('fs-extra');
+import fs from "fs-extra";
 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');
+import path from "path";
 
 type BackupType = ("daily" | "weekly" | "monthly");
 

src/services/cls.ts

@@ -1,4 +1,4 @@
-import clsHooked = require('cls-hooked');
+import clsHooked from "cls-hooked";
 import { EntityChange } from './entity_changes_interface';
 const namespace = clsHooked.createNamespace("trilium");
 

src/services/config.ts

@@ -1,9 +1,9 @@
 "use strict";
 
-import ini = require('ini');
-import fs = require('fs');
+import ini from "ini";
+import fs from "fs";
 import dataDir from "./data_dir.js";
-import path = require('path');
+import path from "path";
 import resourceDir from "./resource_dir.js";
 
 const configSampleFilePath = path.resolve(resourceDir.RESOURCE_DIR, "config-sample.ini");

src/services/data_dir.ts

@@ -8,9 +8,9 @@
  * - as a fallback if the previous step fails, we'll use home dir
  */
 
-import os = require('os');
-import fs = require('fs');
-import path = require('path');
+import os from "os";
+import fs from "fs";
+import path from "path";
 
 function getAppDataDir() {
     let appDataDir = os.homedir(); // fallback if OS is not recognized

src/services/date_utils.ts

@@ -1,4 +1,4 @@
-import dayjs = require('dayjs');
+import dayjs from "dayjs";
 import cls from "./cls.js";
 
 const LOCAL_DATETIME_FORMAT = 'YYYY-MM-DD HH:mm:ss.SSSZZ';

src/services/encryption/data_encryption.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import crypto = require('crypto');
+import crypto from "crypto";
 import log from "../log.js";
 
 function arraysIdentical(a: any[] | Buffer, b: any[] | Buffer) {

src/services/encryption/my_scrypt.ts

@@ -1,7 +1,7 @@
 "use strict";
 
 import optionService from "../options.js";
-import crypto = require('crypto');
+import crypto from "crypto";
 
 function getVerificationHash(password: crypto.BinaryLike) {
     const salt = optionService.getOption('passwordVerificationSalt');

src/services/etapi_tokens.ts

@@ -1,7 +1,7 @@
 import becca from "../becca/becca.js";
 import utils from "./utils.js";
 import BEtapiToken from "../becca/entities/betapi_token.js";
-import crypto = require('crypto');
+import crypto from "crypto";
 
 function getTokens() {
     return becca.getEtapiTokens();

src/services/export/md.ts

@@ -1,7 +1,7 @@
 "use strict";
 
-import TurndownService = require('turndown');
-import turndownPluginGfm = require('joplin-turndown-plugin-gfm');
+import TurndownService from "turndown";
+import turndownPluginGfm from "joplin-turndown-plugin-gfm";
 
 let instance: TurndownService | null = null;
 

src/services/export/single.ts

@@ -1,7 +1,7 @@
 "use strict";
 
-import mimeTypes = require('mime-types');
-import html = require('html');
+import mimeTypes from "mime-types";
+import html from "html";
 import utils from "../utils.js";
 import mdService from "./md.js";
 import becca from "../../becca/becca.js";

src/services/export/zip.ts

@@ -1,18 +1,18 @@
 "use strict";
 
-import html = require('html');
+import html from "html";
 import dateUtils from "../date_utils.js";
-import path = require('path');
-import mimeTypes = require('mime-types');
+import path from "path";
+import mimeTypes from "mime-types";
 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 sanitize from "sanitize-filename";
+import fs from "fs";
 import becca from "../../becca/becca.js";
 const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
-import archiver = require('archiver');
+import archiver from "archiver";
 import log from "../log.js";
 import TaskContext from "../task_context.js";
 import ValidationError from "../../errors/validation_error.js";

src/services/html_sanitizer.ts

@@ -1,5 +1,5 @@
-import sanitizeHtml = require('sanitize-html');
-import sanitizeUrl = require('@braintree/sanitize-url');
+import sanitizeHtml from "sanitize-html";
+import sanitizeUrl from "@braintree/sanitize-url";
 
 // intended mainly as protection against XSS via import
 // secondarily, it (partly) protects against "CSS takeover"

src/services/image.ts

@@ -6,11 +6,11 @@ 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 jimp from "jimp";
+import imageType from "image-type";
+import sanitizeFilename from "sanitize-filename";
+import isSvg from "is-svg";
+import isAnimated from "is-animated";
 import htmlSanitizer from "./html_sanitizer.js";
 
 async function processImage(uploadBuffer: Buffer, originalName: string, shrinkImageSwitch: boolean) {

src/services/import/enex.ts

@@ -1,5 +1,5 @@
-import sax = require('sax');
-import stream = require('stream');
+import sax from "sax";
+import stream from "stream";
 import { Throttle } from 'stream-throttle';
 import log from "../log.js";
 import utils from "../utils.js";

src/services/import/markdown.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import marked = require('marked');
+import marked from "marked";
 import htmlSanitizer from "../html_sanitizer.js";
 import importUtils from "./utils.js";
 

src/services/import/mime.ts

@@ -1,7 +1,7 @@
 "use strict";
 
-import mimeTypes = require('mime-types');
-import path = require('path');
+import mimeTypes from "mime-types";
+import path from "path";
 import { TaskData } from '../task_context_interface';
 
 const CODE_MIME_TYPES: Record<string, boolean | string> = {

src/services/import/opml.ts

@@ -1,7 +1,7 @@
 "use strict";
 
 import noteService from "../../services/notes.js";
-import xml2js = require('xml2js');
+import xml2js from "xml2js";
 import protectedSessionService from "../protected_session.js";
 import htmlSanitizer from "../html_sanitizer.js";
 import TaskContext from "../task_context.js";

src/services/import/zip.ts

@@ -6,11 +6,11 @@ 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 path from "path";
 import protectedSessionService from "../protected_session.js";
 import mimeService from "./mime.js";
 import treeService from "../tree.js";
-import yauzl = require('yauzl');
+import yauzl from "yauzl";
 import htmlSanitizer from "../html_sanitizer.js";
 import becca from "../../becca/becca.js";
 import BAttachment from "../../becca/entities/battachment.js";

src/services/log.ts

@@ -1,7 +1,7 @@
 "use strict";
 
 import { Request, Response } from "express";
-import fs = require('fs');
+import fs from "fs";
 import dataDir from "./data_dir.js";
 import cls from "./cls.js";
 

src/services/migration.ts

@@ -1,6 +1,6 @@
 import backupService from "./backup.js";
 import sql from "./sql.js";
-import fs = require('fs-extra');
+import fs from "fs-extra";
 import log from "./log.js";
 import utils from "./utils.js";
 import resourceDir from "./resource_dir.js";

src/services/notes.ts

@@ -9,20 +9,20 @@ 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 path from "path";
+import url from "url";
 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 dayjs from "dayjs";
 import htmlSanitizer from "./html_sanitizer.js";
 import ValidationError from "../errors/validation_error.js";
 import noteTypesService from "./note_types.js";
-import fs = require('fs');
+import fs from "fs";
 import ws from "./ws.js";
-import html2plaintext = require('html2plaintext');
+import html2plaintext from "html2plaintext";
 import { AttachmentRow, AttributeRow, BranchRow, NoteRow, NoteType } from '../becca/entities/rows';
 import TaskContext from "./task_context.js";
 import { NoteParams } from './note-interface';

src/services/request.ts

@@ -2,7 +2,7 @@
 
 import utils from "./utils.js";
 import log from "./log.js";
-import url = require('url');
+import url from "url";
 import syncOptions from "./sync_options.js";
 import { ExecOpts } from './request_interface';
 

src/services/resource_dir.ts

@@ -1,6 +1,6 @@
 import log from "./log.js";
-import path = require('path');
-import fs = require('fs');
+import path from "path";
+import fs from "fs";
 
 const RESOURCE_DIR = path.resolve(__dirname, "../..");
 

src/services/search/expressions/note_content_fulltext.ts

@@ -8,7 +8,7 @@ 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 striptags from "striptags";
 import utils from "../../utils.js";
 import sql from "../../sql.js";
 

src/services/search/services/parse.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import dayjs = require('dayjs');
+import dayjs from "dayjs";
 import AndExp from "../expressions/and.js";
 import OrExp from "../expressions/or.js";
 import NotExp from "../expressions/not.js";

src/services/search/services/search.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import normalizeString = require('normalize-strings');
+import normalizeString from "normalize-strings";
 import lex from "./lex.js";
 import handleParens from "./handle_parens.js";
 import parse from "./parse.js";

src/services/session_secret.ts

@@ -1,7 +1,7 @@
 "use strict";
 
-import fs = require('fs');
-import crypto = require('crypto');
+import fs from "fs";
+import crypto from "crypto";
 import dataDir from "./data_dir.js";
 import log from "./log.js";
 

src/services/sql.ts

@@ -8,8 +8,8 @@ import log from "./log.js";
 import type { Statement, Database as DatabaseType, RunResult } from "better-sqlite3";
 import dataDir from "./data_dir.js";
 import cls from "./cls.js";
-import fs = require('fs-extra');
-import Database = require('better-sqlite3');
+import fs from "fs-extra";
+import Database from "better-sqlite3";
 
 const dbConnection: DatabaseType = new Database(dataDir.DOCUMENT_PATH);
 dbConnection.pragma('journal_mode = WAL');

src/services/sql_init.ts

@@ -1,5 +1,5 @@
 import log from "./log.js";
-import fs = require('fs');
+import fs from "fs";
 import resourceDir from "./resource_dir.js";
 import sql from "./sql.js";
 import utils from "./utils.js";

src/services/tray.ts

@@ -1,5 +1,5 @@
 import { Menu, Tray } from 'electron';
-import path = require('path');
+import path from "path";
 import windowService from "./window.js";
 import optionService from "./options.js";
 

src/services/utils.ts

@@ -1,12 +1,12 @@
 "use strict";
 
-import crypto = require('crypto');
+import crypto from "crypto";
 const randtoken = require('rand-token').generator({source: 'crypto'});
-import unescape = require('unescape');
-import escape = require('escape-html');
-import sanitize = require('sanitize-filename');
-import mimeTypes = require('mime-types');
-import path = require('path');
+import unescape from "unescape";
+import escape from "escape-html";
+import sanitize from "sanitize-filename";
+import mimeTypes from "mime-types";
+import path from "path";
 
 function newEntityId() {
     return randomString(12);

src/services/window.ts

@@ -1,5 +1,5 @@
-import path = require('path');
-import url = require('url');
+import path from "path";
+import url from "url";
 import port from "./port.js";
 import optionService from "./options.js";
 import env from "./env.js";
@@ -7,7 +7,7 @@ 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 remoteMain from "@electron/remote/main"
 import { App, BrowserWindow, WebContents, ipcMain } from 'electron';
 
 // Prevent the window being garbage collected

src/services/ws.ts

@@ -1,4 +1,4 @@
-import WebSocket = require('ws');
+import WebSocket from "ws";
 import utils from "./utils.js";
 import log from "./log.js";
 import sql from "./sql.js";