Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

server-esm: Change simple local import statements

Browse Source
This commit is contained in:
Elian Doran
2024-07-18 21:35:17 +03:00
parent 8fb67c9766
commit 35d11cc0d2
184 changed files with 1023 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electron.ts
View File

@@ -1,10 +1,10 @@
"use strict"; "use strict";
import electron = require('electron'); import electron = require('electron');
import sqlInit = require('./src/services/sql_init'); import sqlInit from "./src/services/sql_init.js";
import appIconService = require('./src/services/app_icon'); import appIconService from "./src/services/app_icon.js";
import windowService = require('./src/services/window'); import windowService from "./src/services/window.js";
import tray = require('./src/services/tray'); import tray from "./src/services/tray.js";
// Adds debug features like hotkeys for triggering dev tools and reload // Adds debug features like hotkeys for triggering dev tools and reload
require('electron-debug')(); require('electron-debug')();

2
spec/etapi/app_info.spec.ts
View File

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

2
spec/etapi/backup.spec.ts
View File

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

2
spec/etapi/import.spec.ts
View File

@@ -1,4 +1,4 @@
import etapi = require('../support/etapi'); import etapi from "../support/etapi.js";
import fs = require('fs'); import fs = require('fs');
import path = require('path'); import path = require('path');

2
spec/etapi/notes.spec.ts
View File

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

10
spec/search/becca_mocking.ts
View File

@@ -1,9 +1,9 @@
import BNote = require('../../src/becca/entities/bnote'); import BNote from "../../src/becca/entities/bnote.js";
import BBranch = require('../../src/becca/entities/bbranch'); import BBranch from "../../src/becca/entities/bbranch.js";
import BAttribute = require('../../src/becca/entities/battribute'); import BAttribute from "../../src/becca/entities/battribute.js";
import becca = require('../../src/becca/becca'); import becca from "../../src/becca/becca.js";
import randtoken = require('rand-token'); import randtoken = require('rand-token');
import SearchResult = require('../../src/services/search/search_result'); import SearchResult from "../../src/services/search/search_result.js";
import { NoteType } from "../../src/becca/entities/rows"; import { NoteType } from "../../src/becca/entities/rows";
randtoken.generator({ source: "crypto" }); randtoken.generator({ source: "crypto" });

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", () => { describe("Lexer fulltext", () => {
it("simple lexing", () => { it("simple lexing", () => {

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" // 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. // but we access properties like "subExpressions" which is not defined in the "Expression" class.
import Expression = require('../../src/services/search/expressions/expression'); import Expression from "../../src/services/search/expressions/expression.js";
import SearchContext = require('../../src/services/search/search_context'); import SearchContext from "../../src/services/search/search_context.js";
import parse = require('../../src/services/search/services/parse'); import parse from "../../src/services/search/services/parse.js";
function tokens(toks: Array<string>, cur = 0): Array<any> { function tokens(toks: Array<string>, cur = 0): Array<any> {
return toks.map((arg) => { return toks.map((arg) => {

14
spec/search/search.spec.ts
View File

@@ -1,11 +1,11 @@
import searchService = require('../../src/services/search/services/search'); import searchService from "../../src/services/search/services/search.js";
import BNote = require('../../src/becca/entities/bnote'); import BNote from "../../src/becca/entities/bnote.js";
import BBranch = require('../../src/becca/entities/bbranch'); import BBranch from "../../src/becca/entities/bbranch.js";
import SearchContext = require('../../src/services/search/search_context'); import SearchContext from "../../src/services/search/search_context.js";
import dateUtils = require('../../src/services/date_utils'); import dateUtils from "../../src/services/date_utils.js";
import becca = require('../../src/becca/becca'); import becca from "../../src/becca/becca.js";
// const { NoteBuilder, findNoteByTitle, note } = require('./becca_mocking'); // const { NoteBuilder, findNoteByTitle, note } = require('./becca_mocking');
import becca_mocking = require('./becca_mocking'); import becca_mocking from "./becca_mocking.js";
describe('Search', () => { describe('Search', () => {
let rootNote: any; let rootNote: any;

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

@@ -1,7 +1,7 @@
import becca_mocking = require('./becca_mocking'); import becca_mocking from "./becca_mocking.js";
import ValueExtractor = require('../../src/services/search/value_extractor'); import ValueExtractor from "../../src/services/search/value_extractor.js";
import becca = require('../../src/becca/becca'); import becca from "../../src/becca/becca.js";
import SearchContext = require('../../src/services/search/search_context'); import SearchContext from "../../src/services/search/search_context.js";
const dsc = new SearchContext(); const dsc = new SearchContext();

4
src/anonymize.ts
View File

@@ -1,5 +1,5 @@
import anonymizationService = require('./services/anonymization'); import anonymizationService from "./services/anonymization.js";
import sqlInit = require('./services/sql_init'); import sqlInit from "./services/sql_init.js";
require('./becca/entity_constructor'); require('./becca/entity_constructor');
sqlInit.dbReady.then(async () => { sqlInit.dbReady.then(async () => {

4
src/app.ts
View File

@@ -4,8 +4,8 @@ import favicon = require('serve-favicon');
import cookieParser = require('cookie-parser'); import cookieParser = require('cookie-parser');
import helmet = require('helmet'); import helmet = require('helmet');
import compression = require('compression'); import compression = require('compression');
import sessionParser = require('./routes/session_parser'); import sessionParser from "./routes/session_parser.js";
import utils = require('./services/utils'); import utils from "./services/utils.js";
require('./services/handlers'); require('./services/handlers');
require('./becca/becca_loader'); require('./becca/becca_loader');

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

@@ -1,17 +1,17 @@
import sql = require('../services/sql'); import sql from "../services/sql.js";
import NoteSet = require('../services/search/note_set'); import NoteSet from "../services/search/note_set.js";
import NotFoundError = require('../errors/not_found_error'); import NotFoundError from "../errors/not_found_error.js";
import BOption = require('./entities/boption'); import BOption from "./entities/boption.js";
import BNote = require('./entities/bnote'); import BNote from "./entities/bnote.js";
import BEtapiToken = require('./entities/betapi_token'); import BEtapiToken from "./entities/betapi_token.js";
import BAttribute = require('./entities/battribute'); import BAttribute from "./entities/battribute.js";
import BBranch = require('./entities/bbranch'); import BBranch from "./entities/bbranch.js";
import BRevision = require('./entities/brevision'); import BRevision from "./entities/brevision.js";
import BAttachment = require('./entities/battachment'); import BAttachment from "./entities/battachment.js";
import { AttachmentRow, RevisionRow } from './entities/rows'; import { AttachmentRow, RevisionRow } from './entities/rows';
import BBlob = require('./entities/bblob'); import BBlob from "./entities/bblob.js";
import BRecentNote = require('./entities/brecent_note'); import BRecentNote from "./entities/brecent_note.js";
import AbstractBeccaEntity = require('./entities/abstract_becca_entity'); import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
interface AttachmentOpts { interface AttachmentOpts {
includeContentLength?: boolean; includeContentLength?: boolean;

26
src/becca/becca_loader.ts
View File

@@ -1,19 +1,19 @@
"use strict"; "use strict";
import sql = require('../services/sql'); import sql from "../services/sql.js";
import eventService = require('../services/events'); import eventService from "../services/events.js";
import becca = require('./becca'); import becca from "./becca.js";
import sqlInit = require('../services/sql_init'); import sqlInit from "../services/sql_init.js";
import log = require('../services/log'); import log from "../services/log.js";
import BNote = require('./entities/bnote'); import BNote from "./entities/bnote.js";
import BBranch = require('./entities/bbranch'); import BBranch from "./entities/bbranch.js";
import BAttribute = require('./entities/battribute'); import BAttribute from "./entities/battribute.js";
import BOption = require('./entities/boption'); import BOption from "./entities/boption.js";
import BEtapiToken = require('./entities/betapi_token'); import BEtapiToken from "./entities/betapi_token.js";
import cls = require('../services/cls'); import cls from "../services/cls.js";
import entityConstructor = require('../becca/entity_constructor'); import entityConstructor from "../becca/entity_constructor.js";
import { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from './entities/rows'; import { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from './entities/rows';
import AbstractBeccaEntity = require('./entities/abstract_becca_entity'); import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
const beccaLoaded = new Promise<void>((res, rej) => { const beccaLoaded = new Promise<void>((res, rej) => {
sqlInit.dbReady.then(() => { sqlInit.dbReady.then(() => {

6
src/becca/becca_service.ts
View File

@@ -1,8 +1,8 @@
"use strict"; "use strict";
import becca = require('./becca'); import becca from "./becca.js";
import cls = require('../services/cls'); import cls from "../services/cls.js";
import log = require('../services/log'); import log from "../services/log.js";
function isNotePathArchived(notePath: string[]) { function isNotePathArchived(notePath: string[]) {
const noteId = notePath[notePath.length - 1]; const noteId = notePath[notePath.length - 1];

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

@@ -1,14 +1,14 @@
"use strict"; "use strict";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import entityChangesService = require('../../services/entity_changes'); import entityChangesService from "../../services/entity_changes.js";
import eventService = require('../../services/events'); import eventService from "../../services/events.js";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import cls = require('../../services/cls'); import cls from "../../services/cls.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import protectedSessionService = require('../../services/protected_session'); import protectedSessionService from "../../services/protected_session.js";
import blobService = require('../../services/blob'); import blobService from "../../services/blob.js";
import Becca, { ConstructorData } from '../becca-interface'; import Becca, { ConstructorData } from '../becca-interface';
let becca: Becca; let becca: Becca;

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

@@ -1,14 +1,14 @@
"use strict"; "use strict";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import AbstractBeccaEntity = require('./abstract_becca_entity'); import AbstractBeccaEntity from "./abstract_becca_entity.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import protectedSessionService = require('../../services/protected_session'); import protectedSessionService from "../../services/protected_session.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import { AttachmentRow } from './rows'; import { AttachmentRow } from './rows';
import BNote = require('./bnote'); import BNote from "./bnote.js";
import BBranch = require('./bbranch'); import BBranch from "./bbranch.js";
const attachmentRoleToNoteTypeMapping = { const attachmentRoleToNoteTypeMapping = {
'image': 'image', 'image': 'image',

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

@@ -1,10 +1,10 @@
"use strict"; "use strict";
import BNote = require('./bnote'); import BNote from "./bnote.js";
import AbstractBeccaEntity = require('./abstract_becca_entity'); import AbstractBeccaEntity from "./abstract_becca_entity.js";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import promotedAttributeDefinitionParser = require('../../services/promoted_attribute_definition_parser'); import promotedAttributeDefinitionParser from "../../services/promoted_attribute_definition_parser.js";
import sanitizeAttributeName = require('../../services/sanitize_attribute_name'); import sanitizeAttributeName from "../../services/sanitize_attribute_name.js";
import { AttributeRow, AttributeType } from './rows'; import { AttributeRow, AttributeType } from './rows';
interface SavingOpts { interface SavingOpts {

2
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"; import { BlobRow } from "./rows";
// TODO: Why this does not extend the abstract becca? // TODO: Why this does not extend the abstract becca?

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

@@ -1,12 +1,12 @@
"use strict"; "use strict";
import BNote = require('./bnote'); import BNote from "./bnote.js";
import AbstractBeccaEntity = require('./abstract_becca_entity'); import AbstractBeccaEntity from "./abstract_becca_entity.js";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import TaskContext = require('../../services/task_context'); import TaskContext from "../../services/task_context.js";
import cls = require('../../services/cls'); import cls from "../../services/cls.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import { BranchRow } from './rows'; import { BranchRow } from './rows';
/** /**

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

@@ -2,8 +2,8 @@
import { EtapiTokenRow } from "./rows"; import { EtapiTokenRow } from "./rows";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import AbstractBeccaEntity = require('./abstract_becca_entity'); import AbstractBeccaEntity from "./abstract_becca_entity.js";
/** /**
* EtapiToken is an entity representing token used to authenticate against Trilium REST API from client applications. * EtapiToken is an entity representing token used to authenticate against Trilium REST API from client applications.

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

@@ -1,20 +1,20 @@
"use strict"; "use strict";
import protectedSessionService = require('../../services/protected_session'); import protectedSessionService from "../../services/protected_session.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import AbstractBeccaEntity = require('./abstract_becca_entity'); import AbstractBeccaEntity from "./abstract_becca_entity.js";
import BRevision = require('./brevision'); import BRevision from "./brevision.js";
import BAttachment = require('./battachment'); import BAttachment from "./battachment.js";
import TaskContext = require('../../services/task_context'); import TaskContext from "../../services/task_context.js";
import dayjs = require('dayjs'); import dayjs = require('dayjs');
import utc = require('dayjs/plugin/utc'); import utc = require('dayjs/plugin/utc');
import eventService = require('../../services/events'); import eventService from "../../services/events.js";
import { AttachmentRow, NoteRow, NoteType, RevisionRow } from './rows'; import { AttachmentRow, NoteRow, NoteType, RevisionRow } from './rows';
import BBranch = require('./bbranch'); import BBranch from "./bbranch.js";
import BAttribute = require('./battribute'); import BAttribute from "./battribute.js";
import { NotePojo } from '../becca-interface'; import { NotePojo } from '../becca-interface';
dayjs.extend(utc); dayjs.extend(utc);

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

@@ -1,7 +1,7 @@
"use strict"; "use strict";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import AbstractBeccaEntity = require('./abstract_becca_entity'); import AbstractBeccaEntity from "./abstract_becca_entity.js";
import { OptionRow } from './rows'; import { OptionRow } from './rows';
/** /**

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

@@ -2,8 +2,8 @@
import { RecentNoteRow } from "./rows"; import { RecentNoteRow } from "./rows";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import AbstractBeccaEntity = require('./abstract_becca_entity'); import AbstractBeccaEntity from "./abstract_becca_entity.js";
/** /**
* RecentNote represents recently visited note. * RecentNote represents recently visited note.

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

@@ -1,12 +1,12 @@
"use strict"; "use strict";
import protectedSessionService = require('../../services/protected_session'); import protectedSessionService from "../../services/protected_session.js";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import becca = require('../becca'); import becca from "../becca.js";
import AbstractBeccaEntity = require('./abstract_becca_entity'); import AbstractBeccaEntity from "./abstract_becca_entity.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import BAttachment = require('./battachment'); import BAttachment from "./battachment.js";
import { AttachmentRow, RevisionRow } from './rows'; import { AttachmentRow, RevisionRow } from './rows';
interface ContentOpts { interface ContentOpts {

20
src/becca/entity_constructor.ts
View File

@@ -1,14 +1,14 @@
import { ConstructorData } from './becca-interface'; import { ConstructorData } from './becca-interface';
import AbstractBeccaEntity = require('./entities/abstract_becca_entity'); import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
import BAttachment = require('./entities/battachment'); import BAttachment from "./entities/battachment.js";
import BAttribute = require('./entities/battribute'); import BAttribute from "./entities/battribute.js";
import BBlob = require('./entities/bblob'); import BBlob from "./entities/bblob.js";
import BBranch = require('./entities/bbranch'); import BBranch from "./entities/bbranch.js";
import BEtapiToken = require('./entities/betapi_token'); import BEtapiToken from "./entities/betapi_token.js";
import BNote = require('./entities/bnote'); import BNote from "./entities/bnote.js";
import BOption = require('./entities/boption'); import BOption from "./entities/boption.js";
import BRecentNote = require('./entities/brecent_note'); import BRecentNote from "./entities/brecent_note.js";
import BRevision = require('./entities/brevision'); import BRevision from "./entities/brevision.js";
type EntityClass = new (row?: any) => AbstractBeccaEntity<any>; type EntityClass = new (row?: any) => AbstractBeccaEntity<any>;

10
src/becca/similarity.ts
View File

@@ -1,9 +1,9 @@
import becca = require('./becca'); import becca from "./becca.js";
import log = require('../services/log'); import log from "../services/log.js";
import beccaService = require('./becca_service'); import beccaService from "./becca_service.js";
import dateUtils = require('../services/date_utils'); import dateUtils from "../services/date_utils.js";
import { JSDOM } from "jsdom"; import { JSDOM } from "jsdom";
import BNote = require('./entities/bnote'); import BNote from "./entities/bnote.js";
const DEBUG = false; const DEBUG = false;

4
src/etapi/app_info.ts
View File

@@ -1,6 +1,6 @@
import { Router } from 'express'; import { Router } from 'express';
import appInfo = require('../services/app_info'); import appInfo from "../services/app_info.js";
import eu = require('./etapi_utils'); import eu from "./etapi_utils.js";
function register(router: Router) { function register(router: Router) {
eu.route(router, 'get', '/etapi/app-info', (req, res, next) => { eu.route(router, 'get', '/etapi/app-info', (req, res, next) => {

10
src/etapi/attachments.ts
View File

@@ -1,8 +1,8 @@
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import eu = require('./etapi_utils'); import eu from "./etapi_utils.js";
import mappers = require('./mappers'); import mappers from "./mappers.js";
import v = require('./validators'); import v from "./validators.js";
import utils = require('../services/utils'); import utils from "../services/utils.js";
import { Router } from 'express'; import { Router } from 'express';
import { AttachmentRow } from '../becca/entities/rows'; import { AttachmentRow } from '../becca/entities/rows';
import { ValidatorMap } from './etapi-interface'; import { ValidatorMap } from './etapi-interface';

10
src/etapi/attributes.ts
View File

@@ -1,8 +1,8 @@
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import eu = require('./etapi_utils'); import eu from "./etapi_utils.js";
import mappers = require('./mappers'); import mappers from "./mappers.js";
import attributeService = require('../services/attributes'); import attributeService from "../services/attributes.js";
import v = require('./validators'); import v from "./validators.js";
import { Router } from 'express'; import { Router } from 'express';
import { AttributeRow } from '../becca/entities/rows'; import { AttributeRow } from '../becca/entities/rows';
import { ValidatorMap } from './etapi-interface'; import { ValidatorMap } from './etapi-interface';

8
src/etapi/auth.ts
View File

@@ -1,7 +1,7 @@
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import eu = require('./etapi_utils'); import eu from "./etapi_utils.js";
import passwordEncryptionService = require('../services/encryption/password_encryption'); import passwordEncryptionService from "../services/encryption/password_encryption.js";
import etapiTokenService = require('../services/etapi_tokens'); import etapiTokenService from "../services/etapi_tokens.js";
import { RequestHandler, Router } from 'express'; import { RequestHandler, Router } from 'express';
function register(router: Router, loginMiddleware: RequestHandler[]) { function register(router: Router, loginMiddleware: RequestHandler[]) {

4
src/etapi/backup.ts
View File

@@ -1,7 +1,7 @@
import { Router } from "express"; import { Router } from "express";
import eu = require('./etapi_utils'); import eu from "./etapi_utils.js";
import backupService = require('../services/backup'); import backupService from "../services/backup.js";
function register(router: Router) { function register(router: Router) {
eu.route(router, 'put', '/etapi/backup/:backupName', async (req, res, next) => { eu.route(router, 'put', '/etapi/backup/:backupName', async (req, res, next) => {

12
src/etapi/branches.ts
View File

@@ -1,11 +1,11 @@
import { Router } from "express"; import { Router } from "express";
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import eu = require('./etapi_utils'); import eu from "./etapi_utils.js";
import mappers = require('./mappers'); import mappers from "./mappers.js";
import BBranch = require('../becca/entities/bbranch'); import BBranch from "../becca/entities/bbranch.js";
import entityChangesService = require('../services/entity_changes'); import entityChangesService from "../services/entity_changes.js";
import v = require('./validators'); import v from "./validators.js";
import { BranchRow } from "../becca/entities/rows"; import { BranchRow } from "../becca/entities/rows";
function register(router: Router) { function register(router: Router) {

12
src/etapi/etapi_utils.ts
View File

@@ -1,9 +1,9 @@
import cls = require('../services/cls'); import cls from "../services/cls.js";
import sql = require('../services/sql'); import sql from "../services/sql.js";
import log = require('../services/log'); import log from "../services/log.js";
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import etapiTokenService = require('../services/etapi_tokens'); import etapiTokenService from "../services/etapi_tokens.js";
import config = require('../services/config'); import config from "../services/config.js";
import { NextFunction, Request, RequestHandler, Response, Router } from 'express'; import { NextFunction, Request, RequestHandler, Response, Router } from 'express';
import { AppRequest, AppRequestHandler } from '../routes/route-interface'; import { AppRequest, AppRequestHandler } from '../routes/route-interface';
import { ValidatorMap } from './etapi-interface'; import { ValidatorMap } from './etapi-interface';

8
src/etapi/mappers.ts
View File

@@ -1,7 +1,7 @@
import BAttachment = require('../becca/entities/battachment'); import BAttachment from "../becca/entities/battachment.js";
import BAttribute = require('../becca/entities/battribute'); import BAttribute from "../becca/entities/battribute.js";
import BBranch = require('../becca/entities/bbranch'); import BBranch from "../becca/entities/bbranch.js";
import BNote = require('../becca/entities/bnote'); import BNote from "../becca/entities/bnote.js";
function mapNoteToPojo(note: BNote) { function mapNoteToPojo(note: BNote) {
return { return {

24
src/etapi/notes.ts
View File

@@ -1,19 +1,19 @@
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import utils = require('../services/utils'); import utils from "../services/utils.js";
import eu = require('./etapi_utils'); import eu from "./etapi_utils.js";
import mappers = require('./mappers'); import mappers from "./mappers.js";
import noteService = require('../services/notes'); import noteService from "../services/notes.js";
import TaskContext = require('../services/task_context'); import TaskContext from "../services/task_context.js";
import v = require('./validators'); import v from "./validators.js";
import searchService = require('../services/search/services/search'); import searchService from "../services/search/services/search.js";
import SearchContext = require('../services/search/search_context'); import SearchContext from "../services/search/search_context.js";
import zipExportService = require('../services/export/zip'); import zipExportService from "../services/export/zip.js";
import zipImportService = require('../services/import/zip'); import zipImportService from "../services/import/zip.js";
import { Router } from 'express'; import { Router } from 'express';
import { AppRequest } from '../routes/route-interface'; import { AppRequest } from '../routes/route-interface';
import { ParsedQs } from 'qs'; import { ParsedQs } from 'qs';
import { NoteParams } from '../services/note-interface'; 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 { SearchParams } from '../services/search/services/types';
import { ValidatorMap } from './etapi-interface'; import { ValidatorMap } from './etapi-interface';

8
src/etapi/special_notes.ts
View File

@@ -1,7 +1,7 @@
import specialNotesService = require('../services/special_notes'); import specialNotesService from "../services/special_notes.js";
import dateNotesService = require('../services/date_notes'); import dateNotesService from "../services/date_notes.js";
import eu = require('./etapi_utils'); import eu from "./etapi_utils.js";
import mappers = require('./mappers'); import mappers from "./mappers.js";
import { Router } from 'express'; import { Router } from 'express';
const getDateInvalidError = (date: string) => new eu.EtapiError(400, "DATE_INVALID", `Date "${date}" is not valid.`); const getDateInvalidError = (date: string) => new eu.EtapiError(400, "DATE_INVALID", `Date "${date}" is not valid.`);

4
src/etapi/validators.ts
View File

@@ -1,5 +1,5 @@
import noteTypeService = require('../services/note_types'); import noteTypeService from "../services/note_types.js";
import dateUtils = require('../services/date_utils'); import dateUtils from "../services/date_utils.js";
function mandatory(obj: unknown) { function mandatory(obj: unknown) {
if (obj === undefined) { if (obj === undefined) {

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

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

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

@@ -1,7 +1,7 @@
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import blobService = require('../../services/blob'); import blobService from "../../services/blob.js";
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
import imageService = require('../../services/image'); import imageService from "../../services/image.js";
import { Request } from 'express'; import { Request } from 'express';
function getAttachmentBlob(req: Request) { function getAttachmentBlob(req: Request) {

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

@@ -1,11 +1,11 @@
"use strict"; "use strict";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import attributeService = require('../../services/attributes'); import attributeService from "../../services/attributes.js";
import BAttribute = require('../../becca/entities/battribute'); import BAttribute from "../../becca/entities/battribute.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
import { Request } from 'express'; import { Request } from 'express';
function getEffectiveNoteAttributes(req: Request) { function getEffectiveNoteAttributes(req: Request) {

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

@@ -1,13 +1,13 @@
"use strict"; "use strict";
import beccaService = require('../../becca/becca_service'); import beccaService from "../../becca/becca_service.js";
import searchService = require('../../services/search/services/search'); import searchService from "../../services/search/services/search.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import cls = require('../../services/cls'); import cls from "../../services/cls.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import { Request } from 'express'; import { Request } from 'express';
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
function getAutocomplete(req: Request) { function getAutocomplete(req: Request) {
if (typeof req.query.query !== "string") { if (typeof req.query.query !== "string") {

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

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

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

@@ -1,16 +1,16 @@
"use strict"; "use strict";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import entityChangesService = require('../../services/entity_changes'); import entityChangesService from "../../services/entity_changes.js";
import treeService = require('../../services/tree'); import treeService from "../../services/tree.js";
import eraseService = require('../../services/erase'); import eraseService from "../../services/erase.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import TaskContext = require('../../services/task_context'); import TaskContext from "../../services/task_context.js";
import branchService = require('../../services/branches'); import branchService from "../../services/branches.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
import eventService = require('../../services/events'); import eventService from "../../services/events.js";
import { Request } from 'express'; import { Request } from 'express';
/** /**

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

@@ -1,6 +1,6 @@
import { Request } from 'express'; import { Request } from 'express';
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import bulkActionService = require('../../services/bulk_actions'); import bulkActionService from "../../services/bulk_actions.js";
function execute(req: Request) { function execute(req: Request) {
const {noteIds, includeDescendants} = req.body; const {noteIds, includeDescendants} = req.body;

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

@@ -2,22 +2,22 @@
import { Request } from "express"; import { Request } from "express";
import attributeService = require('../../services/attributes'); import attributeService from "../../services/attributes.js";
import cloneService = require('../../services/cloning'); import cloneService from "../../services/cloning.js";
import noteService = require('../../services/notes'); import noteService from "../../services/notes.js";
import dateNoteService = require('../../services/date_notes'); import dateNoteService from "../../services/date_notes.js";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import imageService = require('../../services/image'); import imageService from "../../services/image.js";
import appInfo = require('../../services/app_info'); import appInfo from "../../services/app_info.js";
import ws = require('../../services/ws'); import ws from "../../services/ws.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import path = require('path'); import path = require('path');
import htmlSanitizer = require('../../services/html_sanitizer'); import htmlSanitizer from "../../services/html_sanitizer.js";
import attributeFormatter = require('../../services/attribute_formatter'); import attributeFormatter from "../../services/attribute_formatter.js";
import jsdom = require('jsdom'); import jsdom = require('jsdom');
import BNote = require('../../becca/entities/bnote'); import BNote from "../../becca/entities/bnote.js";
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
const { JSDOM } = jsdom; const { JSDOM } = jsdom;
interface Image { interface Image {

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

@@ -1,7 +1,7 @@
"use strict"; "use strict";
import { Request } from 'express'; import { Request } from 'express';
import cloningService = require('../../services/cloning'); import cloningService from "../../services/cloning.js";
function cloneNoteToBranch(req: Request) { function cloneNoteToBranch(req: Request) {
const {noteId, parentBranchId} = req.params; const {noteId, parentBranchId} = req.params;

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

@@ -1,12 +1,12 @@
"use strict"; "use strict";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import backupService = require('../../services/backup'); import backupService from "../../services/backup.js";
import anonymizationService = require('../../services/anonymization'); import anonymizationService from "../../services/anonymization.js";
import consistencyChecksService = require('../../services/consistency_checks'); import consistencyChecksService from "../../services/consistency_checks.js";
import { Request } from 'express'; import { Request } from 'express';
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
function getExistingBackups() { function getExistingBackups() {
return backupService.getExistingBackups(); return backupService.getExistingBackups();

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

@@ -1,5 +1,5 @@
import { Request } from 'express'; import { Request } from 'express';
import etapiTokenService = require('../../services/etapi_tokens'); import etapiTokenService from "../../services/etapi_tokens.js";
function getTokens() { function getTokens() {
const tokens = etapiTokenService.getTokens(); const tokens = etapiTokenService.getTokens();

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

@@ -1,14 +1,14 @@
"use strict"; "use strict";
import zipExportService = require('../../services/export/zip'); import zipExportService from "../../services/export/zip.js";
import singleExportService = require('../../services/export/single'); import singleExportService from "../../services/export/single.js";
import opmlExportService = require('../../services/export/opml'); import opmlExportService from "../../services/export/opml.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import TaskContext = require('../../services/task_context'); import TaskContext from "../../services/task_context.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import NotFoundError = require('../../errors/not_found_error'); import NotFoundError from "../../errors/not_found_error.js";
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
function exportBranch(req: Request, res: Response) { function exportBranch(req: Request, res: Response) {
const {branchId, type, format, version, taskId} = req.params; const {branchId, type, format, version, taskId} = req.params;

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

@@ -1,19 +1,19 @@
"use strict"; "use strict";
import protectedSessionService = require('../../services/protected_session'); import protectedSessionService from "../../services/protected_session.js";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import noteService = require('../../services/notes'); import noteService from "../../services/notes.js";
import tmp = require('tmp'); import tmp = require('tmp');
import fs = require('fs'); import fs = require('fs');
import { Readable } from 'stream'; import { Readable } from 'stream';
import chokidar = require('chokidar'); import chokidar = require('chokidar');
import ws = require('../../services/ws'); import ws from "../../services/ws.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import BNote = require('../../becca/entities/bnote'); import BNote from "../../becca/entities/bnote.js";
import BAttachment = require('../../becca/entities/battachment'); import BAttachment from "../../becca/entities/battachment.js";
import { AppRequest } from '../route-interface'; import { AppRequest } from '../route-interface';
function updateFile(req: AppRequest) { function updateFile(req: AppRequest) {

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

@@ -1,5 +1,5 @@
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import optionService = require('../../services/options'); import optionService from "../../services/options.js";
function getFontCss(req: Request, res: Response) { function getFontCss(req: Request, res: Response) {
res.setHeader('Content-Type', 'text/css'); res.setHeader('Content-Type', 'text/css');

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

@@ -1,12 +1,12 @@
"use strict"; "use strict";
import imageService = require('../../services/image'); import imageService from "../../services/image.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR; const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
import fs = require('fs'); import fs = require('fs');
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import BNote = require('../../becca/entities/bnote'); import BNote from "../../becca/entities/bnote.js";
import BRevision = require('../../becca/entities/brevision'); import BRevision from "../../becca/entities/brevision.js";
import { AppRequest } from '../route-interface'; import { AppRequest } from '../route-interface';
function returnImageFromNote(req: Request, res: Response) { function returnImageFromNote(req: Request, res: Response) {

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

@@ -1,18 +1,18 @@
"use strict"; "use strict";
import enexImportService = require('../../services/import/enex'); import enexImportService from "../../services/import/enex.js";
import opmlImportService = require('../../services/import/opml'); import opmlImportService from "../../services/import/opml.js";
import zipImportService = require('../../services/import/zip'); import zipImportService from "../../services/import/zip.js";
import singleImportService = require('../../services/import/single'); import singleImportService from "../../services/import/single.js";
import cls = require('../../services/cls'); import cls from "../../services/cls.js";
import path = require('path'); import path = require('path');
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import beccaLoader = require('../../becca/becca_loader'); import beccaLoader from "../../becca/becca_loader.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import TaskContext = require('../../services/task_context'); import TaskContext from "../../services/task_context.js";
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
import { Request } from 'express'; import { Request } from 'express';
import BNote = require('../../becca/entities/bnote'); import BNote from "../../becca/entities/bnote.js";
import { AppRequest } from '../route-interface'; import { AppRequest } from '../route-interface';
async function importNotesToBranch(req: AppRequest) { async function importNotesToBranch(req: AppRequest) {

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

@@ -1,7 +1,7 @@
"use strict"; "use strict";
import keyboardActions = require('../../services/keyboard_actions'); import keyboardActions from "../../services/keyboard_actions.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
function getKeyboardActions() { function getKeyboardActions() {
return keyboardActions.getKeyboardActions(); return keyboardActions.getKeyboardActions();

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

@@ -1,17 +1,17 @@
"use strict"; "use strict";
import options = require('../../services/options'); import options from "../../services/options.js";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import instanceId = require('../../services/instance_id'); import instanceId from "../../services/instance_id.js";
import passwordEncryptionService = require('../../services/encryption/password_encryption'); import passwordEncryptionService from "../../services/encryption/password_encryption.js";
import protectedSessionService = require('../../services/protected_session'); import protectedSessionService from "../../services/protected_session.js";
import appInfo = require('../../services/app_info'); import appInfo from "../../services/app_info.js";
import eventService = require('../../services/events'); import eventService from "../../services/events.js";
import sqlInit = require('../../services/sql_init'); import sqlInit from "../../services/sql_init.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import ws = require('../../services/ws'); import ws from "../../services/ws.js";
import etapiTokenService = require('../../services/etapi_tokens'); import etapiTokenService from "../../services/etapi_tokens.js";
import { Request } from 'express'; import { Request } from 'express';
import { AppRequest } from '../route-interface'; import { AppRequest } from '../route-interface';

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

@@ -1,11 +1,11 @@
"use strict"; "use strict";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import { JSDOM } from "jsdom"; import { JSDOM } from "jsdom";
import BNote = require('../../becca/entities/bnote'); import BNote from "../../becca/entities/bnote.js";
import BAttribute = require('../../becca/entities/battribute'); import BAttribute from "../../becca/entities/battribute.js";
import { Request } from 'express'; import { Request } from 'express';
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
function buildDescendantCountMap(noteIdsToCount: string[]) { function buildDescendantCountMap(noteIdsToCount: string[]) {
if (!Array.isArray(noteIdsToCount)) { if (!Array.isArray(noteIdsToCount)) {

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

@@ -1,17 +1,17 @@
"use strict"; "use strict";
import noteService = require('../../services/notes'); import noteService from "../../services/notes.js";
import eraseService = require('../../services/erase'); import eraseService from "../../services/erase.js";
import treeService = require('../../services/tree'); import treeService from "../../services/tree.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import TaskContext = require('../../services/task_context'); import TaskContext from "../../services/task_context.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
import blobService = require('../../services/blob'); import blobService from "../../services/blob.js";
import { Request } from 'express'; import { Request } from 'express';
import BBranch = require('../../becca/entities/bbranch'); import BBranch from "../../becca/entities/bbranch.js";
import { AttributeRow } from '../../becca/entities/rows'; import { AttributeRow } from '../../becca/entities/rows';
function getNote(req: Request) { function getNote(req: Request) {

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

@@ -1,9 +1,9 @@
"use strict"; "use strict";
import optionService = require('../../services/options'); import optionService from "../../services/options.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import searchService = require('../../services/search/services/search'); import searchService from "../../services/search/services/search.js";
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
import { Request } from 'express'; import { Request } from 'express';
// options allowed to be updated directly in the Options dialog // options allowed to be updated directly in the Options dialog

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

@@ -1,7 +1,7 @@
import { Request } from "express"; import { Request } from "express";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import markdownService = require('../../services/import/markdown'); import markdownService from "../../services/import/markdown.js";
function getIconUsage() { function getIconUsage() {
const iconClassToCountMap: Record<string, number> = {}; const iconClassToCountMap: Record<string, number> = {};

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

@@ -1,7 +1,7 @@
"use strict"; "use strict";
import passwordService = require('../../services/encryption/password'); import passwordService from "../../services/encryption/password.js";
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
import { Request } from 'express'; import { Request } from 'express';
function changePassword(req: Request) { function changePassword(req: Request) {

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

@@ -1,9 +1,9 @@
"use strict"; "use strict";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import protectedSessionService = require('../../services/protected_session'); import protectedSessionService from "../../services/protected_session.js";
import noteService = require('../../services/notes'); import noteService from "../../services/notes.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import { Request } from 'express'; import { Request } from 'express';
import { RevisionRow } from '../../becca/entities/rows'; import { RevisionRow } from '../../becca/entities/rows';

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

@@ -1,8 +1,8 @@
"use strict"; "use strict";
import BRecentNote = require('../../becca/entities/brecent_note'); import BRecentNote from "../../becca/entities/brecent_note.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import dateUtils = require('../../services/date_utils'); import dateUtils from "../../services/date_utils.js";
import { Request } from 'express'; import { Request } from 'express';
function addRecentNote(req: Request) { function addRecentNote(req: Request) {

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

@@ -1,6 +1,6 @@
import { Request } from 'express'; import { Request } from 'express';
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
interface ResponseData { interface ResponseData {
noteTitles: Record<string, string>; noteTitles: Record<string, string>;

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

@@ -1,17 +1,17 @@
"use strict"; "use strict";
import beccaService = require('../../becca/becca_service'); import beccaService from "../../becca/becca_service.js";
import revisionService = require('../../services/revisions'); import revisionService from "../../services/revisions.js";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import cls = require('../../services/cls'); import cls from "../../services/cls.js";
import path = require('path'); import path = require('path');
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import blobService = require('../../services/blob'); import blobService from "../../services/blob.js";
import eraseService = require('../../services/erase'); import eraseService from "../../services/erase.js";
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import BRevision = require('../../becca/entities/brevision'); import BRevision from "../../becca/entities/brevision.js";
import BNote = require('../../becca/entities/bnote'); import BNote from "../../becca/entities/bnote.js";
import { NotePojo } from '../../becca/becca-interface'; import { NotePojo } from '../../becca/becca-interface';
interface NotePath { interface NotePath {

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

@@ -1,10 +1,10 @@
"use strict"; "use strict";
import scriptService = require('../../services/script'); import scriptService from "../../services/script.js";
import attributeService = require('../../services/attributes'); import attributeService from "../../services/attributes.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import syncService = require('../../services/sync'); import syncService from "../../services/sync.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import { Request } from 'express'; import { Request } from 'express';
interface ScriptBody { interface ScriptBody {

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

@@ -2,14 +2,14 @@
import { Request } from "express"; import { Request } from "express";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import SearchContext = require('../../services/search/search_context'); import SearchContext from "../../services/search/search_context.js";
import searchService = require('../../services/search/services/search'); import searchService from "../../services/search/services/search.js";
import bulkActionService = require('../../services/bulk_actions'); import bulkActionService from "../../services/bulk_actions.js";
import cls = require('../../services/cls'); import cls from "../../services/cls.js";
import attributeFormatter = require('../../services/attribute_formatter'); import attributeFormatter from "../../services/attribute_formatter.js";
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
import SearchResult = require('../../services/search/search_result'); import SearchResult from "../../services/search/search_result.js";
function searchFromNote(req: Request) { function searchFromNote(req: Request) {
const note = becca.getNoteOrThrow(req.params.noteId); const note = becca.getNoteOrThrow(req.params.noteId);

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

@@ -1,10 +1,10 @@
"use strict"; "use strict";
import imageType = require('image-type'); import imageType = require('image-type');
import imageService = require('../../services/image'); import imageService from "../../services/image.js";
import noteService = require('../../services/notes'); import noteService from "../../services/notes.js";
import sanitize_attribute_name = require('../../services/sanitize_attribute_name'); import sanitize_attribute_name from "../../services/sanitize_attribute_name.js";
import specialNotesService = require('../../services/special_notes'); import specialNotesService from "../../services/special_notes.js";
import { Request } from 'express'; import { Request } from 'express';
import { AppRequest } from '../route-interface'; import { AppRequest } from '../route-interface';

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

@@ -1,9 +1,9 @@
"use strict"; "use strict";
import sqlInit = require('../../services/sql_init'); import sqlInit from "../../services/sql_init.js";
import setupService = require('../../services/setup'); import setupService from "../../services/setup.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import appInfo = require('../../services/app_info'); import appInfo from "../../services/app_info.js";
import { Request } from 'express'; import { Request } from 'express';
function getStatus() { function getStatus() {

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

@@ -2,8 +2,8 @@
import { Request } from "express"; import { Request } from "express";
import similarityService = require('../../becca/similarity'); import similarityService from "../../becca/similarity.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
async function getSimilarNotes(req: Request) { async function getSimilarNotes(req: Request) {
const noteId = req.params.noteId; const noteId = req.params.noteId;

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

@@ -1,10 +1,10 @@
"use strict"; "use strict";
import dateNoteService = require('../../services/date_notes'); import dateNoteService from "../../services/date_notes.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import cls = require('../../services/cls'); import cls from "../../services/cls.js";
import specialNotesService = require('../../services/special_notes'); import specialNotesService from "../../services/special_notes.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import { Request } from 'express'; import { Request } from 'express';
function getInboxNote(req: Request) { function getInboxNote(req: Request) {

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

@@ -1,9 +1,9 @@
"use strict"; "use strict";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import { Request } from 'express'; import { Request } from 'express';
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
function getSchema() { function getSchema() {
const tableNames = sql.getColumn(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY name`); const tableNames = sql.getColumn(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY name`);

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

@@ -1,5 +1,5 @@
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import { Request } from 'express'; import { Request } from 'express';
function getNoteSize(req: Request) { function getNoteSize(req: Request) {

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

@@ -1,19 +1,19 @@
"use strict"; "use strict";
import syncService = require('../../services/sync'); import syncService from "../../services/sync.js";
import syncUpdateService = require('../../services/sync_update'); import syncUpdateService from "../../services/sync_update.js";
import entityChangesService = require('../../services/entity_changes'); import entityChangesService from "../../services/entity_changes.js";
import sql = require('../../services/sql'); import sql from "../../services/sql.js";
import sqlInit = require('../../services/sql_init'); import sqlInit from "../../services/sql_init.js";
import optionService = require('../../services/options'); import optionService from "../../services/options.js";
import contentHashService = require('../../services/content_hash'); import contentHashService from "../../services/content_hash.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import syncOptions = require('../../services/sync_options'); import syncOptions from "../../services/sync_options.js";
import utils = require('../../services/utils'); import utils from "../../services/utils.js";
import ws = require('../../services/ws'); import ws from "../../services/ws.js";
import { Request } from 'express'; import { Request } from 'express';
import { EntityChange, EntityChangeRecord } from '../../services/entity_changes_interface'; import { EntityChange, EntityChangeRecord } from '../../services/entity_changes_interface';
import ValidationError = require('../../errors/validation_error'); import ValidationError from "../../errors/validation_error.js";
async function testSync() { async function testSync() {
try { try {

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

@@ -1,10 +1,10 @@
"use strict"; "use strict";
import becca = require('../../becca/becca'); import becca from "../../becca/becca.js";
import log = require('../../services/log'); import log from "../../services/log.js";
import NotFoundError = require('../../errors/not_found_error'); import NotFoundError from "../../errors/not_found_error.js";
import { Request } from 'express'; import { Request } from 'express';
import BNote = require('../../becca/entities/bnote'); import BNote from "../../becca/entities/bnote.js";
function getNotesAndBranchesAndAttributes(_noteIds: string[] | Set<string>) { function getNotesAndBranchesAndAttributes(_noteIds: string[] | Set<string>) {
const noteIds = new Set(_noteIds); const noteIds = new Set(_noteIds);

4
src/routes/assets.ts
View File

@@ -1,7 +1,7 @@
import assetPath = require('../services/asset_path'); import assetPath from "../services/asset_path.js";
import path = require('path'); import path = require('path');
import express = require('express'); import express = require('express');
import env = require('../services/env'); import env from "../services/env.js";
import serveStatic = require('serve-static'); import serveStatic = require('serve-static');
const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOptions<express.Response<any, Record<string, any>>>) => { const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOptions<express.Response<any, Record<string, any>>>) => {

12
src/routes/custom.ts
View File

@@ -1,9 +1,9 @@
import log = require('../services/log'); import log from "../services/log.js";
import fileService = require('./api/files'); import fileService from "./api/files.js";
import scriptService = require('../services/script'); import scriptService from "../services/script.js";
import cls = require('../services/cls'); import cls from "../services/cls.js";
import sql = require('../services/sql'); import sql from "../services/sql.js";
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import { Request, Response, Router } from 'express'; import { Request, Response, Router } from 'express';
function handleRequest(req: Request, res: Response) { function handleRequest(req: Request, res: Response) {

2
src/routes/error_handlers.ts
View File

@@ -1,5 +1,5 @@
import { Application, NextFunction, Request, Response } from 'express'; import { Application, NextFunction, Request, Response } from 'express';
import log = require('../services/log'); import log from "../services/log.js";
function register(app: Application) { function register(app: Application) {
app.use((err: any, req: Request, res: Response, next: NextFunction) => { app.use((err: any, req: Request, res: Response, next: NextFunction) => {

22
src/routes/index.ts
View File

@@ -1,16 +1,16 @@
"use strict"; "use strict";
import sql = require('../services/sql'); import sql from "../services/sql.js";
import attributeService = require('../services/attributes'); import attributeService from "../services/attributes.js";
import config = require('../services/config'); import config from "../services/config.js";
import optionService = require('../services/options'); import optionService from "../services/options.js";
import log = require('../services/log'); import log from "../services/log.js";
import env = require('../services/env'); import env from "../services/env.js";
import utils = require('../services/utils'); import utils from "../services/utils.js";
import protectedSessionService = require('../services/protected_session'); import protectedSessionService from "../services/protected_session.js";
import packageJson = require('../../package.json'); import packageJson from "../../package.json.js";
import assetPath = require('../services/asset_path'); import assetPath from "../services/asset_path.js";
import appPath = require('../services/app_path'); import appPath from "../services/app_path.js";
import { Request, Response } from 'express'; import { Request, Response } from 'express';
function index(req: Request, res: Response) { function index(req: Request, res: Response) {

16
src/routes/login.ts
View File

@@ -1,13 +1,13 @@
"use strict"; "use strict";
import utils = require('../services/utils'); import utils from "../services/utils.js";
import optionService = require('../services/options'); import optionService from "../services/options.js";
import myScryptService = require('../services/encryption/my_scrypt'); import myScryptService from "../services/encryption/my_scrypt.js";
import log = require('../services/log'); import log from "../services/log.js";
import passwordService = require('../services/encryption/password'); import passwordService from "../services/encryption/password.js";
import assetPath = require('../services/asset_path'); import assetPath from "../services/asset_path.js";
import appPath = require('../services/app_path'); import appPath from "../services/app_path.js";
import ValidationError = require('../errors/validation_error'); import ValidationError from "../errors/validation_error.js";
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import { AppRequest } from './route-interface'; import { AppRequest } from './route-interface';

118
src/routes/routes.ts
View File

@@ -1,75 +1,75 @@
"use strict"; "use strict";
import utils = require('../services/utils'); import utils from "../services/utils.js";
import multer = require('multer'); import multer = require('multer');
import log = require('../services/log'); import log from "../services/log.js";
import express = require('express'); import express = require('express');
const router = express.Router(); const router = express.Router();
import auth = require('../services/auth'); import auth from "../services/auth.js";
import cls = require('../services/cls'); import cls from "../services/cls.js";
import sql = require('../services/sql'); import sql from "../services/sql.js";
import entityChangesService = require('../services/entity_changes'); import entityChangesService from "../services/entity_changes.js";
import csurf = require('csurf'); import csurf = require('csurf');
import { createPartialContentHandler } from "express-partial-content"; import { createPartialContentHandler } from "express-partial-content";
import rateLimit = require('express-rate-limit'); import rateLimit = require('express-rate-limit');
import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity'); import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
import NotFoundError = require('../errors/not_found_error'); import NotFoundError from "../errors/not_found_error.js";
import ValidationError = require('../errors/validation_error'); import ValidationError from "../errors/validation_error.js";
// page routes // page routes
import setupRoute = require('./setup'); import setupRoute from "./setup.js";
import loginRoute = require('./login'); import loginRoute from "./login.js";
import indexRoute = require('./index'); import indexRoute from "./index.js";
// API routes // API routes
import treeApiRoute = require('./api/tree'); import treeApiRoute from "./api/tree.js";
import notesApiRoute = require('./api/notes'); import notesApiRoute from "./api/notes.js";
import branchesApiRoute = require('./api/branches'); import branchesApiRoute from "./api/branches.js";
import attachmentsApiRoute = require('./api/attachments'); import attachmentsApiRoute from "./api/attachments.js";
import autocompleteApiRoute = require('./api/autocomplete'); import autocompleteApiRoute from "./api/autocomplete.js";
import cloningApiRoute = require('./api/cloning'); import cloningApiRoute from "./api/cloning.js";
import revisionsApiRoute = require('./api/revisions'); import revisionsApiRoute from "./api/revisions.js";
import recentChangesApiRoute = require('./api/recent_changes'); import recentChangesApiRoute from "./api/recent_changes.js";
import optionsApiRoute = require('./api/options'); import optionsApiRoute from "./api/options.js";
import passwordApiRoute = require('./api/password'); import passwordApiRoute from "./api/password.js";
import syncApiRoute = require('./api/sync'); import syncApiRoute from "./api/sync.js";
import loginApiRoute = require('./api/login'); import loginApiRoute from "./api/login.js";
import recentNotesRoute = require('./api/recent_notes'); import recentNotesRoute from "./api/recent_notes.js";
import appInfoRoute = require('./api/app_info'); import appInfoRoute from "./api/app_info.js";
import exportRoute = require('./api/export'); import exportRoute from "./api/export.js";
import importRoute = require('./api/import'); import importRoute from "./api/import.js";
import setupApiRoute = require('./api/setup'); import setupApiRoute from "./api/setup.js";
import sqlRoute = require('./api/sql'); import sqlRoute from "./api/sql.js";
import databaseRoute = require('./api/database'); import databaseRoute from "./api/database.js";
import imageRoute = require('./api/image'); import imageRoute from "./api/image.js";
import attributesRoute = require('./api/attributes'); import attributesRoute from "./api/attributes.js";
import scriptRoute = require('./api/script'); import scriptRoute from "./api/script.js";
import senderRoute = require('./api/sender'); import senderRoute from "./api/sender.js";
import filesRoute = require('./api/files'); import filesRoute from "./api/files.js";
import searchRoute = require('./api/search'); import searchRoute from "./api/search.js";
import bulkActionRoute = require('./api/bulk_action'); import bulkActionRoute from "./api/bulk_action.js";
import specialNotesRoute = require('./api/special_notes'); import specialNotesRoute from "./api/special_notes.js";
import noteMapRoute = require('./api/note_map'); import noteMapRoute from "./api/note_map.js";
import clipperRoute = require('./api/clipper'); import clipperRoute from "./api/clipper.js";
import similarNotesRoute = require('./api/similar_notes'); import similarNotesRoute from "./api/similar_notes.js";
import keysRoute = require('./api/keys'); import keysRoute from "./api/keys.js";
import backendLogRoute = require('./api/backend_log'); import backendLogRoute from "./api/backend_log.js";
import statsRoute = require('./api/stats'); import statsRoute from "./api/stats.js";
import fontsRoute = require('./api/fonts'); import fontsRoute from "./api/fonts.js";
import etapiTokensApiRoutes = require('./api/etapi_tokens'); import etapiTokensApiRoutes from "./api/etapi_tokens.js";
import relationMapApiRoute = require('./api/relation-map'); import relationMapApiRoute from "./api/relation-map.js";
import otherRoute = require('./api/other'); import otherRoute from "./api/other.js";
import shareRoutes = require('../share/routes'); import shareRoutes from "../share/routes.js";
import etapiAuthRoutes = require('../etapi/auth'); import etapiAuthRoutes from "../etapi/auth.js";
import etapiAppInfoRoutes = require('../etapi/app_info'); import etapiAppInfoRoutes from "../etapi/app_info.js";
import etapiAttachmentRoutes = require('../etapi/attachments'); import etapiAttachmentRoutes from "../etapi/attachments.js";
import etapiAttributeRoutes = require('../etapi/attributes'); import etapiAttributeRoutes from "../etapi/attributes.js";
import etapiBranchRoutes = require('../etapi/branches'); import etapiBranchRoutes from "../etapi/branches.js";
import etapiNoteRoutes = require('../etapi/notes'); import etapiNoteRoutes from "../etapi/notes.js";
import etapiSpecialNoteRoutes = require('../etapi/special_notes'); import etapiSpecialNoteRoutes from "../etapi/special_notes.js";
import etapiSpecRoute = require('../etapi/spec'); import etapiSpecRoute from "../etapi/spec.js";
import etapiBackupRoute = require('../etapi/backup'); import etapiBackupRoute from "../etapi/backup.js";
import { AppRequest, AppRequestHandler } from './route-interface'; import { AppRequest, AppRequestHandler } from './route-interface';
const csrfMiddleware = csurf({ const csrfMiddleware = csurf({

4
src/routes/session_parser.ts
View File

@@ -1,6 +1,6 @@
import session = require('express-session'); import session = require('express-session');
import sessionSecret = require('../services/session_secret'); import sessionSecret from "../services/session_secret.js";
import dataDir = require('../services/data_dir'); import dataDir from "../services/data_dir.js";
const FileStore = require('session-file-store')(session); const FileStore = require('session-file-store')(session);
const sessionParser = session({ const sessionParser = session({

10
src/routes/setup.ts
View File

@@ -1,10 +1,10 @@
"use strict"; "use strict";
import sqlInit = require('../services/sql_init'); import sqlInit from "../services/sql_init.js";
import setupService = require('../services/setup'); import setupService from "../services/setup.js";
import utils = require('../services/utils'); import utils from "../services/utils.js";
import assetPath = require('../services/asset_path'); import assetPath from "../services/asset_path.js";
import appPath = require('../services/app_path'); import appPath from "../services/app_path.js";
import { Request, Response } from 'express'; import { Request, Response } from 'express';
function setupPage(req: Request, res: Response) { function setupPage(req: Request, res: Response) {

8
src/services/anonymization.ts
View File

@@ -1,9 +1,9 @@
import BUILTIN_ATTRIBUTES = require('./builtin_attributes'); import BUILTIN_ATTRIBUTES from "./builtin_attributes.js";
import fs = require('fs-extra'); import fs = require('fs-extra');
import dataDir = require('./data_dir'); import dataDir from "./data_dir.js";
import dateUtils = require('./date_utils'); import dateUtils from "./date_utils.js";
import Database = require('better-sqlite3'); import Database = require('better-sqlite3');
import sql = require('./sql'); import sql from "./sql.js";
import path = require('path'); import path = require('path');
function getFullAnonymizationScript() { function getFullAnonymizationScript() {

8
src/services/app_icon.ts
View File

@@ -1,12 +1,12 @@
"use strict"; "use strict";
import path = require('path'); import path = require('path');
import resourceDir = require('./resource_dir'); import resourceDir from "./resource_dir.js";
import log = require('./log'); import log from "./log.js";
import os = require('os'); import os = require('os');
import fs = require('fs'); import fs = require('fs');
import config = require('./config'); import config from "./config.js";
import utils = require('./utils'); import utils from "./utils.js";
const template = `[Desktop Entry] const template = `[Desktop Entry]
Type=Application Type=Application

6
src/services/app_info.ts
View File

@@ -1,8 +1,8 @@
"use strict"; "use strict";
import build = require('./build'); import build from "./build.js";
import packageJson = require('../../package.json'); import packageJson from "../../package.json.js";
import dataDir = require('./data_dir'); import dataDir from "./data_dir.js";
const APP_DB_VERSION = 228; const APP_DB_VERSION = 228;
const SYNC_VERSION = 32; const SYNC_VERSION = 32;

4
src/services/app_path.ts
View File

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

2
src/services/asset_path.ts
View File

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

14
src/services/attributes.ts
View File

@@ -1,12 +1,12 @@
"use strict"; "use strict";
import searchService = require('./search/services/search'); import searchService from "./search/services/search.js";
import sql = require('./sql'); import sql from "./sql.js";
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import BAttribute = require('../becca/entities/battribute'); import BAttribute from "../becca/entities/battribute.js";
import attributeFormatter = require('./attribute_formatter'); import attributeFormatter from "./attribute_formatter.js";
import BUILTIN_ATTRIBUTES = require('./builtin_attributes'); import BUILTIN_ATTRIBUTES from "./builtin_attributes.js";
import BNote = require('../becca/entities/bnote'); import BNote from "../becca/entities/bnote.js";
import { AttributeRow } from '../becca/entities/rows'; import { AttributeRow } from '../becca/entities/rows';
const ATTRIBUTE_TYPES = ['label', 'relation']; const ATTRIBUTE_TYPES = ['label', 'relation'];

14
src/services/auth.ts
View File

@@ -1,12 +1,12 @@
"use strict"; "use strict";
import etapiTokenService = require('./etapi_tokens'); import etapiTokenService from "./etapi_tokens.js";
import log = require('./log'); import log from "./log.js";
import sqlInit = require('./sql_init'); import sqlInit from "./sql_init.js";
import utils = require('./utils'); import utils from "./utils.js";
import passwordEncryptionService = require('./encryption/password_encryption'); import passwordEncryptionService from "./encryption/password_encryption.js";
import config = require('./config'); import config from "./config.js";
import passwordService = require('./encryption/password'); import passwordService from "./encryption/password.js";
import type { NextFunction, Request, Response } from 'express'; import type { NextFunction, Request, Response } from 'express';
import { AppRequest } from '../routes/route-interface'; import { AppRequest } from '../routes/route-interface';

58
src/services/backend_script_api.ts
View File

@@ -1,35 +1,35 @@
import log = require('./log'); import log from "./log.js";
import noteService = require('./notes'); import noteService from "./notes.js";
import sql = require('./sql'); import sql from "./sql.js";
import utils = require('./utils'); import utils from "./utils.js";
import attributeService = require('./attributes'); import attributeService from "./attributes.js";
import dateNoteService = require('./date_notes'); import dateNoteService from "./date_notes.js";
import treeService = require('./tree'); import treeService from "./tree.js";
import config = require('./config'); import config from "./config.js";
import axios = require('axios'); import axios = require('axios');
import dayjs = require('dayjs'); import dayjs = require('dayjs');
import xml2js = require('xml2js'); import xml2js = require('xml2js');
import cloningService = require('./cloning'); import cloningService from "./cloning.js";
import appInfo = require('./app_info'); import appInfo from "./app_info.js";
import searchService = require('./search/services/search'); import searchService from "./search/services/search.js";
import SearchContext = require('./search/search_context'); import SearchContext from "./search/search_context.js";
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import ws = require('./ws'); import ws from "./ws.js";
import SpacedUpdate = require('./spaced_update'); import SpacedUpdate from "./spaced_update.js";
import specialNotesService = require('./special_notes'); import specialNotesService from "./special_notes.js";
import branchService = require('./branches'); import branchService from "./branches.js";
import exportService = require('./export/zip'); import exportService from "./export/zip.js";
import syncMutex = require('./sync_mutex'); import syncMutex from "./sync_mutex.js";
import backupService = require('./backup'); import backupService from "./backup.js";
import optionsService = require('./options'); import optionsService from "./options.js";
import BNote = require('../becca/entities/bnote'); import BNote from "../becca/entities/bnote.js";
import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity'); import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
import BBranch = require('../becca/entities/bbranch'); import BBranch from "../becca/entities/bbranch.js";
import BAttribute = require('../becca/entities/battribute'); import BAttribute from "../becca/entities/battribute.js";
import BAttachment = require('../becca/entities/battachment'); import BAttachment from "../becca/entities/battachment.js";
import BRevision = require('../becca/entities/brevision'); import BRevision from "../becca/entities/brevision.js";
import BEtapiToken = require('../becca/entities/betapi_token'); import BEtapiToken from "../becca/entities/betapi_token.js";
import BOption = require('../becca/entities/boption'); import BOption from "../becca/entities/boption.js";
import { AttributeRow, AttributeType, NoteType } from '../becca/entities/rows'; import { AttributeRow, AttributeType, NoteType } from '../becca/entities/rows';
import Becca from '../becca/becca-interface'; import Becca from '../becca/becca-interface';
import { NoteParams } from './note-interface'; import { NoteParams } from './note-interface';

4
src/services/backend_script_api_interface.ts
View File

@@ -1,6 +1,6 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity'); import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
import BNote = require('../becca/entities/bnote'); import BNote from "../becca/entities/bnote.js";
export interface ApiParams { export interface ApiParams {
startNote?: BNote; startNote?: BNote;

14
src/services/backup.ts
View File

@@ -1,13 +1,13 @@
"use strict"; "use strict";
import dateUtils = require('./date_utils'); import dateUtils from "./date_utils.js";
import optionService = require('./options'); import optionService from "./options.js";
import fs = require('fs-extra'); import fs = require('fs-extra');
import dataDir = require('./data_dir'); import dataDir from "./data_dir.js";
import log = require('./log'); import log from "./log.js";
import syncMutexService = require('./sync_mutex'); import syncMutexService from "./sync_mutex.js";
import cls = require('./cls'); import cls from "./cls.js";
import sql = require('./sql'); import sql from "./sql.js";
import path = require('path'); import path = require('path');
type BackupType = ("daily" | "weekly" | "monthly"); type BackupType = ("daily" | "weekly" | "monthly");

8
src/services/blob.ts
View File

@@ -1,7 +1,7 @@
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import NotFoundError = require('../errors/not_found_error'); import NotFoundError from "../errors/not_found_error.js";
import protectedSessionService = require('./protected_session'); import protectedSessionService from "./protected_session.js";
import utils = require('./utils'); import utils from "./utils.js";
import type { Blob } from "./blob-interface"; import type { Blob } from "./blob-interface";
function getBlobPojo(entityName: string, entityId: string, opts?: { preview: boolean }) { function getBlobPojo(entityName: string, entityId: string, opts?: { preview: boolean }) {

6
src/services/branches.ts
View File

@@ -1,6 +1,6 @@
import treeService = require('./tree'); import treeService from "./tree.js";
import sql = require('./sql'); import sql from "./sql.js";
import BBranch = require('../becca/entities/bbranch.js'); import BBranch from "../becca/entities/bbranch.js.js";
function moveBranchToNote(branchToMove: BBranch, targetParentNoteId: string) { function moveBranchToNote(branchToMove: BBranch, targetParentNoteId: string) {
if (branchToMove.parentNoteId === targetParentNoteId) { if (branchToMove.parentNoteId === targetParentNoteId) {

14
src/services/bulk_actions.ts
View File

@@ -1,10 +1,10 @@
import log = require('./log'); import log from "./log.js";
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import cloningService = require('./cloning'); import cloningService from "./cloning.js";
import branchService = require('./branches'); import branchService from "./branches.js";
import utils = require('./utils'); import utils from "./utils.js";
import eraseService = require('./erase'); import eraseService from "./erase.js";
import BNote = require('../becca/entities/bnote'); import BNote from "../becca/entities/bnote.js";
interface Action { interface Action {
labelName: string; labelName: string;

4
src/services/config.ts
View File

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

28
src/services/consistency_checks.ts
View File

@@ -1,19 +1,19 @@
"use strict"; "use strict";
import sql = require('./sql'); import sql from "./sql.js";
import sqlInit = require('./sql_init'); import sqlInit from "./sql_init.js";
import log = require('./log'); import log from "./log.js";
import ws = require('./ws'); import ws from "./ws.js";
import syncMutexService = require('./sync_mutex'); import syncMutexService from "./sync_mutex.js";
import cls = require('./cls'); import cls from "./cls.js";
import entityChangesService = require('./entity_changes'); import entityChangesService from "./entity_changes.js";
import optionsService = require('./options'); import optionsService from "./options.js";
import BBranch = require('../becca/entities/bbranch'); import BBranch from "../becca/entities/bbranch.js";
import becca = require('../becca/becca'); import becca from "../becca/becca.js";
import utils = require('../services/utils'); import utils from "../services/utils.js";
import eraseService = require('../services/erase'); import eraseService from "../services/erase.js";
import sanitizeAttributeName = require('./sanitize_attribute_name'); import sanitizeAttributeName from "./sanitize_attribute_name.js";
import noteTypesService = require('../services/note_types'); import noteTypesService from "../services/note_types.js";
import { BranchRow } from '../becca/entities/rows'; import { BranchRow } from '../becca/entities/rows';
import { EntityChange } from './entity_changes_interface'; import { EntityChange } from './entity_changes_interface';
const noteTypes = noteTypesService.getNoteTypeNames(); const noteTypes = noteTypesService.getNoteTypeNames();

8
src/services/content_hash.ts
View File

@@ -1,9 +1,9 @@
"use strict"; "use strict";
import sql = require('./sql'); import sql from "./sql.js";
import utils = require('./utils'); import utils from "./utils.js";
import log = require('./log'); import log from "./log.js";
import eraseService = require('./erase'); import eraseService from "./erase.js";
type SectorHash = Record<string, string>; type SectorHash = Record<string, string>;

18
src/services/date_notes.ts
View File

@@ -1,14 +1,14 @@
"use strict"; "use strict";
import noteService = require('./notes'); import noteService from "./notes.js";
import attributeService = require('./attributes'); import attributeService from "./attributes.js";
import dateUtils = require('./date_utils'); import dateUtils from "./date_utils.js";
import sql = require('./sql'); import sql from "./sql.js";
import protectedSessionService = require('./protected_session'); import protectedSessionService from "./protected_session.js";
import searchService = require('../services/search/services/search'); import searchService from "../services/search/services/search.js";
import SearchContext = require('../services/search/search_context'); import SearchContext from "../services/search/search_context.js";
import hoistedNoteService = require('./hoisted_note'); import hoistedNoteService from "./hoisted_note.js";
import BNote = require('../becca/entities/bnote'); import BNote from "../becca/entities/bnote.js";
const CALENDAR_ROOT_LABEL = 'calendarRoot'; const CALENDAR_ROOT_LABEL = 'calendarRoot';
const YEAR_LABEL = 'yearNote'; const YEAR_LABEL = 'yearNote';

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