server-esm: Normalize quotes in require imports

eliandoran · eliandoran · commit 8fb67c9766e4 · 2024-07-18T21:28:51.000+03:00
diff --git a/electron.ts b/electron.ts
@@ -1,17 +1,17 @@
 "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 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');
 
 // Adds debug features like hotkeys for triggering dev tools and reload
-require("electron-debug")();
+require('electron-debug')();
 
 appIconService.installLocalAppIcon();
 
-require("electron-dl")({ saveAs: true });
+require('electron-dl')({ saveAs: true });
 
 // needed for excalidraw export https://github.com/zadam/trilium/issues/4271
 electron.app.commandLine.appendSwitch(
@@ -60,4 +60,4 @@ electron.app.on("will-quit", () => {
 // this is to disable electron warning spam in the dev console (local development only)
 process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true";
 
-require("./src/www.js");
+require('./src/www.js');
diff --git a/spec/etapi/app_info.spec.ts b/spec/etapi/app_info.spec.ts
@@ -1,4 +1,4 @@
-import etapi = require("../support/etapi");
+import etapi = require('../support/etapi');
 
 etapi.describeEtapi("app_info", () => {
   it("get", async () => {
diff --git a/spec/etapi/backup.spec.ts b/spec/etapi/backup.spec.ts
@@ -1,4 +1,4 @@
-import etapi = require("../support/etapi");
+import etapi = require('../support/etapi');
 
 etapi.describeEtapi("backup", () => {
   it("create", async () => {
diff --git a/spec/etapi/import.spec.ts b/spec/etapi/import.spec.ts
@@ -1,6 +1,6 @@
-import etapi = require("../support/etapi");
-import fs = require("fs");
-import path = require("path");
+import etapi = require('../support/etapi');
+import fs = require('fs');
+import path = require('path');
 
 etapi.describeEtapi("import", () => {
   // temporarily skip this test since test-export.zip is missing
diff --git a/spec/etapi/notes.spec.ts b/spec/etapi/notes.spec.ts
@@ -1,5 +1,5 @@
-import crypto = require("crypto");
-import etapi = require("../support/etapi");
+import crypto = require('crypto');
+import etapi = require('../support/etapi');
 
 etapi.describeEtapi("notes", () => {
   it("create", async () => {
diff --git a/spec/search/becca_mocking.ts b/spec/search/becca_mocking.ts
@@ -1,9 +1,9 @@
-import BNote = require("../../src/becca/entities/bnote");
-import BBranch = require("../../src/becca/entities/bbranch");
-import BAttribute = require("../../src/becca/entities/battribute");
-import becca = require("../../src/becca/becca");
-import randtoken = require("rand-token");
-import SearchResult = require("../../src/services/search/search_result");
+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 randtoken = require('rand-token');
+import SearchResult = require('../../src/services/search/search_result');
 import { NoteType } from "../../src/becca/entities/rows";
 randtoken.generator({ source: "crypto" });
 
diff --git a/spec/search/lexer.spec.ts b/spec/search/lexer.spec.ts
@@ -1,4 +1,4 @@
-import lex = require("../../src/services/search/services/lex");
+import lex = require('../../src/services/search/services/lex');
 
 describe("Lexer fulltext", () => {
   it("simple lexing", () => {
diff --git a/spec/search/search.spec.ts b/spec/search/search.spec.ts
@@ -4,7 +4,7 @@ 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');
-// const { NoteBuilder, findNoteByTitle, note } = require("./becca_mocking");
+// const { NoteBuilder, findNoteByTitle, note } = require('./becca_mocking');
 import becca_mocking = require('./becca_mocking');
 
 describe('Search', () => {
diff --git a/spec/support/etapi.ts b/spec/support/etapi.ts
@@ -1,5 +1,5 @@
-import child_process = require("child_process");
-import kill = require("tree-kill");
+import child_process = require('child_process');
+import kill = require('tree-kill');
 
 let etapiAuthToken: string | undefined;
 
diff --git a/src/becca/entities/bblob.ts b/src/becca/entities/bblob.ts
@@ -1,4 +1,4 @@
-import AbstractBeccaEntity = require("./abstract_becca_entity");
+import AbstractBeccaEntity = require('./abstract_becca_entity');
 import { BlobRow } from "./rows";
 
 // TODO: Why this does not extend the abstract becca?
diff --git a/src/becca/entities/bnote.ts b/src/becca/entities/bnote.ts
@@ -9,7 +9,7 @@ import AbstractBeccaEntity = require('./abstract_becca_entity');
 import BRevision = require('./brevision');
 import BAttachment = require('./battachment');
 import TaskContext = require('../../services/task_context');
-import dayjs = require("dayjs");
+import dayjs = require('dayjs');
 import utc = require('dayjs/plugin/utc');
 import eventService = require('../../services/events');
 import { AttachmentRow, NoteRow, NoteType, RevisionRow } from './rows';
diff --git a/src/becca/entities/brevision.ts b/src/becca/entities/brevision.ts
@@ -164,7 +164,7 @@ class BRevision extends AbstractBeccaEntity<BRevision> {
      * Revisions are not soft-deletable, they are immediately hard-deleted (erased).
      */
     eraseRevision() {
-        require("../../services/erase.js").eraseRevisions([this.revisionId]);
+        require('../../services/erase.js').eraseRevisions([this.revisionId]);
     }
 
     beforeSaving() {
diff --git a/src/etapi/mappers.ts b/src/etapi/mappers.ts
@@ -1,7 +1,7 @@
-import BAttachment = require("../becca/entities/battachment");
-import BAttribute = require("../becca/entities/battribute");
-import BBranch = require("../becca/entities/bbranch");
-import BNote = require("../becca/entities/bnote");
+import BAttachment = require('../becca/entities/battachment');
+import BAttribute = require('../becca/entities/battribute');
+import BBranch = require('../becca/entities/bbranch');
+import BNote = require('../becca/entities/bnote');
 
 function mapNoteToPojo(note: BNote) {
     return {
diff --git a/src/routes/api/attachments.ts b/src/routes/api/attachments.ts
@@ -1,7 +1,7 @@
 import becca = require('../../becca/becca');
 import blobService = require('../../services/blob');
 import ValidationError = require('../../errors/validation_error');
-import imageService = require("../../services/image");
+import imageService = require('../../services/image');
 import { Request } from 'express';
 
 function getAttachmentBlob(req: Request) {
diff --git a/src/routes/api/branches.ts b/src/routes/api/branches.ts
@@ -10,7 +10,7 @@ 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 eventService = require('../../services/events');
 import { Request } from 'express';
 
 /**
diff --git a/src/routes/api/clipper.ts b/src/routes/api/clipper.ts
@@ -15,9 +15,9 @@ import utils = require('../../services/utils');
 import path = require('path');
 import htmlSanitizer = require('../../services/html_sanitizer');
 import attributeFormatter = require('../../services/attribute_formatter');
-import jsdom = require("jsdom");
-import BNote = require("../../becca/entities/bnote");
-import ValidationError = require("../../errors/validation_error");
+import jsdom = require('jsdom');
+import BNote = require('../../becca/entities/bnote');
+import ValidationError = require('../../errors/validation_error');
 const { JSDOM } = jsdom;
 
 interface Image {
diff --git a/src/routes/api/revisions.ts b/src/routes/api/revisions.ts
@@ -8,7 +8,7 @@ import cls = require('../../services/cls');
 import path = require('path');
 import becca = require('../../becca/becca');
 import blobService = require('../../services/blob');
-import eraseService = require("../../services/erase");
+import eraseService = require('../../services/erase');
 import { Request, Response } from 'express';
 import BRevision = require('../../becca/entities/brevision');
 import BNote = require('../../becca/entities/bnote');
diff --git a/src/routes/api/search.ts b/src/routes/api/search.ts
@@ -9,7 +9,7 @@ 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 SearchResult = require('../../services/search/search_result');
 
 function searchFromNote(req: Request) {
     const note = becca.getNoteOrThrow(req.params.noteId);
diff --git a/src/routes/assets.ts b/src/routes/assets.ts
@@ -1,6 +1,6 @@
 import assetPath = require('../services/asset_path');
-import path = require("path");
-import express = require("express");
+import path = require('path');
+import express = require('express');
 import env = require('../services/env');
 import serveStatic = require('serve-static');
 
diff --git a/src/routes/routes.ts b/src/routes/routes.ts
@@ -11,7 +11,7 @@ import sql = require('../services/sql');
 import entityChangesService = require('../services/entity_changes');
 import csurf = require('csurf');
 import { createPartialContentHandler } from "express-partial-content";
-import rateLimit = require("express-rate-limit");
+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');
diff --git a/src/routes/session_parser.ts b/src/routes/session_parser.ts
@@ -1,4 +1,4 @@
-import session = require("express-session");
+import session = require('express-session');
 import sessionSecret = require('../services/session_secret');
 import dataDir = require('../services/data_dir');
 const FileStore = require('session-file-store')(session);
diff --git a/src/services/anonymization.ts b/src/services/anonymization.ts
@@ -1,10 +1,10 @@
 import BUILTIN_ATTRIBUTES = require('./builtin_attributes');
-import fs = require("fs-extra");
+import fs = require('fs-extra');
 import dataDir = require('./data_dir');
 import dateUtils = require('./date_utils');
-import Database = require("better-sqlite3");
+import Database = require('better-sqlite3');
 import sql = require('./sql');
-import path = require("path");
+import path = require('path');
 
 function getFullAnonymizationScript() {
     // we want to delete all non-builtin attributes because they can contain sensitive names and values
diff --git a/src/services/backend_script_api_interface.ts b/src/services/backend_script_api_interface.ts
@@ -1,6 +1,6 @@
 import { Request, Response } from "express";
-import AbstractBeccaEntity = require("../becca/entities/abstract_becca_entity");
-import BNote = require("../becca/entities/bnote");
+import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity');
+import BNote = require('../becca/entities/bnote');
 
 export interface ApiParams {
     startNote?: BNote;
diff --git a/src/services/bulk_actions.ts b/src/services/bulk_actions.ts
@@ -3,7 +3,7 @@ import becca = require('../becca/becca');
 import cloningService = require('./cloning');
 import branchService = require('./branches');
 import utils = require('./utils');
-import eraseService = require("./erase");
+import eraseService = require('./erase');
 import BNote = require('../becca/entities/bnote');
 
 interface Action {
diff --git a/src/services/erase.ts b/src/services/erase.ts
@@ -1,11 +1,11 @@
-import sql = require("./sql");
-import revisionService = require("./revisions");
-import log = require("./log");
-import entityChangesService = require("./entity_changes");
-import optionService = require("./options");
-import dateUtils = require("./date_utils");
-import sqlInit = require("./sql_init");
-import cls = require("./cls");
+import sql = require('./sql');
+import revisionService = require('./revisions');
+import log = require('./log');
+import entityChangesService = require('./entity_changes');
+import optionService = require('./options');
+import dateUtils = require('./date_utils');
+import sqlInit = require('./sql_init');
+import cls = require('./cls');
 import { EntityChange } from "./entity_changes_interface";
 
 function eraseNotes(noteIdsToErase: string[]) {
diff --git a/src/services/etapi_tokens.ts b/src/services/etapi_tokens.ts
@@ -1,7 +1,7 @@
 import becca = require('../becca/becca');
 import utils = require('./utils');
 import BEtapiToken = require('../becca/entities/betapi_token');
-import crypto = require("crypto");
+import crypto = require('crypto');
 
 function getTokens() {
     return becca.getEtapiTokens();
diff --git a/src/services/export/zip.ts b/src/services/export/zip.ts
@@ -8,8 +8,8 @@ import mdService = require('./md');
 import packageInfo = require('../../../package.json');
 import utils = require('../utils');
 import protectedSessionService = require('../protected_session');
-import sanitize = require("sanitize-filename");
-import fs = require("fs");
+import sanitize = require('sanitize-filename');
+import fs = require('fs');
 import becca = require('../../becca/becca');
 const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
 import archiver = require('archiver');
diff --git a/src/services/hidden_subtree.ts b/src/services/hidden_subtree.ts
@@ -1,4 +1,4 @@
-import BAttribute = require("../becca/entities/battribute");
+import BAttribute = require('../becca/entities/battribute');
 import { AttributeType, NoteType } from "../becca/entities/rows";
 
 import becca = require('../becca/becca');
diff --git a/src/services/import/enex.ts b/src/services/import/enex.ts
@@ -1,4 +1,4 @@
-import sax = require("sax");
+import sax = require('sax');
 import stream = require('stream');
 import { Throttle } from 'stream-throttle';
 import log = require('../log');
@@ -9,8 +9,8 @@ import imageService = require('../image');
 import protectedSessionService = require('../protected_session');
 import htmlSanitizer = require('../html_sanitizer');
 import sanitizeAttributeName = require('../sanitize_attribute_name');
-import TaskContext = require("../task_context");
-import BNote = require("../../becca/entities/bnote");
+import TaskContext = require('../task_context');
+import BNote = require('../../becca/entities/bnote');
 import { File } from "./common";
 
 /**
diff --git a/src/services/import/markdown.ts b/src/services/import/markdown.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import marked = require("marked");
+import marked = require('marked');
 import htmlSanitizer = require('../html_sanitizer');
 import importUtils = require('./utils');
 
diff --git a/src/services/import/opml.ts b/src/services/import/opml.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import noteService = require('../../services/notes');
-import xml2js = require("xml2js");
+import xml2js = require('xml2js');
 import protectedSessionService = require('../protected_session');
 import htmlSanitizer = require('../html_sanitizer');
 import TaskContext = require('../task_context');
diff --git a/src/services/import/single.ts b/src/services/import/single.ts
@@ -1,7 +1,7 @@
 "use strict";
 
-import BNote = require("../../becca/entities/bnote");
-import TaskContext = require("../task_context");
+import BNote = require('../../becca/entities/bnote');
+import TaskContext = require('../task_context');
 
 import noteService = require('../../services/notes');
 import imageService = require('../../services/image');
diff --git a/src/services/import/zip.ts b/src/services/import/zip.ts
@@ -10,7 +10,7 @@ import path = require('path');
 import protectedSessionService = require('../protected_session');
 import mimeService = require('./mime');
 import treeService = require('../tree');
-import yauzl = require("yauzl");
+import yauzl = require('yauzl');
 import htmlSanitizer = require('../html_sanitizer');
 import becca = require('../../becca/becca');
 import BAttachment = require('../../becca/entities/battachment');
diff --git a/src/services/log.ts b/src/services/log.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { Request, Response } from "express";
-import fs = require("fs");
+import fs = require('fs');
 import dataDir = require('./data_dir');
 import cls = require('./cls');
 
diff --git a/src/services/meta/note_meta.ts b/src/services/meta/note_meta.ts
@@ -1,5 +1,5 @@
-import AttachmentMeta = require("./attachment_meta");
-import AttributeMeta = require("./attribute_meta");
+import AttachmentMeta = require('./attachment_meta');
+import AttributeMeta = require('./attribute_meta');
 
 interface NoteMeta {
     noteId?: string;
diff --git a/src/services/notes.ts b/src/services/notes.ts
@@ -16,11 +16,11 @@ import BBranch = require('../becca/entities/bbranch');
 import BNote = require('../becca/entities/bnote');
 import BAttribute = require('../becca/entities/battribute');
 import BAttachment = require('../becca/entities/battachment');
-import dayjs = require("dayjs");
+import dayjs = require('dayjs');
 import htmlSanitizer = require('./html_sanitizer');
 import ValidationError = require('../errors/validation_error');
 import noteTypesService = require('./note_types');
-import fs = require("fs");
+import fs = require('fs');
 import ws = require('./ws');
 import html2plaintext = require('html2plaintext');
 import { AttachmentRow, AttributeRow, BranchRow, NoteRow, NoteType } from '../becca/entities/rows';
diff --git a/src/services/request.ts b/src/services/request.ts
@@ -202,8 +202,8 @@ function getProxyAgent(opts: ClientOpts) {
     }
 
     const AgentClass = HTTP === protocol
-        ? require("http-proxy-agent").HttpProxyAgent
-        : require("https-proxy-agent").HttpsProxyAgent;
+        ? require('http-proxy-agent').HttpProxyAgent
+        : require('https-proxy-agent').HttpsProxyAgent;
 
     return new AgentClass(opts.proxy);
 }
diff --git a/src/services/search/expressions/attribute_exists.ts b/src/services/search/expressions/attribute_exists.ts
@@ -1,7 +1,7 @@
 "use strict";
 
-import NoteSet = require("../note_set");
-import SearchContext = require("../search_context");
+import NoteSet = require('../note_set');
+import SearchContext = require('../search_context');
 
 import becca = require('../../../becca/becca');
 import Expression = require('./expression');
diff --git a/src/services/search/expressions/expression.ts b/src/services/search/expressions/expression.ts
diff --git a/src/services/search/expressions/note_content_fulltext.ts b/src/services/search/expressions/note_content_fulltext.ts
diff --git a/src/services/search/expressions/note_flat_text.ts b/src/services/search/expressions/note_flat_text.ts
diff --git a/src/services/search/expressions/order_by_and_limit.ts b/src/services/search/expressions/order_by_and_limit.ts
diff --git a/src/services/search/expressions/true.ts b/src/services/search/expressions/true.ts
diff --git a/src/services/search/note_set.ts b/src/services/search/note_set.ts
diff --git a/src/services/search/services/parse.ts b/src/services/search/services/parse.ts
diff --git a/src/services/search/services/search.ts b/src/services/search/services/search.ts
diff --git a/src/services/search/value_extractor.ts b/src/services/search/value_extractor.ts
diff --git a/src/services/sql.ts b/src/services/sql.ts
diff --git a/src/services/utils.ts b/src/services/utils.ts
diff --git a/src/services/window.ts b/src/services/window.ts
diff --git a/src/share/content_renderer.ts b/src/share/content_renderer.ts
diff --git a/src/share/routes.ts b/src/share/routes.ts
diff --git a/src/share/shaca/entities/sattribute.ts b/src/share/shaca/entities/sattribute.ts
diff --git a/src/share/shaca/shaca-interface.ts b/src/share/shaca/shaca-interface.ts
diff --git a/src/types.d.ts b/src/types.d.ts
diff --git a/src/www.ts b/src/www.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import etapi = require("../support/etapi");`
	`1`	`+import etapi = require('../support/etapi');`
`2`	`2`
`3`	`3`	`etapi.describeEtapi("app_info", () => {`
`4`	`4`	`it("get", async () => {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import lex = require("../../src/services/search/services/lex");`
	`1`	`+import lex = require('../../src/services/search/services/lex');`
`2`	`2`
`3`	`3`	`describe("Lexer fulltext", () => {`
`4`	`4`	`it("simple lexing", () => {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import AbstractBeccaEntity = require("./abstract_becca_entity");`
	`1`	`+import AbstractBeccaEntity = require('./abstract_becca_entity');`
`2`	`2`	`import { BlobRow } from "./rows";`
`3`	`3`
`4`	`4`	`// TODO: Why this does not extend the abstract becca?`