From 8fb67c9766e469278612459e6c26c76b7f32f25d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 18 Jul 2024 21:28:51 +0300 Subject: [PATCH] server-esm: Normalize quotes in require imports --- electron.ts | 16 ++++++++-------- spec/etapi/app_info.spec.ts | 2 +- spec/etapi/backup.spec.ts | 2 +- spec/etapi/import.spec.ts | 6 +++--- spec/etapi/notes.spec.ts | 4 ++-- spec/search/becca_mocking.ts | 12 ++++++------ spec/search/lexer.spec.ts | 2 +- spec/search/search.spec.ts | 2 +- spec/support/etapi.ts | 4 ++-- src/becca/entities/bblob.ts | 2 +- src/becca/entities/bnote.ts | 2 +- src/becca/entities/brevision.ts | 2 +- src/etapi/mappers.ts | 8 ++++---- src/routes/api/attachments.ts | 2 +- src/routes/api/branches.ts | 2 +- src/routes/api/clipper.ts | 6 +++--- src/routes/api/revisions.ts | 2 +- src/routes/api/search.ts | 2 +- src/routes/assets.ts | 4 ++-- src/routes/routes.ts | 2 +- src/routes/session_parser.ts | 2 +- src/services/anonymization.ts | 6 +++--- src/services/backend_script_api_interface.ts | 4 ++-- src/services/bulk_actions.ts | 2 +- src/services/erase.ts | 16 ++++++++-------- src/services/etapi_tokens.ts | 2 +- src/services/export/zip.ts | 4 ++-- src/services/hidden_subtree.ts | 2 +- src/services/import/enex.ts | 6 +++--- src/services/import/markdown.ts | 2 +- src/services/import/opml.ts | 2 +- src/services/import/single.ts | 4 ++-- src/services/import/zip.ts | 2 +- src/services/log.ts | 2 +- src/services/meta/note_meta.ts | 4 ++-- src/services/notes.ts | 4 ++-- src/services/request.ts | 4 ++-- .../search/expressions/attribute_exists.ts | 4 ++-- src/services/search/expressions/expression.ts | 4 ++-- .../search/expressions/note_content_fulltext.ts | 4 ++-- .../search/expressions/note_flat_text.ts | 4 ++-- .../search/expressions/order_by_and_limit.ts | 8 ++++---- src/services/search/expressions/true.ts | 4 ++-- src/services/search/note_set.ts | 2 +- src/services/search/services/parse.ts | 6 +++--- src/services/search/services/search.ts | 10 +++++----- src/services/search/value_extractor.ts | 2 +- src/services/sql.ts | 2 +- src/services/utils.ts | 2 +- src/services/window.ts | 6 +++--- src/share/content_renderer.ts | 2 +- src/share/routes.ts | 2 +- src/share/shaca/entities/sattribute.ts | 2 +- src/share/shaca/shaca-interface.ts | 8 ++++---- src/types.d.ts | 2 +- src/www.ts | 2 +- 56 files changed, 114 insertions(+), 114 deletions(-) diff --git a/electron.ts b/electron.ts index 88ff6f56e..994890537 100644 --- 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 index 9ea99b143..536d77df8 100644 --- a/spec/etapi/app_info.spec.ts +++ b/spec/etapi/app_info.spec.ts @@ -1,4 +1,4 @@ -import etapi = require("../support/etapi"); +import etapi = require('../support/etapi'); etapi.describeEtapi("app_info", () => { it("get", async () => { diff --git a/spec/etapi/backup.spec.ts b/spec/etapi/backup.spec.ts index 3afda9141..56ef63827 100644 --- 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 index 7471387ab..1f70eaf31 100644 --- 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 index 208a7088d..1b4774d66 100644 --- a/spec/etapi/notes.spec.ts +++ b/spec/etapi/notes.spec.ts @@ -1,5 +1,5 @@ -import crypto = require("crypto"); -import etapi = require("../support/etapi"); +import 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 index cb4e62b60..a39a81162 100644 --- a/spec/search/becca_mocking.ts +++ b/spec/search/becca_mocking.ts @@ -1,9 +1,9 @@ -import BNote = require("../../src/becca/entities/bnote"); -import BBranch = require("../../src/becca/entities/bbranch"); -import BAttribute = require("../../src/becca/entities/battribute"); -import becca = require("../../src/becca/becca"); -import 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 index 971f9cb13..553140538 100644 --- a/spec/search/lexer.spec.ts +++ b/spec/search/lexer.spec.ts @@ -1,4 +1,4 @@ -import lex = require("../../src/services/search/services/lex"); +import lex = 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 index 2b4a58852..c7f142b04 100644 --- 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 index 05da87bc8..0d36f1380 100644 --- 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 index 40d1c5885..bb0e2f80e 100644 --- a/src/becca/entities/bblob.ts +++ b/src/becca/entities/bblob.ts @@ -1,4 +1,4 @@ -import AbstractBeccaEntity = require("./abstract_becca_entity"); +import AbstractBeccaEntity = 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 index edb7f67e3..bcf5f0aa3 100644 --- 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 index 18a7a8df5..52714cd73 100644 --- a/src/becca/entities/brevision.ts +++ b/src/becca/entities/brevision.ts @@ -164,7 +164,7 @@ class BRevision extends AbstractBeccaEntity { * 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 index 537b51738..b7cbc9f8d 100644 --- a/src/etapi/mappers.ts +++ b/src/etapi/mappers.ts @@ -1,7 +1,7 @@ -import BAttachment = require("../becca/entities/battachment"); -import BAttribute = require("../becca/entities/battribute"); -import BBranch = require("../becca/entities/bbranch"); -import BNote = require("../becca/entities/bnote"); +import BAttachment = 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 index 9fde39fc5..8ccbefc85 100644 --- a/src/routes/api/attachments.ts +++ b/src/routes/api/attachments.ts @@ -1,7 +1,7 @@ import becca = require('../../becca/becca'); import blobService = require('../../services/blob'); import ValidationError = require('../../errors/validation_error'); -import imageService = require("../../services/image"); +import 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 index 8c7562128..102ffde7d 100644 --- 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 index e7f523cec..c8c635633 100644 --- 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 index 475b5b9b1..d8854ec8a 100644 --- 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 index 358c0d1d2..93d3e9bc5 100644 --- 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 index 6ebfd8313..806309ac8 100644 --- 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 index 55cad4cd5..55b40cd2b 100644 --- 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 index 431476f15..10be1a721 100644 --- 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 index 4e17058a7..a169cd8b8 100644 --- 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 index f74b65ad7..7c7c4199f 100644 --- a/src/services/backend_script_api_interface.ts +++ b/src/services/backend_script_api_interface.ts @@ -1,6 +1,6 @@ import { Request, Response } from "express"; -import AbstractBeccaEntity = require("../becca/entities/abstract_becca_entity"); -import BNote = require("../becca/entities/bnote"); +import AbstractBeccaEntity = 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 index 8abc11460..1a4d63dd9 100644 --- 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 index 6e6804f3d..045f72915 100644 --- a/src/services/erase.ts +++ b/src/services/erase.ts @@ -1,11 +1,11 @@ -import sql = require("./sql"); -import revisionService = require("./revisions"); -import log = require("./log"); -import entityChangesService = require("./entity_changes"); -import optionService = require("./options"); -import dateUtils = require("./date_utils"); -import sqlInit = require("./sql_init"); -import cls = require("./cls"); +import sql = 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 index 2989d3923..a20ab5651 100644 --- 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 index b4093c848..8e4a2752a 100644 --- 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 index 5478aed1c..ff683e003 100644 --- 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 index 5e715a0ca..998545fe9 100644 --- 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 index 941bdbd31..73c0e4833 100644 --- 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 index 78da6764c..6223ea51d 100644 --- 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 index 2c13386a1..44ec5e9e9 100644 --- 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 index 0c4008ddf..c29c398d6 100644 --- 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 index 1e8d0b9e1..904aebffb 100644 --- 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 index b3012f29a..f6467f213 100644 --- a/src/services/meta/note_meta.ts +++ b/src/services/meta/note_meta.ts @@ -1,5 +1,5 @@ -import AttachmentMeta = require("./attachment_meta"); -import AttributeMeta = require("./attribute_meta"); +import AttachmentMeta = require('./attachment_meta'); +import AttributeMeta = require('./attribute_meta'); interface NoteMeta { noteId?: string; diff --git a/src/services/notes.ts b/src/services/notes.ts index 2e099392e..d570237a3 100644 --- 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 index d4a17ad4e..85d0889ff 100644 --- 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 index b1f01a1c0..d8de33962 100644 --- 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 index c74341ba2..39c95ed47 100644 --- a/src/services/search/expressions/expression.ts +++ b/src/services/search/expressions/expression.ts @@ -1,7 +1,7 @@ "use strict"; -import NoteSet = require("../note_set"); -import SearchContext = require("../search_context"); +import NoteSet = require('../note_set'); +import SearchContext = require('../search_context'); abstract class Expression { name: string; diff --git a/src/services/search/expressions/note_content_fulltext.ts b/src/services/search/expressions/note_content_fulltext.ts index 02626bf16..68af72b25 100644 --- a/src/services/search/expressions/note_content_fulltext.ts +++ b/src/services/search/expressions/note_content_fulltext.ts @@ -1,7 +1,7 @@ "use strict"; import { NoteRow } from "../../../becca/entities/rows"; -import SearchContext = require("../search_context"); +import SearchContext = require('../search_context'); import Expression = require('./expression'); import NoteSet = require('../note_set'); @@ -10,7 +10,7 @@ import becca = require('../../../becca/becca'); import protectedSessionService = require('../../protected_session'); import striptags = require('striptags'); import utils = require('../../utils'); -import sql = require("../../sql"); +import sql = require('../../sql'); const ALLOWED_OPERATORS = ['=', '!=', '*=*', '*=', '=*', '%=']; diff --git a/src/services/search/expressions/note_flat_text.ts b/src/services/search/expressions/note_flat_text.ts index f163e8a7a..a067b456a 100644 --- a/src/services/search/expressions/note_flat_text.ts +++ b/src/services/search/expressions/note_flat_text.ts @@ -1,7 +1,7 @@ "use strict"; -import BNote = require("../../../becca/entities/bnote"); -import SearchContext = require("../search_context"); +import BNote = require('../../../becca/entities/bnote'); +import SearchContext = require('../search_context'); import Expression = require('./expression'); import NoteSet = require('../note_set'); diff --git a/src/services/search/expressions/order_by_and_limit.ts b/src/services/search/expressions/order_by_and_limit.ts index a3a37496f..87e6af093 100644 --- a/src/services/search/expressions/order_by_and_limit.ts +++ b/src/services/search/expressions/order_by_and_limit.ts @@ -1,9 +1,9 @@ "use strict"; -import BNote = require("../../../becca/entities/bnote"); -import NoteSet = require("../note_set"); -import SearchContext = require("../search_context"); -import Expression = require("./expression"); +import BNote = require('../../../becca/entities/bnote'); +import NoteSet = require('../note_set'); +import SearchContext = require('../search_context'); +import Expression = require('./expression'); interface ValueExtractor { extract: (note: BNote) => number | string | null; diff --git a/src/services/search/expressions/true.ts b/src/services/search/expressions/true.ts index a53d1afde..29df7df0f 100644 --- a/src/services/search/expressions/true.ts +++ b/src/services/search/expressions/true.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 Expression = require('./expression'); diff --git a/src/services/search/note_set.ts b/src/services/search/note_set.ts index 47c644c38..82ea6d723 100644 --- a/src/services/search/note_set.ts +++ b/src/services/search/note_set.ts @@ -1,6 +1,6 @@ "use strict"; -import BNote = require("../../becca/entities/bnote"); +import BNote = require('../../becca/entities/bnote'); class NoteSet { diff --git a/src/services/search/services/parse.ts b/src/services/search/services/parse.ts index de943fdd2..fe1731d24 100644 --- a/src/services/search/services/parse.ts +++ b/src/services/search/services/parse.ts @@ -1,6 +1,6 @@ "use strict"; -import dayjs = require("dayjs"); +import dayjs = require('dayjs'); import AndExp = require('../expressions/and'); import OrExp = require('../expressions/or'); import NotExp = require('../expressions/not'); @@ -20,9 +20,9 @@ import ValueExtractor = require('../value_extractor'); import utils = require('../../utils'); import TrueExp = require('../expressions/true'); import IsHiddenExp = require('../expressions/is_hidden'); -import SearchContext = require("../search_context"); +import SearchContext = require('../search_context'); import { TokenData } from "./types"; -import Expression = require("../expressions/expression"); +import Expression = require('../expressions/expression'); function getFulltext(_tokens: TokenData[], searchContext: SearchContext) { const tokens: string[] = _tokens.map(t => utils.removeDiacritic(t.token)); diff --git a/src/services/search/services/search.ts b/src/services/search/services/search.ts index 7461d5b4e..6d3103a65 100644 --- a/src/services/search/services/search.ts +++ b/src/services/search/services/search.ts @@ -1,6 +1,6 @@ "use strict"; -import normalizeString = require("normalize-strings"); +import normalizeString = require('normalize-strings'); import lex = require('./lex'); import handleParens = require('./handle_parens'); import parse = require('./parse'); @@ -11,11 +11,11 @@ import beccaService = require('../../../becca/becca_service'); import utils = require('../../utils'); import log = require('../../log'); import hoistedNoteService = require('../../hoisted_note'); -import BNote = require("../../../becca/entities/bnote"); -import BAttribute = require("../../../becca/entities/battribute"); +import BNote = require('../../../becca/entities/bnote'); +import BAttribute = require('../../../becca/entities/battribute'); import { SearchParams, TokenData } from "./types"; -import Expression = require("../expressions/expression"); -import sql = require("../../sql"); +import Expression = require('../expressions/expression'); +import sql = require('../../sql'); function searchFromNote(note: BNote) { let searchResultNoteIds; diff --git a/src/services/search/value_extractor.ts b/src/services/search/value_extractor.ts index 4f2466f11..730adadc5 100644 --- a/src/services/search/value_extractor.ts +++ b/src/services/search/value_extractor.ts @@ -1,6 +1,6 @@ "use strict"; -import BNote = require("../../becca/entities/bnote"); +import BNote = require('../../becca/entities/bnote'); /** * Search string is lower cased for case-insensitive comparison. But when retrieving properties, diff --git a/src/services/sql.ts b/src/services/sql.ts index cb4a75df5..8565e0bdb 100644 --- a/src/services/sql.ts +++ b/src/services/sql.ts @@ -8,7 +8,7 @@ import log = require('./log'); import type { Statement, Database as DatabaseType, RunResult } from "better-sqlite3"; import dataDir = require('./data_dir'); import cls = require('./cls'); -import fs = require("fs-extra"); +import fs = require('fs-extra'); import Database = require('better-sqlite3'); const dbConnection: DatabaseType = new Database(dataDir.DOCUMENT_PATH); diff --git a/src/services/utils.ts b/src/services/utils.ts index aef261a6a..b3d549467 100644 --- a/src/services/utils.ts +++ b/src/services/utils.ts @@ -4,7 +4,7 @@ import crypto = require('crypto'); const randtoken = require('rand-token').generator({source: 'crypto'}); import unescape = require('unescape'); import escape = require('escape-html'); -import sanitize = require("sanitize-filename"); +import sanitize = require('sanitize-filename'); import mimeTypes = require('mime-types'); import path = require('path'); diff --git a/src/services/window.ts b/src/services/window.ts index ecc6395fb..80c93a5cc 100644 --- a/src/services/window.ts +++ b/src/services/window.ts @@ -1,5 +1,5 @@ import path = require('path'); -import url = require("url"); +import url = require('url'); import port = require('./port'); import optionService = require('./options'); import env = require('./env'); @@ -7,7 +7,7 @@ import log = require('./log'); import sqlInit = require('./sql_init'); import cls = require('./cls'); import keyboardActionsService = require('./keyboard_actions'); -import remoteMain = require("@electron/remote/main") +import remoteMain = require('@electron/remote/main') import { App, BrowserWindow, WebContents, ipcMain } from 'electron'; // Prevent the window being garbage collected @@ -100,7 +100,7 @@ function configureWebContents(webContents: WebContents, spellcheckEnabled: boole remoteMain.enable(webContents); mainWindow.webContents.setWindowOpenHandler((details) => { - require("electron").shell.openExternal(details.url); + require('electron').shell.openExternal(details.url); return { action: 'deny' } }); diff --git a/src/share/content_renderer.ts b/src/share/content_renderer.ts index cb111008a..238efeae1 100644 --- a/src/share/content_renderer.ts +++ b/src/share/content_renderer.ts @@ -3,7 +3,7 @@ import shaca = require('./shaca/shaca'); import assetPath = require('../services/asset_path'); import shareRoot = require('./share_root'); import escapeHtml = require('escape-html'); -import SNote = require("./shaca/entities/snote"); +import SNote = require('./shaca/entities/snote'); interface Result { header: string; diff --git a/src/share/routes.ts b/src/share/routes.ts index 97a0dd8e1..2b5650c6c 100644 --- a/src/share/routes.ts +++ b/src/share/routes.ts @@ -1,5 +1,5 @@ import safeCompare = require('safe-compare'); -import ejs = require("ejs"); +import ejs = require('ejs'); import type { Request, Response, Router } from "express"; diff --git a/src/share/shaca/entities/sattribute.ts b/src/share/shaca/entities/sattribute.ts index 6bd8418b1..c63de14e6 100644 --- a/src/share/shaca/entities/sattribute.ts +++ b/src/share/shaca/entities/sattribute.ts @@ -1,7 +1,7 @@ "use strict"; import { SAttributeRow } from "./rows"; -import SNote = require("./snote"); +import SNote = require('./snote'); const AbstractShacaEntity = require('./abstract_shaca_entity'); diff --git a/src/share/shaca/shaca-interface.ts b/src/share/shaca/shaca-interface.ts index 9cff96eeb..a90d52469 100644 --- a/src/share/shaca/shaca-interface.ts +++ b/src/share/shaca/shaca-interface.ts @@ -1,7 +1,7 @@ -import SAttachment = require("./entities/sattachment"); -import SAttribute = require("./entities/sattribute"); -import SBranch = require("./entities/sbranch"); -import SNote = require("./entities/snote"); +import SAttachment = require('./entities/sattachment'); +import SAttribute = require('./entities/sattribute'); +import SBranch = require('./entities/sbranch'); +import SNote = require('./entities/snote'); export default class Shaca { diff --git a/src/types.d.ts b/src/types.d.ts index 9fe04a204..9dbab6745 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -19,7 +19,7 @@ declare module 'normalize-strings' { } declare module 'joplin-turndown-plugin-gfm' { - import TurndownService = require("turndown"); + import TurndownService = require('turndown'); namespace gfm { function gfm(service: TurndownService): void; } diff --git a/src/www.ts b/src/www.ts index 3f9aa752e..4ff6244ff 100644 --- a/src/www.ts +++ b/src/www.ts @@ -54,7 +54,7 @@ function startTrilium() { * to do a complex evaluation. */ if (utils.isElectron()) { - require("electron").app.requestSingleInstanceLock(); + require('electron').app.requestSingleInstanceLock(); } log.info(JSON.stringify(appInfo, null, 2));