gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #259 from TriliumNext/feature/server_esm

Browse Source 
Server ESM port: Basic imports
This commit is contained in:
Elian Doran 2024-07-27 15:19:44 +03:00 committed by GitHub
commit 1a5649e8ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
225 changed files with 1556 additions and 1501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.vscode/tasks.json vendored Normal file
View File

@ -0,0 +1,17 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "errors",
"problemMatcher": "$tsc-watch",
"isBackground": true,
"presentation": {
"revealProblems": "never"
},
"runOptions": {
"runOn": "folderOpen"
}
}
]
}

18
electron.ts
View File

@ -1,10 +1,12 @@
"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 from "electron";
import electronDebug from "electron-debug";
import electronDl from "electron-dl";
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";
// Prevent Trilium starting twice on first install and on uninstall for the Windows installer.
if (require('electron-squirrel-startup')) {
@ -12,11 +14,11 @@ if (require('electron-squirrel-startup')) {
}
// Adds debug features like hotkeys for triggering dev tools and reload
require("electron-debug")();
electronDebug();
appIconService.installLocalAppIcon();
require("electron-dl")({ saveAs: true });
electronDl({ saveAs: true });
// needed for excalidraw export https://github.com/zadam/trilium/issues/4271
electron.app.commandLine.appendSwitch(
@ -65,4 +67,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');

11
package-lock.json generated
View File

@ -113,6 +113,7 @@
"@types/sax": "^1.2.7",
"@types/semver": "^7.5.8",
"@types/serve-favicon": "^2.5.7",
"@types/session-file-store": "^1.2.5",
"@types/stream-throttle": "^0.1.4",
"@types/tmp": "^0.2.6",
"@types/turndown": "^5.0.4",
@ -2616,6 +2617,16 @@
"@types/node": "*"
}
},
"node_modules/@types/session-file-store": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/@types/session-file-store/-/session-file-store-1.2.5.tgz",
"integrity": "sha512-xjIyh40IznXLrvbAY/nmxu5cMcPcE3ZoDrSDvd02m6p8UjUgOtZAGI7Os5DDd6THuxClLWNhFo/awy1tYp64Bg==",
"dev": true,
"dependencies": {
"@types/express": "*",
"@types/express-session": "*"
}
},
"node_modules/@types/stream-throttle": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/@types/stream-throttle/-/stream-throttle-0.1.4.tgz",

4
package.json
View File

@ -41,7 +41,8 @@
"make-electron": "npm run webpack && npm run prepare-dist && electron-forge make",
"package-electron": "electron-forge package",
"prepare-dist": "rimraf ./dist && tsc && ts-node ./bin/copy-dist.ts",
"update-build-info": "ts-node bin/update-build-info.ts"
"update-build-info": "ts-node bin/update-build-info.ts",
"errors": "tsc --watch --noEmit"
},
"dependencies": {
"@braintree/sanitize-url": "^7.1.0",
@ -145,6 +146,7 @@
"@types/sax": "^1.2.7",
"@types/semver": "^7.5.8",
"@types/serve-favicon": "^2.5.7",
"@types/session-file-store": "^1.2.5",
"@types/stream-throttle": "^0.1.4",
"@types/tmp": "^0.2.6",
"@types/turndown": "^5.0.4",

2
spec/etapi/app_info.ts
View File

@ -1,4 +1,4 @@
import etapi = require("../support/etapi");
import etapi from "../support/etapi.js";
etapi.describeEtapi("app_info", () => {
it("get", async () => {

2
spec/etapi/backup.ts
View File

@ -1,4 +1,4 @@
import etapi = require("../support/etapi");
import etapi from "../support/etapi.js";
etapi.describeEtapi("backup", () => {
it("create", async () => {

6
spec/etapi/import.ts
View File

@ -1,6 +1,6 @@
import etapi = require("../support/etapi");
import fs = require("fs");
import path = require("path");
import etapi from "../support/etapi.js";
import fs from "fs";
import path from "path";
etapi.describeEtapi("import", () => {
// temporarily skip this test since test-export.zip is missing

4
spec/etapi/notes.ts
View File

@ -1,5 +1,5 @@
import crypto = require("crypto");
import etapi = require("../support/etapi");
import crypto from "crypto";
import etapi from "../support/etapi";
etapi.describeEtapi("notes", () => {
it("create", async () => {

14
spec/search/becca_mocking.ts
View File

@ -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 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 from "rand-token";
import SearchResult from "../../src/services/search/search_result.js";
import { NoteType } from "../../src/becca/entities/rows";
randtoken.generator({ source: "crypto" });
@ -80,7 +80,7 @@ function note(title: string, extraParams = {}) {
return new NoteBuilder(note);
}
export = {
export default {
NoteBuilder,
findNoteByTitle,
note,

2
spec/search/lexer.spec.ts
View File

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

28
spec/search/parens.spec.ts
View File

@ -1,24 +1,26 @@
const handleParens = require('../../src/services/search/services/handle_parens');
import handleParens from "../../src/services/search/services/handle_parens";
import { TokenStructure } from "../../src/services/search/services/types";
describe("Parens handler", () => {
it("handles parens", () => {
const input = ["(", "hello", ")", "and", "(", "(", "pick", "one", ")", "and", "another", ")"]
.map(token => ({token}));
expect(handleParens(input))
.toEqual([
const actual: TokenStructure = [
[
{token: "hello"}
],
{token: "and"},
[
[
{token: "hello"}
{token: "pick"},
{token: "one"}
],
{token: "and"},
[
[
{token: "pick"},
{token: "one"}
],
{token: "and"},
{token: "another"}
]
]);
{token: "another"}
]
];
expect(handleParens(input)).toEqual(actual);
});
});

6
spec/search/parser.spec.ts
View File

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

15
spec/search/search.spec.ts
View File

@ -1,11 +1,10 @@
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');
// const { NoteBuilder, findNoteByTitle, note } = require("./becca_mocking");
import becca_mocking = require('./becca_mocking');
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";
import becca_mocking from "./becca_mocking.js";
describe('Search', () => {
let rootNote: any;

8
spec/search/value_extractor.spec.ts
View File

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

6
spec/support/etapi.ts
View File

@ -1,5 +1,5 @@
import child_process = require("child_process");
import kill = require("tree-kill");
import child_process from "child_process";
import kill from "tree-kill";
let etapiAuthToken: string | undefined;
@ -164,7 +164,7 @@ function checkStatus(response: Response): void {
}
}
export {
export default {
describeEtapi,
getEtapi,
getEtapiResponse,

4
src/anonymize.ts
View File

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

20
src/app.ts
View File

@ -1,11 +1,11 @@
import express = require('express');
import path = require('path');
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 express from "express";
import path from "path";
import favicon from "serve-favicon";
import cookieParser from "cookie-parser";
import helmet from "helmet";
import compression from "compression";
import sessionParser from "./routes/session_parser.js";
import utils from "./services/utils.js";
require('./services/handlers');
require('./becca/becca_loader');
@ -20,7 +20,7 @@ if (!utils.isElectron()) {
app.use(compression()); // HTTP compression
}
app.use(helmet.default({
app.use(helmet({
hidePoweredBy: false, // errors out in electron
contentSecurityPolicy: false,
crossOriginEmbedderPolicy: false
@ -57,4 +57,4 @@ if (utils.isElectron()) {
require('@electron/remote/main').initialize();
}
export = app;
export default app;

45
src/becca/becca-interface.ts
View File

@ -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;
@ -155,9 +155,7 @@ export default class Becca {
}
getRevision(revisionId: string): BRevision | null {
const row = sql.getRow("SELECT * FROM revisions WHERE revisionId = ?", [revisionId]);
const BRevision = require('./entities/brevision'); // avoiding circular dependency problems
const row = sql.getRow<RevisionRow | null>("SELECT * FROM revisions WHERE revisionId = ?", [revisionId]);
return row ? new BRevision(row) : null;
}
@ -179,9 +177,7 @@ export default class Becca {
WHERE attachmentId = ? AND isDeleted = 0`
: `SELECT * FROM attachments WHERE attachmentId = ? AND isDeleted = 0`;
const BAttachment = require('./entities/battachment'); // avoiding circular dependency problems
return sql.getRows(query, [attachmentId])
return sql.getRows<AttachmentRow>(query, [attachmentId])
.map(row => new BAttachment(row))[0];
}
@ -194,7 +190,6 @@ export default class Becca {
}
getAttachments(attachmentIds: string[]): BAttachment[] {
const BAttachment = require('./entities/battachment'); // avoiding circular dependency problems
return sql.getManyRows<AttachmentRow>("SELECT * FROM attachments WHERE attachmentId IN (???) AND isDeleted = 0", attachmentIds)
.map(row => new BAttachment(row));
}
@ -204,9 +199,7 @@ export default class Becca {
return null;
}
const row = sql.getRow("SELECT *, LENGTH(content) AS contentLength FROM blobs WHERE blobId = ?", [entity.blobId]);
const BBlob = require('./entities/bblob'); // avoiding circular dependency problems
const row = sql.getRow<BBlob | null>("SELECT *, LENGTH(content) AS contentLength FROM blobs WHERE blobId = ?", [entity.blobId]);
return row ? new BBlob(row) : null;
}
@ -248,16 +241,12 @@ export default class Becca {
}
getRecentNotesFromQuery(query: string, params: string[] = []): BRecentNote[] {
const rows = sql.getRows(query, params);
const BRecentNote = require('./entities/brecent_note'); // avoiding circular dependency problems
const rows = sql.getRows<BRecentNote>(query, params);
return rows.map(row => new BRecentNote(row));
}
getRevisionsFromQuery(query: string, params: string[] = []): BRevision[] {
const rows = sql.getRows<RevisionRow>(query, params);
const BRevision = require('./entities/brevision'); // avoiding circular dependency problems
return rows.map(row => new BRevision(row));
}

2
src/becca/becca.ts
View File

@ -4,4 +4,4 @@ import Becca from "./becca-interface";
const becca = new Becca();
export = becca;
export default becca;

34
src/becca/becca_loader.ts
View File

@ -1,26 +1,28 @@
"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";
import options_init from "../services/options_init.js";
import ws from "../services/ws.js";
const beccaLoaded = new Promise<void>((res, rej) => {
sqlInit.dbReady.then(() => {
cls.init(() => {
load();
require('../services/options_init').initStartupOptions();
options_init.initStartupOptions();
res();
});
@ -73,7 +75,7 @@ function load() {
function reload(reason: string) {
load();
require('../services/ws').reloadFrontend(reason || "becca reloaded");
ws.reloadFrontend(reason || "becca reloaded");
}
eventService.subscribeBeccaLoader([eventService.ENTITY_CHANGE_SYNCED], ({ entityName, entityRow }) => {
@ -286,7 +288,7 @@ eventService.subscribeBeccaLoader(eventService.ENTER_PROTECTED_SESSION, () => {
eventService.subscribeBeccaLoader(eventService.LEAVE_PROTECTED_SESSION, load);
export = {
export default {
load,
reload,
beccaLoaded

8
src/becca/becca_service.ts
View File

@ -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];
@ -82,7 +82,7 @@ function getNoteTitleForPath(notePathArray: string[]) {
return titles.join(' / ');
}
export = {
export default {
getNoteTitle,
getNoteTitleForPath,
isNotePathArchived

20
src/becca/entities/abstract_becca_entity.ts
View File

@ -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;
@ -327,4 +327,4 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
}
}
export = AbstractBeccaEntity;
export default AbstractBeccaEntity;

21
src/becca/entities/battachment.ts
View File

@ -1,14 +1,15 @@
"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";
import noteService from "../../services/notes.js";
const attachmentRoleToNoteTypeMapping = {
'image': 'image',
@ -157,8 +158,6 @@ class BAttachment extends AbstractBeccaEntity<BAttachment> {
throw new Error(`Cannot convert protected attachment outside of protected session`);
}
const noteService = require('../../services/notes');
const { note, branch } = noteService.createNewNote({
parentNoteId: this.ownerId,
title: this.title,
@ -249,4 +248,4 @@ class BAttachment extends AbstractBeccaEntity<BAttachment> {
}
}
export = BAttachment;
export default BAttachment;

12
src/becca/entities/battribute.ts
View File

@ -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 {
@ -226,4 +226,4 @@ class BAttribute extends AbstractBeccaEntity<BAttribute> {
}
}
export = BAttribute;
export default BAttribute;

4
src/becca/entities/bblob.ts
View File

@ -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?
@ -37,4 +37,4 @@ class BBlob extends AbstractBeccaEntity<BBlob> {
}
}
export = BBlob;
export default BBlob;

18
src/becca/entities/bbranch.ts
View File

@ -1,13 +1,14 @@
"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';
import handlers from "../../services/handlers.js";
/**
* Branch represents a relationship between a child note and its parent note. Trilium allows a note to have multiple
@ -157,7 +158,6 @@ class BBranch extends AbstractBeccaEntity<BBranch> {
if (parentBranches.length === 1 && parentBranches[0] === this) {
// needs to be run before branches and attributes are deleted and thus attached relations disappear
const handlers = require('../../services/handlers');
handlers.runAttachedRelations(note, 'runOnNoteDeletion', note);
}
}
@ -285,4 +285,4 @@ class BBranch extends AbstractBeccaEntity<BBranch> {
}
}
export = BBranch;
export default BBranch;

6
src/becca/entities/betapi_token.ts
View File

@ -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.
@ -80,4 +80,4 @@ class BEtapiToken extends AbstractBeccaEntity<BEtapiToken> {
}
}
export = BEtapiToken;
export default BEtapiToken;

68
src/becca/entities/bnote.ts
View File

@ -1,21 +1,25 @@
"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 dayjs = require("dayjs");
import utc = require('dayjs/plugin/utc');
import eventService = require('../../services/events');
import { AttachmentRow, NoteRow, NoteType, RevisionRow } from './rows';
import BBranch = require('./bbranch');
import BAttribute = require('./battribute');
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 from "dayjs";
import utc from "dayjs/plugin/utc";
import eventService from "../../services/events.js";
import { AttachmentRow, AttributeType, NoteRow, NoteType, RevisionRow } from './rows';
import BBranch from "./bbranch.js";
import BAttribute from "./battribute.js";
import { NotePojo } from '../becca-interface';
import searchService from "../../services/search/services/search.js";
import cloningService, { CloneResponse } from "../../services/cloning.js";
import noteService from "../../services/notes.js";
import handlers from "../../services/handlers.js";
dayjs.extend(utc);
const LABEL = 'label';
@ -890,11 +894,9 @@ class BNote extends AbstractBeccaEntity<BNote> {
}
try {
const searchService = require('../../services/search/services/search');
const {searchResultNoteIds} = searchService.searchFromNote(this);
const result = searchService.searchFromNote(this);
const becca = this.becca;
return (searchResultNoteIds as string[]) // TODO: remove cast once search is converted
return (result.searchResultNoteIds)
.map(resultNoteId => becca.notes[resultNoteId])
.filter(note => !!note);
}
@ -1261,7 +1263,7 @@ class BNote extends AbstractBeccaEntity<BNote> {
* @param name - attribute name
* @param value - attribute value (optional)
*/
setAttribute(type: string, name: string, value?: string) {
setAttribute(type: AttributeType, name: string, value?: string) {
const attributes = this.getOwnedAttributes();
const attr = attributes.find(attr => attr.type === type && attr.name === name);
@ -1274,8 +1276,6 @@ class BNote extends AbstractBeccaEntity<BNote> {
}
}
else {
const BAttribute = require('./battribute');
new BAttribute({
noteId: this.noteId,
type: type,
@ -1310,9 +1310,7 @@ class BNote extends AbstractBeccaEntity<BNote> {
* @param name - name of the attribute, not including the leading ~/#
* @param value - value of the attribute - text for labels, target note ID for relations; optional.
*/
addAttribute(type: string, name: string, value: string = "", isInheritable: boolean = false, position: number | null = null): BAttribute {
const BAttribute = require('./battribute');
addAttribute(type: AttributeType, name: string, value: string = "", isInheritable: boolean = false, position: number | null = null): BAttribute {
return new BAttribute({
noteId: this.noteId,
type: type,
@ -1351,7 +1349,7 @@ class BNote extends AbstractBeccaEntity<BNote> {
* @param name - attribute name
* @param value - attribute value (optional)
*/
toggleAttribute(type: string, enabled: boolean, name: string, value?: string) {
toggleAttribute(type: AttributeType, enabled: boolean, name: string, value?: string) {
if (enabled) {
this.setAttribute(type, name, value);
}
@ -1423,8 +1421,6 @@ class BNote extends AbstractBeccaEntity<BNote> {
}
searchNotesInSubtree(searchString: string) {
const searchService = require('../../services/search/services/search');
return searchService.searchNotes(searchString) as BNote[];
}
@ -1432,12 +1428,16 @@ class BNote extends AbstractBeccaEntity<BNote> {
return this.searchNotesInSubtree(searchString)[0];
}
cloneTo(parentNoteId: string) {
const cloningService = require('../../services/cloning');
cloneTo(parentNoteId: string): CloneResponse {
const branch = this.becca.getNote(parentNoteId)?.getParentBranches()[0];
if (!branch?.branchId) {
return {
success: false,
message: "Unable to find the branch ID to clone."
};
}
return cloningService.cloneNoteToBranch(this.noteId, branch?.branchId);
return cloningService.cloneNoteToBranch(this.noteId, branch.branchId);
}
isEligibleForConversionToAttachment(opts: ConvertOpts = { autoConversion: false }) {
@ -1508,7 +1508,6 @@ class BNote extends AbstractBeccaEntity<BNote> {
parentNote.setContent(fixedContent);
const noteService = require('../../services/notes');
noteService.asyncPostProcessContent(parentNote, fixedContent); // to mark an unused attachment for deletion
this.deleteNote();
@ -1535,7 +1534,6 @@ class BNote extends AbstractBeccaEntity<BNote> {
}
// needs to be run before branches and attributes are deleted and thus attached relations disappear
const handlers = require('../../services/handlers');
handlers.runAttachedRelations(this, 'runOnNoteDeletion', this);
taskContext.noteDeletionHandlerTriggered = true;
@ -1696,4 +1694,4 @@ class BNote extends AbstractBeccaEntity<BNote> {
}
}
export = BNote;
export default BNote;

6
src/becca/entities/boption.ts
View File

@ -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';
/**
@ -48,4 +48,4 @@ class BOption extends AbstractBeccaEntity<BOption> {
}
}
export = BOption;
export default BOption;

6
src/becca/entities/brecent_note.ts
View File

@ -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.
@ -38,4 +38,4 @@ class BRecentNote extends AbstractBeccaEntity<BRecentNote> {
}
}
export = BRecentNote;
export default BRecentNote;

21
src/becca/entities/brevision.ts
View File

@ -1,13 +1,14 @@
"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';
import eraseService from "../../services/erase.js";
interface ContentOpts {
/** will also save this BRevision entity */
@ -164,7 +165,9 @@ class BRevision extends AbstractBeccaEntity<BRevision> {
* Revisions are not soft-deletable, they are immediately hard-deleted (erased).
*/
eraseRevision() {
require("../../services/erase.js").eraseRevisions([this.revisionId]);
if (this.revisionId) {
eraseService.eraseRevisions([this.revisionId]);
}
}
beforeSaving() {
@ -211,4 +214,4 @@ class BRevision extends AbstractBeccaEntity<BRevision> {
}
}
export = BRevision;
export default BRevision;

4
src/becca/entities/rows.ts
View File

@ -42,7 +42,7 @@ export interface OptionRow {
name: string;
value: string;
isSynced: boolean;
utcDateModified: string;
utcDateModified?: string;
}
export interface EtapiTokenRow {
@ -69,7 +69,7 @@ export interface AttributeRow {
noteId?: string;
type: AttributeType;
name: string;
position?: number;
position?: number | null;
value?: string;
isInheritable?: boolean;
utcDateModified?: string;

22
src/becca/entity_constructor.ts
View File

@ -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>;
@ -32,6 +32,6 @@ function getEntityFromEntityName(entityName: keyof typeof ENTITY_NAME_TO_ENTITY)
return ENTITY_NAME_TO_ENTITY[entityName];
}
export = {
export default {
getEntityFromEntityName
};

12
src/becca/similarity.ts
View File

@ -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;
@ -461,6 +461,6 @@ function setImmediatePromise() {
});
}
export = {
export default {
findSimilarNotes
};

2
src/errors/not_found_error.ts
View File

@ -6,4 +6,4 @@ class NotFoundError {
}
}
export = NotFoundError;
export default NotFoundError;

2
src/errors/validation_error.ts
View File

@ -6,4 +6,4 @@ class ValidationError {
}
}
export = ValidationError;
export default ValidationError;

6
src/etapi/app_info.ts
View File

@ -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) => {
@ -8,6 +8,6 @@ function register(router: Router) {
});
}
export = {
export default {
register
};

12
src/etapi/attachments.ts
View File

@ -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';
@ -104,6 +104,6 @@ function register(router: Router) {
});
}
export = {
export default {
register
};

12
src/etapi/attributes.ts
View File

@ -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';
@ -81,6 +81,6 @@ function register(router: Router) {
});
}
export = {
export default {
register
};

10
src/etapi/auth.ts
View File

@ -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[]) {
@ -39,6 +39,6 @@ function register(router: Router, loginMiddleware: RequestHandler[]) {
});
}
export = {
export default {
register
}

6
src/etapi/backup.ts
View File

@ -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) => {
@ -11,6 +11,6 @@ function register(router: Router) {
});
}
export = {
export default {
register
};

14
src/etapi/branches.ts
View File

@ -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) {
@ -84,6 +84,6 @@ function register(router: Router) {
});
}
export = {
export default {
register
};

14
src/etapi/etapi_utils.ts
View File

@ -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';
@ -146,7 +146,7 @@ function validateAndPatch(target: any, source: any, allowedProperties: Validator
}
}
export = {
export default {
EtapiError,
sendError,
route,

10
src/etapi/mappers.ts
View File

@ -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 {
@ -64,7 +64,7 @@ function mapAttachmentToPojo(attachment: BAttachment) {
};
}
export = {
export default {
mapNoteToPojo,
mapBranchToPojo,
mapAttributeToPojo,

26
src/etapi/notes.ts
View File

@ -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';
@ -267,6 +267,6 @@ function parseInteger(obj: any, name: string) {
return integer;
}
export = {
export default {
register
};

6
src/etapi/spec.ts
View File

@ -1,7 +1,7 @@
import { Router } from "express";
import fs = require('fs');
import path = require('path');
import fs from "fs";
import path from "path";
const specPath = path.join(__dirname, 'etapi.openapi.yaml');
let spec: string | null = null;
@ -17,6 +17,6 @@ function register(router: Router) {
});
}
export = {
export default {
register
};

10
src/etapi/special_notes.ts
View File

@ -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.`);
@ -73,6 +73,6 @@ function register(router: Router) {
});
}
export = {
export default {
register
};

6
src/etapi/validators.ts
View File

@ -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) {
@ -107,7 +107,7 @@ function isValidEntityId(obj: unknown) {
}
}
export = {
export default {
mandatory,
notNull,
isString,

4
src/routes/api/app_info.ts
View File

@ -1,11 +1,11 @@
"use strict";
import appInfo = require('../../services/app_info');
import appInfo from "../../services/app_info.js";
function getAppInfo() {
return appInfo;
}
export = {
export default {
getAppInfo
};

10
src/routes/api/attachments.ts
View File

@ -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) {
@ -97,7 +97,7 @@ function convertAttachmentToNote(req: Request) {
return attachment.convertToNote();
}
export = {
export default {
getAttachmentBlob,
getAttachments,
getAttachment,

14
src/routes/api/attributes.ts
View File

@ -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) {
@ -238,7 +238,7 @@ function deleteRelation(req: Request) {
}
}
export = {
export default {
updateNoteAttributes,
updateNoteAttribute,
setNoteAttribute,

16
src/routes/api/autocomplete.ts
View File

@ -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") {
@ -75,6 +75,6 @@ function getRecentNotes(activeNoteId: string) {
});
}
export = {
export default {
getAutocomplete
};

8
src/routes/api/backend_log.ts
View File

@ -1,8 +1,8 @@
"use strict";
import fs = require('fs');
import dateUtils = require('../../services/date_utils');
import dataDir = require('../../services/data_dir');
import fs from "fs";
import dateUtils from "../../services/date_utils.js";
import dataDir from "../../services/data_dir.js";
const { LOG_DIR } = dataDir;
function getBackendLog() {
@ -17,6 +17,6 @@ function getBackendLog() {
}
}
export = {
export default {
getBackendLog
};

24
src/routes/api/branches.ts
View File

@ -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';
/**
@ -224,7 +224,7 @@ function setPrefix(req: Request) {
branch.save();
}
export = {
export default {
moveBranchToParent,
moveBranchBeforeNote,
moveBranchAfterNote,

6
src/routes/api/bulk_action.ts
View File

@ -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;
@ -43,7 +43,7 @@ function getAffectedNoteIds(noteIds: string[], includeDescendants: boolean) {
return affectedNoteIds;
}
export = {
export default {
execute,
getAffectedNoteCount
};

34
src/routes/api/clipper.ts
View File

@ -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 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 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 from "path";
import htmlSanitizer from "../../services/html_sanitizer.js";
import attributeFormatter from "../../services/attribute_formatter.js";
import jsdom from "jsdom";
import BNote from "../../becca/entities/bnote.js";
import ValidationError from "../../errors/validation_error.js";
const { JSDOM } = jsdom;
interface Image {
@ -229,7 +229,7 @@ function findNotesByUrl(req: Request){
}
}
export = {
export default {
createNote,
addClipping,
openNote,

4
src/routes/api/cloning.ts
View File

@ -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;
@ -29,7 +29,7 @@ function toggleNoteInParent(req: Request) {
return cloningService.toggleNoteInParent(present === 'true', noteId, parentNoteId);
}
export = {
export default {
cloneNoteToBranch,
cloneNoteToParentNote,
cloneNoteAfter,

14
src/routes/api/database.ts
View File

@ -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();
@ -49,7 +49,7 @@ function checkIntegrity() {
};
}
export = {
export default {
getExistingBackups,
backupDatabase,
vacuumDatabase,

4
src/routes/api/etapi_tokens.ts
View File

@ -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();
@ -21,7 +21,7 @@ function deleteToken(req: Request) {
etapiTokenService.deleteToken(req.params.etapiTokenId);
}
export = {
export default {
getTokens,
createToken,
patchToken,

18
src/routes/api/export.ts
View File

@ -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;
@ -55,6 +55,6 @@ function exportBranch(req: Request, res: Response) {
}
}
export = {
export default {
exportBranch
};

26
src/routes/api/files.ts
View File

@ -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 tmp = require('tmp');
import fs = require('fs');
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 from "tmp";
import fs from "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 chokidar from "chokidar";
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) {
@ -245,7 +245,7 @@ function uploadModifiedFileToAttachment(req: Request) {
attachment.setContent(fileContent);
}
export = {
export default {
updateFile,
updateAttachment,
openFile,

4
src/routes/api/fonts.ts
View File

@ -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');
@ -35,6 +35,6 @@ function getFontCss(req: Request, res: Response) {
res.send(style);
}
export = {
export default {
getFontCss
};

14
src/routes/api/image.ts
View File

@ -1,13 +1,13 @@
"use strict";
import imageService = require('../../services/image');
import becca = require('../../becca/becca');
const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
import fs = require('fs');
import imageService from "../../services/image.js";
import becca from "../../becca/becca.js";
import fs from "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';
import { RESOURCE_DIR } from "../../services/resource_dir.js";
function returnImageFromNote(req: Request, res: Response) {
const image = becca.getNote(req.params.noteId);
@ -112,7 +112,7 @@ function updateImage(req: AppRequest) {
return { uploaded: true };
}
export = {
export default {
returnImageFromNote,
returnImageFromRevision,
returnAttachedImage,

26
src/routes/api/import.ts
View File

@ -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 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 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 from "path";
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) {
@ -136,7 +136,7 @@ async function importAttachmentsToNote(req: AppRequest) {
}
}
export = {
export default {
importNotesToBranch,
importAttachmentsToNote
};

6
src/routes/api/keys.ts
View File

@ -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();
@ -14,7 +14,7 @@ function getShortcutsForNotes() {
return labels.filter(attr => becca.getNote(attr.noteId)?.type !== 'launcher');
}
export = {
export default {
getKeyboardActions,
getShortcutsForNotes
};

26
src/routes/api/login.ts
View File

@ -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';
@ -110,7 +110,7 @@ function token(req: Request) {
return { token: authToken };
}
export = {
export default {
loginSync,
loginToProtectedSession,
logoutFromProtectedSession,

8
src/routes/api/note_map.ts
View File

@ -1,9 +1,9 @@
"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';
function buildDescendantCountMap(noteIdsToCount: string[]) {
@ -384,7 +384,7 @@ function getBacklinks(req: Request) {
});
}
export = {
export default {
getLinkMap,
getTreeMap,
getBacklinkCount,

24
src/routes/api/notes.ts
View File

@ -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) {
@ -250,7 +250,7 @@ function convertNoteToAttachment(req: Request) {
};
}
export = {
export default {
getNote,
getNoteBlob,
getNoteMetadata,

10
src/routes/api/options.ts
View File

@ -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
@ -136,7 +136,7 @@ function isAllowed(name: string) {
|| name.startsWith("hideArchivedNotes");
}
export = {
export default {
getOptions,
updateOption,
updateOptions,

6
src/routes/api/other.ts
View File

@ -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> = {};
@ -35,7 +35,7 @@ function renderMarkdown(req: Request) {
};
}
export = {
export default {
getIconUsage,
renderMarkdown
};

6
src/routes/api/password.ts
View File

@ -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) {
@ -22,7 +22,7 @@ function resetPassword(req: Request) {
return passwordService.resetPassword();
}
export = {
export default {
changePassword,
resetPassword
};

10
src/routes/api/recent_changes.ts
View File

@ -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';
@ -111,6 +111,6 @@ function getRecentChanges(req: Request) {
return recentChanges;
}
export = {
export default {
getRecentChanges
};

8
src/routes/api/recent_notes.ts
View File

@ -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) {
@ -19,6 +19,6 @@ function addRecentNote(req: Request) {
}
}
export = {
export default {
addRecentNote
};

6
src/routes/api/relation-map.ts
View File

@ -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>;
@ -76,6 +76,6 @@ function getRelationMap(req: Request) {
return resp;
}
export = {
export default {
getRelationMap
};

24
src/routes/api/revisions.ts
View File

@ -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 path = require('path');
import becca = require('../../becca/becca');
import blobService = require('../../services/blob');
import eraseService = require("../../services/erase");
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 from "path";
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 {
@ -200,7 +200,7 @@ function getNotePathData(note: BNote): NotePath | undefined {
}
}
export = {
export default {
getRevisionBlob,
getRevisions,
getRevision,

12
src/routes/api/script.ts
View File

@ -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 {
@ -131,7 +131,7 @@ function getBundle(req: Request) {
return scriptService.getScriptBundleForFrontend(note, script, params);
}
export = {
export default {
exec,
run,
getStartupBundles,

22
src/routes/api/search.ts
View File

@ -2,21 +2,21 @@
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, { EMPTY_RESULT, SearchNoteResult } 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) {
function searchFromNote(req: Request): SearchNoteResult {
const note = becca.getNoteOrThrow(req.params.noteId);
if (!note) {
// this can be triggered from recent changes, and it's harmless to return an empty list rather than fail
return [];
return EMPTY_RESULT;
}
if (note.type !== 'search') {
@ -126,7 +126,7 @@ function searchTemplates() {
}).map(note => note.noteId);
}
export = {
export default {
searchFromNote,
searchAndExecute,
getRelatedNotes,

12
src/routes/api/sender.ts
View File

@ -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 imageType from "image-type";
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';
@ -84,7 +84,7 @@ function saveNote(req: Request) {
};
}
export = {
export default {
uploadImage,
saveNote
};

10
src/routes/api/setup.ts
View File

@ -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() {
@ -51,7 +51,7 @@ function getSyncSeed() {
};
}
export = {
export default {
getStatus,
setupNewDocument,
setupSyncFromServer,

6
src/routes/api/similar_notes.ts
View File

@ -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;
@ -13,6 +13,6 @@ async function getSimilarNotes(req: Request) {
return await similarityService.findSimilarNotes(noteId);
}
export = {
export default {
getSimilarNotes
};

12
src/routes/api/special_notes.ts
View File

@ -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) {
@ -82,7 +82,7 @@ function createOrUpdateScriptLauncherFromApi(req: Request) {
return specialNotesService.createOrUpdateScriptLauncherFromApi(req.body);
}
export = {
export default {
getInboxNote,
getDayNote,
getWeekNote,

8
src/routes/api/sql.ts
View File

@ -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`);
@ -66,7 +66,7 @@ function execute(req: Request) {
}
}
export = {
export default {
getSchema,
execute
};

6
src/routes/api/stats.ts
View File

@ -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) {
@ -45,7 +45,7 @@ function getSubtreeSize(req: Request) {
};
}
export = {
export default {
getNoteSize,
getSubtreeSize
};

29
src/routes/api/sync.ts
View File

@ -1,19 +1,20 @@
"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";
import consistencyChecksService from "../../services/consistency_checks.js";
async function testSync() {
try {
@ -206,10 +207,10 @@ function queueSector(req: Request) {
}
function checkEntityChanges() {
require('../../services/consistency_checks').runEntityChangesChecks();
consistencyChecksService.runEntityChangesChecks();
}
export = {
export default {
testSync,
checkSync,
syncNow,

10
src/routes/api/tree.ts
View File

@ -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);
@ -160,7 +160,7 @@ function load(req: Request) {
return getNotesAndBranchesAndAttributes(req.body.noteIds);
}
export = {
export default {
getTree,
load
};

12
src/routes/assets.ts
View File

@ -1,8 +1,8 @@
import assetPath = require('../services/asset_path');
import path = require("path");
import express = require("express");
import env = require('../services/env');
import serveStatic = require('serve-static');
import assetPath from "../services/asset_path.js";
import path from "path";
import express from "express";
import env from "../services/env.js";
import serveStatic from "serve-static";
const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOptions<express.Response<any, Record<string, any>>>) => {
if (!env.isDev()) {
@ -76,6 +76,6 @@ function register(app: express.Application) {
app.use(`/${assetPath}/translations/`, persistentCacheStatic(path.join(srcRoot, "public", "translations/")));
}
export = {
export default {
register
};

14
src/routes/custom.ts
View File

@ -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) {
@ -84,6 +84,6 @@ function register(router: Router) {
});
}
export = {
export default {
register
};

2
src/routes/electron.ts
View File

@ -56,4 +56,4 @@ function init(app: Application) {
});
}
export = init;
export default init;

4
src/routes/error_handlers.ts
View File

@ -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) => {
@ -39,6 +39,6 @@ function register(app: Application) {
});
}
export = {
export default {
register
};

24
src/routes/index.ts
View File

@ -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";
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) {
@ -64,6 +64,6 @@ function getAppCssNoteIds() {
return attributeService.getNotesWithLabel('appCss').map(note => note.noteId);
}
export = {
export default {
index
};

18
src/routes/login.ts
View File

@ -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';
@ -102,7 +102,7 @@ function logout(req: AppRequest, res: Response) {
}
export = {
export default {
loginPage,
setPasswordPage,
setPassword,

130
src/routes/routes.ts
View File

@ -1,75 +1,75 @@
"use strict";
import utils = require('../services/utils');
import multer = require('multer');
import log = require('../services/log');
import express = require('express');
import utils from "../services/utils.js";
import multer from "multer";
import log from "../services/log.js";
import express from "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 csurf = require('csurf');
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 from "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 rateLimit from "express-rate-limit";
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({
@ -106,7 +106,7 @@ function register(app: express.Application) {
route(GET, '/login', [auth.checkAppInitialized, auth.checkPasswordSet], loginRoute.loginPage);
route(GET, '/set-password', [auth.checkAppInitialized, auth.checkPasswordNotSet], loginRoute.setPasswordPage);
const loginRateLimiter = rateLimit.rateLimit({
const loginRateLimiter = rateLimit({
windowMs: 15 * 60 * 1000, // 15 minutes
max: 10, // limit each IP to 10 requests per windowMs
skipSuccessfulRequests: true // successful auth to rate-limited ETAPI routes isn't counted. However, successful auth to /login is still counted!
@ -517,6 +517,6 @@ function createUploadMiddleware() {
return multer(multerOptions).single('upload');
}
export = {
export default {
register
};

11
src/routes/session_parser.ts
View File

@ -1,7 +1,8 @@
import session = require("express-session");
import sessionSecret = require('../services/session_secret');
import dataDir = require('../services/data_dir');
const FileStore = require('session-file-store')(session);
import session from "express-session";
import sessionFileStore from "session-file-store";
import sessionSecret from "../services/session_secret.js";
import dataDir from "../services/data_dir.js";
const FileStore = sessionFileStore(session);
const sessionParser = session({
secret: sessionSecret,
@ -19,4 +20,4 @@ const sessionParser = session({
})
});
export = sessionParser;
export default sessionParser;

12
src/routes/setup.ts
View File

@ -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) {
@ -38,6 +38,6 @@ function setupPage(req: Request, res: Response) {
});
}
export = {
export default {
setupPage
};

16
src/services/anonymization.ts
View File

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

16
src/services/app_icon.ts
View File

@ -1,12 +1,12 @@
"use strict";
import path = require('path');
import resourceDir = require('./resource_dir');
import log = require('./log');
import os = require('os');
import fs = require('fs');
import config = require('./config');
import utils = require('./utils');
import path from "path";
import resourceDir from "./resource_dir.js";
import log from "./log.js";
import os from "os";
import fs from "fs";
import config from "./config.js";
import utils from "./utils.js";
const template = `[Desktop Entry]
Type=Application
@ -68,6 +68,6 @@ function getExePath() {
return path.resolve(resourceDir.ELECTRON_APP_ROOT_DIR, 'trilium');
}
export = {
export default {
installLocalAppIcon
};

8
src/services/app_info.ts
View File

@ -1,14 +1,14 @@
"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";
import dataDir from "./data_dir.js";
const APP_DB_VERSION = 228;
const SYNC_VERSION = 32;
const CLIPPER_PROTOCOL_VERSION = "1.0";
export = {
export default {
appVersion: packageJson.version,
dbVersion: APP_DB_VERSION,
nodeVersion: process.version,

6
src/services/app_path.ts
View File

@ -1,6 +1,6 @@
import assetPath = require('./asset_path');
import env = require('./env');
import assetPath from "./asset_path.js";
import env from "./env.js";
export = env.isDev()
export default env.isDev()
? assetPath + "/app"
: assetPath + "/app-dist";

4
src/services/asset_path.ts
View File

@ -1,3 +1,3 @@
import packageJson = require('../../package.json');
import packageJson from "../../package.json";
export = `assets/v${packageJson.version}`;
export default `assets/v${packageJson.version}`;

2
src/services/attribute_formatter.ts
View File

@ -47,6 +47,6 @@ function formatValue(val: string) {
}
}
export = {
export default {
formatAttrForSearch
};

Some files were not shown because too many files have changed in this diff Show More