Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-17 10:40:41 +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
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 dataDir = require('./data_dir');
import dateUtils = require('./date_utils');
import dataDir from "./data_dir.js";
import dateUtils from "./date_utils.js";
import Database = require('better-sqlite3');
import sql = require('./sql');
import sql from "./sql.js";
import path = require('path');
function getFullAnonymizationScript() {

8
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 resourceDir from "./resource_dir.js";
import log from "./log.js";
import os = require('os');
import fs = require('fs');
import config = require('./config');
import utils = require('./utils');
import config from "./config.js";
import utils from "./utils.js";
const template = `[Desktop Entry]
Type=Application

6
src/services/app_info.ts
View File

@@ -1,8 +1,8 @@
"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.js";
import dataDir from "./data_dir.js";
const APP_DB_VERSION = 228;
const SYNC_VERSION = 32;

4
src/services/app_path.ts
View File

@@ -1,5 +1,5 @@
import assetPath = require('./asset_path');
import env = require('./env');
import assetPath from "./asset_path.js";
import env from "./env.js";
export = env.isDev()
? 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}`;

14
src/services/attributes.ts
View File

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

14
src/services/auth.ts
View File

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

58
src/services/backend_script_api.ts
View File

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

14
src/services/backup.ts
View File

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

8
src/services/blob.ts
View File

@@ -1,7 +1,7 @@
import becca = require('../becca/becca');
import NotFoundError = require('../errors/not_found_error');
import protectedSessionService = require('./protected_session');
import utils = require('./utils');
import becca from "../becca/becca.js";
import NotFoundError from "../errors/not_found_error.js";
import protectedSessionService from "./protected_session.js";
import utils from "./utils.js";
import type { Blob } from "./blob-interface";
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 sql = require('./sql');
import BBranch = require('../becca/entities/bbranch.js');
import treeService from "./tree.js";
import sql from "./sql.js";
import BBranch from "../becca/entities/bbranch.js.js";
function moveBranchToNote(branchToMove: BBranch, targetParentNoteId: string) {
if (branchToMove.parentNoteId === targetParentNoteId) {

14
src/services/bulk_actions.ts
View File

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

4
src/services/config.ts
View File

@@ -2,9 +2,9 @@
import ini = require('ini');
import fs = require('fs');
import dataDir = require('./data_dir');
import dataDir from "./data_dir.js";
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");

28
src/services/consistency_checks.ts
View File

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

8
src/services/content_hash.ts
View File

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

18
src/services/date_notes.ts
View File

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

2
src/services/date_utils.ts
View File

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

2
src/services/encryption/data_encryption.ts
View File

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

2
src/services/encryption/my_scrypt.ts
View File

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

10
src/services/encryption/password.ts
View File

@@ -1,10 +1,10 @@
"use strict";
import sql = require('../sql');
import optionService = require('../options');
import myScryptService = require('./my_scrypt');
import utils = require('../utils');
import passwordEncryptionService = require('./password_encryption');
import sql from "../sql.js";
import optionService from "../options.js";
import myScryptService from "./my_scrypt.js";
import utils from "../utils.js";
import passwordEncryptionService from "./password_encryption.js";
function isPasswordSet() {
return !!sql.getValue("SELECT value FROM options WHERE name = 'passwordVerificationHash'");

8
src/services/encryption/password_encryption.ts
View File

@@ -1,7 +1,7 @@
import optionService = require('../options');
import myScryptService = require('./my_scrypt');
import utils = require('../utils');
import dataEncryptionService = require('./data_encryption');
import optionService from "../options.js";
import myScryptService from "./my_scrypt.js";
import utils from "../utils.js";
import dataEncryptionService from "./data_encryption.js";
function verifyPassword(password: string) {
const givenPasswordHash = utils.toBase64(myScryptService.getVerificationHash(password));

16
src/services/entity_changes.ts
View File

@@ -1,11 +1,11 @@
import sql = require('./sql');
import dateUtils = require('./date_utils');
import log = require('./log');
import cls = require('./cls');
import utils = require('./utils');
import instanceId = require('./instance_id');
import becca = require('../becca/becca');
import blobService = require('../services/blob');
import sql from "./sql.js";
import dateUtils from "./date_utils.js";
import log from "./log.js";
import cls from "./cls.js";
import utils from "./utils.js";
import instanceId from "./instance_id.js";
import becca from "../becca/becca.js";
import blobService from "../services/blob.js";
import { EntityChange } from './entity_changes_interface';
import type { Blob } from "./blob-interface";

16
src/services/erase.ts
View File

@@ -1,11 +1,11 @@
import sql = require('./sql');
import revisionService = require('./revisions');
import log = require('./log');
import entityChangesService = require('./entity_changes');
import optionService = require('./options');
import dateUtils = require('./date_utils');
import sqlInit = require('./sql_init');
import cls = require('./cls');
import sql from "./sql.js";
import revisionService from "./revisions.js";
import log from "./log.js";
import entityChangesService from "./entity_changes.js";
import optionService from "./options.js";
import dateUtils from "./date_utils.js";
import sqlInit from "./sql_init.js";
import cls from "./cls.js";
import { EntityChange } from "./entity_changes_interface";
function eraseNotes(noteIdsToErase: string[]) {

6
src/services/etapi_tokens.ts
View File

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

8
src/services/export/opml.ts
View File

@@ -1,9 +1,9 @@
"use strict";
import utils = require('../utils');
import becca = require('../../becca/becca');
import TaskContext = require('../task_context');
import BBranch = require('../../becca/entities/bbranch');
import utils from "../utils.js";
import becca from "../../becca/becca.js";
import TaskContext from "../task_context.js";
import BBranch from "../../becca/entities/bbranch.js";
import { Response } from 'express';
function exportToOpml(taskContext: TaskContext, branch: BBranch, version: string, res: Response) {

10
src/services/export/single.ts
View File

@@ -2,11 +2,11 @@
import mimeTypes = require('mime-types');
import html = require('html');
import utils = require('../utils');
import mdService = require('./md');
import becca = require('../../becca/becca');
import TaskContext = require('../task_context');
import BBranch = require('../../becca/entities/bbranch');
import utils from "../utils.js";
import mdService from "./md.js";
import becca from "../../becca/becca.js";
import TaskContext from "../task_context.js";
import BBranch from "../../becca/entities/bbranch.js";
import { Response } from 'express';
function exportSingleNote(taskContext: TaskContext, branch: BBranch, format: "html" | "markdown", res: Response) {

26
src/services/export/zip.ts
View File

@@ -1,25 +1,25 @@
"use strict";
import html = require('html');
import dateUtils = require('../date_utils');
import dateUtils from "../date_utils.js";
import path = require('path');
import mimeTypes = require('mime-types');
import mdService = require('./md');
import packageInfo = require('../../../package.json');
import utils = require('../utils');
import protectedSessionService = require('../protected_session');
import mdService from "./md.js";
import packageInfo from "../../../package.json.js";
import utils from "../utils.js";
import protectedSessionService from "../protected_session.js";
import sanitize = require('sanitize-filename');
import fs = require('fs');
import becca = require('../../becca/becca');
import becca from "../../becca/becca.js";
const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
import archiver = require('archiver');
import log = require('../log');
import TaskContext = require('../task_context');
import ValidationError = require('../../errors/validation_error');
import NoteMeta = require('../meta/note_meta');
import AttachmentMeta = require('../meta/attachment_meta');
import AttributeMeta = require('../meta/attribute_meta');
import BBranch = require('../../becca/entities/bbranch');
import log from "../log.js";
import TaskContext from "../task_context.js";
import ValidationError from "../../errors/validation_error.js";
import NoteMeta from "../meta/note_meta.js";
import AttachmentMeta from "../meta/attachment_meta.js";
import AttributeMeta from "../meta/attribute_meta.js";
import BBranch from "../../becca/entities/bbranch.js";
import { Response } from 'express';
async function exportToZip(taskContext: TaskContext, branch: BBranch, format: "html" | "markdown", res: Response | fs.WriteStream, setHeaders = true) {

20
src/services/handlers.ts
View File

@@ -1,13 +1,13 @@
import eventService = require('./events');
import scriptService = require('./script');
import treeService = require('./tree');
import noteService = require('./notes');
import becca = require('../becca/becca');
import BAttribute = require('../becca/entities/battribute');
import hiddenSubtreeService = require('./hidden_subtree');
import oneTimeTimer = require('./one_time_timer');
import BNote = require('../becca/entities/bnote');
import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity');
import eventService from "./events.js";
import scriptService from "./script.js";
import treeService from "./tree.js";
import noteService from "./notes.js";
import becca from "../becca/becca.js";
import BAttribute from "../becca/entities/battribute.js";
import hiddenSubtreeService from "./hidden_subtree.js";
import oneTimeTimer from "./one_time_timer.js";
import BNote from "../becca/entities/bnote.js";
import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
import { DefinitionObject } from './promoted_attribute_definition_interface';
type Handler = (definition: DefinitionObject, note: BNote, targetNote: BNote) => void;

10
src/services/hidden_subtree.ts
View File

@@ -1,10 +1,10 @@
import BAttribute = require('../becca/entities/battribute');
import BAttribute from "../becca/entities/battribute.js";
import { AttributeType, NoteType } from "../becca/entities/rows";
import becca = require('../becca/becca');
import noteService = require('./notes');
import log = require('./log');
import migrationService = require('./migration');
import becca from "../becca/becca.js";
import noteService from "./notes.js";
import log from "./log.js";
import migrationService from "./migration.js";
const LBTPL_ROOT = "_lbTplRoot";
const LBTPL_BASE = "_lbTplBase";

4
src/services/hoisted_note.ts
View File

@@ -1,5 +1,5 @@
import cls = require('./cls');
import becca = require('../becca/becca');
import cls from "./cls.js";
import becca from "../becca/becca.js";
function getHoistedNoteId() {
return cls.getHoistedNoteId();

2
src/services/host.ts
View File

@@ -1,3 +1,3 @@
import config = require('./config');
import config from "./config.js";
export = process.env.TRILIUM_HOST || config['Network']['host'] || '0.0.0.0';

14
src/services/image.ts
View File

@@ -1,17 +1,17 @@
"use strict";
import becca = require('../becca/becca');
import log = require('./log');
import protectedSessionService = require('./protected_session');
import noteService = require('./notes');
import optionService = require('./options');
import sql = require('./sql');
import becca from "../becca/becca.js";
import log from "./log.js";
import protectedSessionService from "./protected_session.js";
import noteService from "./notes.js";
import optionService from "./options.js";
import sql from "./sql.js";
import jimp = require('jimp');
import imageType = require('image-type');
import sanitizeFilename = require('sanitize-filename');
import isSvg = require('is-svg');
import isAnimated = require('is-animated');
import htmlSanitizer = require('./html_sanitizer');
import htmlSanitizer from "./html_sanitizer.js";
async function processImage(uploadBuffer: Buffer, originalName: string, shrinkImageSwitch: boolean) {
const compressImages = optionService.getOptionBool("compressImages");

20
src/services/import/enex.ts
View File

@@ -1,16 +1,16 @@
import sax = require('sax');
import stream = require('stream');
import { Throttle } from 'stream-throttle';
import log = require('../log');
import utils = require('../utils');
import sql = require('../sql');
import noteService = require('../notes');
import imageService = require('../image');
import protectedSessionService = require('../protected_session');
import htmlSanitizer = require('../html_sanitizer');
import sanitizeAttributeName = require('../sanitize_attribute_name');
import TaskContext = require('../task_context');
import BNote = require('../../becca/entities/bnote');
import log from "../log.js";
import utils from "../utils.js";
import sql from "../sql.js";
import noteService from "../notes.js";
import imageService from "../image.js";
import protectedSessionService from "../protected_session.js";
import htmlSanitizer from "../html_sanitizer.js";
import sanitizeAttributeName from "../sanitize_attribute_name.js";
import TaskContext from "../task_context.js";
import BNote from "../../becca/entities/bnote.js";
import { File } from "./common";
/**

4
src/services/import/markdown.ts
View File

@@ -1,8 +1,8 @@
"use strict";
import marked = require('marked');
import htmlSanitizer = require('../html_sanitizer');
import importUtils = require('./utils');
import htmlSanitizer from "../html_sanitizer.js";
import importUtils from "./utils.js";
function renderToHtml(content: string, title: string) {
const html = marked.parse(content, {

10
src/services/import/opml.ts
View File

@@ -1,11 +1,11 @@
"use strict";
import noteService = require('../../services/notes');
import noteService from "../../services/notes.js";
import xml2js = require('xml2js');
import protectedSessionService = require('../protected_session');
import htmlSanitizer = require('../html_sanitizer');
import TaskContext = require('../task_context');
import BNote = require('../../becca/entities/bnote');
import protectedSessionService from "../protected_session.js";
import htmlSanitizer from "../html_sanitizer.js";
import TaskContext from "../task_context.js";
import BNote from "../../becca/entities/bnote.js";
const parseString = xml2js.parseString;
interface OpmlXml {

20
src/services/import/single.ts
View File

@@ -1,16 +1,16 @@
"use strict";
import BNote = require('../../becca/entities/bnote');
import TaskContext = require('../task_context');
import BNote from "../../becca/entities/bnote.js";
import TaskContext from "../task_context.js";
import noteService = require('../../services/notes');
import imageService = require('../../services/image');
import protectedSessionService = require('../protected_session');
import markdownService = require('./markdown');
import mimeService = require('./mime');
import utils = require('../../services/utils');
import importUtils = require('./utils');
import htmlSanitizer = require('../html_sanitizer');
import noteService from "../../services/notes.js";
import imageService from "../../services/image.js";
import protectedSessionService from "../protected_session.js";
import markdownService from "./markdown.js";
import mimeService from "./mime.js";
import utils from "../../services/utils.js";
import importUtils from "./utils.js";
import htmlSanitizer from "../html_sanitizer.js";
import { File } from "./common";
function importSingleFile(taskContext: TaskContext, file: File, parentNote: BNote) {

34
src/services/import/zip.ts
View File

@@ -1,24 +1,24 @@
"use strict";
import BAttribute = require('../../becca/entities/battribute');
import utils = require('../../services/utils');
import log = require('../../services/log');
import noteService = require('../../services/notes');
import attributeService = require('../../services/attributes');
import BBranch = require('../../becca/entities/bbranch');
import BAttribute from "../../becca/entities/battribute.js";
import utils from "../../services/utils.js";
import log from "../../services/log.js";
import noteService from "../../services/notes.js";
import attributeService from "../../services/attributes.js";
import BBranch from "../../becca/entities/bbranch.js";
import path = require('path');
import protectedSessionService = require('../protected_session');
import mimeService = require('./mime');
import treeService = require('../tree');
import protectedSessionService from "../protected_session.js";
import mimeService from "./mime.js";
import treeService from "../tree.js";
import yauzl = require('yauzl');
import htmlSanitizer = require('../html_sanitizer');
import becca = require('../../becca/becca');
import BAttachment = require('../../becca/entities/battachment');
import markdownService = require('./markdown');
import TaskContext = require('../task_context');
import BNote = require('../../becca/entities/bnote');
import NoteMeta = require('../meta/note_meta');
import AttributeMeta = require('../meta/attribute_meta');
import htmlSanitizer from "../html_sanitizer.js";
import becca from "../../becca/becca.js";
import BAttachment from "../../becca/entities/battachment.js";
import markdownService from "./markdown.js";
import TaskContext from "../task_context.js";
import BNote from "../../becca/entities/bnote.js";
import NoteMeta from "../meta/note_meta.js";
import AttributeMeta from "../meta/attribute_meta.js";
import { Stream } from 'stream';
import { ALLOWED_NOTE_TYPES, NoteType } from '../../becca/entities/rows';

2
src/services/instance_id.ts
View File

@@ -1,4 +1,4 @@
import utils = require('./utils');
import utils from "./utils.js";
const instanceId = utils.randomString(12);

6
src/services/keyboard_actions.ts
View File

@@ -1,8 +1,8 @@
"use strict";
import optionService = require('./options');
import log = require('./log');
import utils = require('./utils');
import optionService from "./options.js";
import log from "./log.js";
import utils from "./utils.js";
import { KeyboardShortcut } from './keyboard_actions_interface';
const isMac = process.platform === "darwin";

4
src/services/log.ts
View File

@@ -2,8 +2,8 @@
import { Request, Response } from "express";
import fs = require('fs');
import dataDir = require('./data_dir');
import cls = require('./cls');
import dataDir from "./data_dir.js";
import cls from "./cls.js";
if (!fs.existsSync(dataDir.LOG_DIR)) {
fs.mkdirSync(dataDir.LOG_DIR, 0o700);

4
src/services/meta/note_meta.ts
View File

@@ -1,5 +1,5 @@
import AttachmentMeta = require('./attachment_meta');
import AttributeMeta = require('./attribute_meta');
import AttachmentMeta from "./attachment_meta.js";
import AttributeMeta from "./attribute_meta.js";
interface NoteMeta {
noteId?: string;

14
src/services/migration.ts
View File

@@ -1,11 +1,11 @@
import backupService = require('./backup');
import sql = require('./sql');
import backupService from "./backup.js";
import sql from "./sql.js";
import fs = require('fs-extra');
import log = require('./log');
import utils = require('./utils');
import resourceDir = require('./resource_dir');
import appInfo = require('./app_info');
import cls = require('./cls');
import log from "./log.js";
import utils from "./utils.js";
import resourceDir from "./resource_dir.js";
import appInfo from "./app_info.js";
import cls from "./cls.js";
interface MigrationInfo {
dbVersion: number;

42
src/services/notes.ts
View File

@@ -1,30 +1,30 @@
import sql = require('./sql');
import optionService = require('./options');
import dateUtils = require('./date_utils');
import entityChangesService = require('./entity_changes');
import eventService = require('./events');
import cls = require('../services/cls');
import protectedSessionService = require('../services/protected_session');
import log = require('../services/log');
import utils = require('../services/utils');
import revisionService = require('./revisions');
import request = require('./request');
import sql from "./sql.js";
import optionService from "./options.js";
import dateUtils from "./date_utils.js";
import entityChangesService from "./entity_changes.js";
import eventService from "./events.js";
import cls from "../services/cls.js";
import protectedSessionService from "../services/protected_session.js";
import log from "../services/log.js";
import utils from "../services/utils.js";
import revisionService from "./revisions.js";
import request from "./request.js";
import path = require('path');
import url = require('url');
import becca = require('../becca/becca');
import BBranch = require('../becca/entities/bbranch');
import BNote = require('../becca/entities/bnote');
import BAttribute = require('../becca/entities/battribute');
import BAttachment = require('../becca/entities/battachment');
import becca from "../becca/becca.js";
import BBranch from "../becca/entities/bbranch.js";
import BNote from "../becca/entities/bnote.js";
import BAttribute from "../becca/entities/battribute.js";
import BAttachment from "../becca/entities/battachment.js";
import dayjs = require('dayjs');
import htmlSanitizer = require('./html_sanitizer');
import ValidationError = require('../errors/validation_error');
import noteTypesService = require('./note_types');
import htmlSanitizer from "./html_sanitizer.js";
import ValidationError from "../errors/validation_error.js";
import noteTypesService from "./note_types.js";
import fs = require('fs');
import ws = require('./ws');
import ws from "./ws.js";
import html2plaintext = require('html2plaintext');
import { AttachmentRow, AttributeRow, BranchRow, NoteRow, NoteType } from '../becca/entities/rows';
import TaskContext = require('./task_context');
import TaskContext from "./task_context.js";
import { NoteParams } from './note-interface';
interface FoundLink {

4
src/services/options.ts
View File

@@ -1,6 +1,6 @@
import becca = require('../becca/becca');
import becca from "../becca/becca.js";
import { OptionRow } from '../becca/entities/rows';
import sql = require('./sql');
import sql from "./sql.js";
function getOptionOrNull(name: string): string | null {
let option;

12
src/services/options_init.ts
View File

@@ -1,9 +1,9 @@
import optionService = require('./options');
import appInfo = require('./app_info');
import utils = require('./utils');
import log = require('./log');
import dateUtils = require('./date_utils');
import keyboardActions = require('./keyboard_actions');
import optionService from "./options.js";
import appInfo from "./app_info.js";
import utils from "./utils.js";
import log from "./log.js";
import dateUtils from "./date_utils.js";
import keyboardActions from "./keyboard_actions.js";
import { KeyboardShortcutWithRequiredActionName } from './keyboard_actions_interface';
function initDocumentOptions() {

8
src/services/port.ts
View File

@@ -1,7 +1,7 @@
import config = require('./config');
import utils = require('./utils');
import env = require('./env');
import dataDir = require('./data_dir');
import config from "./config.js";
import utils from "./utils.js";
import env from "./env.js";
import dataDir from "./data_dir.js";
function parseAndValidate(portStr: string, source: string) {
const portNum = parseInt(portStr);

4
src/services/protected_session.ts
View File

@@ -1,7 +1,7 @@
"use strict";
import log = require('./log');
import dataEncryptionService = require('./encryption/data_encryption');
import log from "./log.js";
import dataEncryptionService from "./encryption/data_encryption.js";
let dataKey: Buffer | null = null;

6
src/services/request.ts
View File

@@ -1,9 +1,9 @@
"use strict";
import utils = require('./utils');
import log = require('./log');
import utils from "./utils.js";
import log from "./log.js";
import url = require('url');
import syncOptions = require('./sync_options');
import syncOptions from "./sync_options.js";
import { ExecOpts } from './request_interface';
// this service provides abstraction over node's HTTP/HTTPS and electron net.client APIs

2
src/services/resource_dir.ts
View File

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

10
src/services/revisions.ts
View File

@@ -1,10 +1,10 @@
"use strict";
import log = require('./log');
import sql = require('./sql');
import protectedSessionService = require('./protected_session');
import dateUtils = require('./date_utils');
import BNote = require('../becca/entities/bnote');
import log from "./log.js";
import sql from "./sql.js";
import protectedSessionService from "./protected_session.js";
import dateUtils from "./date_utils.js";
import BNote from "../becca/entities/bnote.js";
function protectRevisions(note: BNote) {
if (!protectedSessionService.isProtectedSessionAvailable()) {

18
src/services/scheduler.ts
View File

@@ -1,12 +1,12 @@
import scriptService = require('./script');
import cls = require('./cls');
import sqlInit = require('./sql_init');
import config = require('./config');
import log = require('./log');
import attributeService = require('../services/attributes');
import protectedSessionService = require('../services/protected_session');
import hiddenSubtreeService = require('./hidden_subtree');
import BNote = require('../becca/entities/bnote');
import scriptService from "./script.js";
import cls from "./cls.js";
import sqlInit from "./sql_init.js";
import config from "./config.js";
import log from "./log.js";
import attributeService from "../services/attributes.js";
import protectedSessionService from "../services/protected_session.js";
import hiddenSubtreeService from "./hidden_subtree.js";
import BNote from "../becca/entities/bnote.js";
function getRunAtHours(note: BNote): number[] {
try {

10
src/services/script.ts
View File

@@ -1,8 +1,8 @@
import ScriptContext = require('./script_context');
import cls = require('./cls');
import log = require('./log');
import becca = require('../becca/becca');
import BNote = require('../becca/entities/bnote');
import ScriptContext from "./script_context.js";
import cls from "./cls.js";
import log from "./log.js";
import becca from "../becca/becca.js";
import BNote from "../becca/entities/bnote.js";
import { ApiParams } from './backend_script_api_interface';
interface Bundle {

6
src/services/script_context.ts
View File

@@ -1,6 +1,6 @@
import utils = require('./utils');
import BackendScriptApi = require('./backend_script_api');
import BNote = require('../becca/entities/bnote');
import utils from "./utils.js";
import BackendScriptApi from "./backend_script_api.js";
import BNote from "../becca/entities/bnote.js";
import { ApiParams } from './backend_script_api_interface';
type Module = {

10
src/services/search/expressions/ancestor.ts
View File

@@ -1,10 +1,10 @@
"use strict";
import Expression = require('./expression');
import NoteSet = require('../note_set');
import log = require('../../log');
import becca = require('../../../becca/becca');
import SearchContext = require('../search_context');
import Expression from "./expression.js";
import NoteSet from "../note_set.js";
import log from "../../log.js";
import becca from "../../../becca/becca.js";
import SearchContext from "../search_context.js";
class AncestorExp extends Expression {

8
src/services/search/expressions/and.ts
View File

@@ -1,9 +1,9 @@
"use strict";
import NoteSet = require('../note_set');
import SearchContext = require('../search_context');
import Expression = require('./expression');
import TrueExp = require('./true');
import NoteSet from "../note_set.js";
import SearchContext from "../search_context.js";
import Expression from "./expression.js";
import TrueExp from "./true.js";
class AndExp extends Expression {
private subExpressions: Expression[];

8
src/services/search/expressions/attribute_exists.ts
View File

@@ -1,10 +1,10 @@
"use strict";
import NoteSet = require('../note_set');
import SearchContext = require('../search_context');
import NoteSet from "../note_set.js";
import SearchContext from "../search_context.js";
import becca = require('../../../becca/becca');
import Expression = require('./expression');
import becca from "../../../becca/becca.js";
import Expression from "./expression.js";
class AttributeExistsExp extends Expression {

6
src/services/search/expressions/child_of.ts
View File

@@ -1,8 +1,8 @@
"use strict";
import Expression = require('./expression');
import NoteSet = require('../note_set');
import SearchContext = require('../search_context');
import Expression from "./expression.js";
import NoteSet from "../note_set.js";
import SearchContext from "../search_context.js";
class ChildOfExp extends Expression {

8
src/services/search/expressions/descendant_of.ts
View File

@@ -1,9 +1,9 @@
"use strict";
import Expression = require('./expression');
import NoteSet = require('../note_set');
import becca = require('../../../becca/becca');
import SearchContext = require('../search_context');
import Expression from "./expression.js";
import NoteSet from "../note_set.js";
import becca from "../../../becca/becca.js";
import SearchContext from "../search_context.js";
class DescendantOfExp extends Expression {
private subExpression: Expression;

4
src/services/search/expressions/expression.ts
View File

@@ -1,7 +1,7 @@
"use strict";
import NoteSet = require('../note_set');
import SearchContext = require('../search_context');
import NoteSet from "../note_set.js";
import SearchContext from "../search_context.js";
abstract class Expression {
name: string;

6
src/services/search/expressions/is_hidden.ts
View File

@@ -1,8 +1,8 @@
"use strict";
import Expression = require('./expression');
import NoteSet = require('../note_set');
import SearchContext = require('../search_context');
import Expression from "./expression.js";
import NoteSet from "../note_set.js";
import SearchContext from "../search_context.js";
/**
* Note is hidden when all its note paths start in hidden subtree (i.e., the note is not cloned into visible tree)

8
src/services/search/expressions/label_comparison.ts
View File

@@ -1,9 +1,9 @@
"use strict";
import Expression = require('./expression');
import NoteSet = require('../note_set');
import becca = require('../../../becca/becca');
import SearchContext = require('../search_context');
import Expression from "./expression.js";
import NoteSet from "../note_set.js";
import becca from "../../../becca/becca.js";
import SearchContext from "../search_context.js";
type Comparator = (value: string) => boolean;

6
src/services/search/expressions/not.ts
View File

@@ -1,8 +1,8 @@
"use strict";
import NoteSet = require('../note_set');
import SearchContext = require('../search_context');
import Expression = require('./expression');
import NoteSet from "../note_set.js";
import SearchContext from "../search_context.js";
import Expression from "./expression.js";
class NotExp extends Expression {
private subExpression: Expression;

16
src/services/search/expressions/note_content_fulltext.ts
View File

@@ -1,16 +1,16 @@
"use strict";
import { NoteRow } from "../../../becca/entities/rows";
import SearchContext = require('../search_context');
import SearchContext from "../search_context.js";
import Expression = require('./expression');
import NoteSet = require('../note_set');
import log = require('../../log');
import becca = require('../../../becca/becca');
import protectedSessionService = require('../../protected_session');
import Expression from "./expression.js";
import NoteSet from "../note_set.js";
import log from "../../log.js";
import becca from "../../../becca/becca.js";
import protectedSessionService from "../../protected_session.js";
import striptags = require('striptags');
import utils = require('../../utils');
import sql = require('../../sql');
import utils from "../../utils.js";
import sql from "../../sql.js";
const ALLOWED_OPERATORS = ['=', '!=', '*=*', '*=', '=*', '%='];

12
src/services/search/expressions/note_flat_text.ts
View File

@@ -1,12 +1,12 @@
"use strict";
import BNote = require('../../../becca/entities/bnote');
import SearchContext = require('../search_context');
import BNote from "../../../becca/entities/bnote.js";
import SearchContext from "../search_context.js";
import Expression = require('./expression');
import NoteSet = require('../note_set');
import becca = require('../../../becca/becca');
import utils = require('../../utils');
import Expression from "./expression.js";
import NoteSet from "../note_set.js";
import becca from "../../../becca/becca.js";
import utils from "../../utils.js";
class NoteFlatTextExp extends Expression {
private tokens: string[];

8
src/services/search/expressions/or.ts
View File

@@ -1,9 +1,9 @@
"use strict";
import Expression = require('./expression');
import NoteSet = require('../note_set');
import TrueExp = require('./true');
import SearchContext = require('../search_context');
import Expression from "./expression.js";
import NoteSet from "../note_set.js";
import TrueExp from "./true.js";
import SearchContext from "../search_context.js";
class OrExp extends Expression {
private subExpressions: Expression[];

8
src/services/search/expressions/order_by_and_limit.ts
View File

@@ -1,9 +1,9 @@
"use strict";
import BNote = require('../../../becca/entities/bnote');
import NoteSet = require('../note_set');
import SearchContext = require('../search_context');
import Expression = require('./expression');
import BNote from "../../../becca/entities/bnote.js";
import NoteSet from "../note_set.js";
import SearchContext from "../search_context.js";
import Expression from "./expression.js";
interface ValueExtractor {
extract: (note: BNote) => number | string | null;

6
src/services/search/expressions/parent_of.ts
View File

@@ -1,8 +1,8 @@
"use strict";
import Expression = require('./expression');
import NoteSet = require('../note_set');
import SearchContext = require('../search_context');
import Expression from "./expression.js";
import NoteSet from "../note_set.js";
import SearchContext from "../search_context.js";
class ParentOfExp extends Expression {
private subExpression: Expression;

6
src/services/search/expressions/property_comparison.ts
View File

@@ -1,8 +1,8 @@
"use strict";
import Expression = require('./expression');
import NoteSet = require('../note_set');
import buildComparator = require('../services/build_comparator');
import Expression from "./expression.js";
import NoteSet from "../note_set.js";
import buildComparator from "../services/build_comparator.js";
/**
* Search string is lower cased for case-insensitive comparison. But when retrieving properties,

8
src/services/search/expressions/relation_where.ts
View File

@@ -1,9 +1,9 @@
"use strict";
import Expression = require('./expression');
import NoteSet = require('../note_set');
import becca = require('../../../becca/becca');
import SearchContext = require('../search_context');
import Expression from "./expression.js";
import NoteSet from "../note_set.js";
import becca from "../../../becca/becca.js";
import SearchContext from "../search_context.js";
class RelationWhereExp extends Expression {
private relationName: string;

6
src/services/search/expressions/true.ts
View File

@@ -1,9 +1,9 @@
"use strict";
import NoteSet = require('../note_set');
import SearchContext = require('../search_context');
import NoteSet from "../note_set.js";
import SearchContext from "../search_context.js";
import Expression = require('./expression');
import Expression from "./expression.js";
class TrueExp extends Expression {
execute(inputNoteSet: NoteSet, executionContext: {}, searchContext: SearchContext): NoteSet {

2
src/services/search/note_set.ts
View File

@@ -1,6 +1,6 @@
"use strict";
import BNote = require('../../becca/entities/bnote');
import BNote from "../../becca/entities/bnote.js";
class NoteSet {

2
src/services/search/search_context.ts
View File

@@ -1,6 +1,6 @@
"use strict";
import hoistedNoteService = require('../hoisted_note');
import hoistedNoteService from "../hoisted_note.js";
import { SearchParams } from './services/types';
class SearchContext {

4
src/services/search/search_result.ts
View File

@@ -1,7 +1,7 @@
"use strict";
import beccaService = require('../../becca/becca_service');
import becca = require('../../becca/becca');
import beccaService from "../../becca/becca_service.js";
import becca from "../../becca/becca.js";
class SearchResult {
notePathArray: string[];

42
src/services/search/services/parse.ts
View File

@@ -1,28 +1,28 @@
"use strict";
import dayjs = require('dayjs');
import AndExp = require('../expressions/and');
import OrExp = require('../expressions/or');
import NotExp = require('../expressions/not');
import ChildOfExp = require('../expressions/child_of');
import DescendantOfExp = require('../expressions/descendant_of');
import ParentOfExp = require('../expressions/parent_of');
import RelationWhereExp = require('../expressions/relation_where');
import PropertyComparisonExp = require('../expressions/property_comparison');
import AttributeExistsExp = require('../expressions/attribute_exists');
import LabelComparisonExp = require('../expressions/label_comparison');
import NoteFlatTextExp = require('../expressions/note_flat_text');
import NoteContentFulltextExp = require('../expressions/note_content_fulltext');
import OrderByAndLimitExp = require('../expressions/order_by_and_limit');
import AncestorExp = require('../expressions/ancestor');
import buildComparator = require('./build_comparator');
import ValueExtractor = require('../value_extractor');
import utils = require('../../utils');
import TrueExp = require('../expressions/true');
import IsHiddenExp = require('../expressions/is_hidden');
import SearchContext = require('../search_context');
import AndExp from "../expressions/and.js";
import OrExp from "../expressions/or.js";
import NotExp from "../expressions/not.js";
import ChildOfExp from "../expressions/child_of.js";
import DescendantOfExp from "../expressions/descendant_of.js";
import ParentOfExp from "../expressions/parent_of.js";
import RelationWhereExp from "../expressions/relation_where.js";
import PropertyComparisonExp from "../expressions/property_comparison.js";
import AttributeExistsExp from "../expressions/attribute_exists.js";
import LabelComparisonExp from "../expressions/label_comparison.js";
import NoteFlatTextExp from "../expressions/note_flat_text.js";
import NoteContentFulltextExp from "../expressions/note_content_fulltext.js";
import OrderByAndLimitExp from "../expressions/order_by_and_limit.js";
import AncestorExp from "../expressions/ancestor.js";
import buildComparator from "./build_comparator.js";
import ValueExtractor from "../value_extractor.js";
import utils from "../../utils.js";
import TrueExp from "../expressions/true.js";
import IsHiddenExp from "../expressions/is_hidden.js";
import SearchContext from "../search_context.js";
import { TokenData } from "./types";
import Expression = require('../expressions/expression');
import Expression from "../expressions/expression.js";
function getFulltext(_tokens: TokenData[], searchContext: SearchContext) {
const tokens: string[] = _tokens.map(t => utils.removeDiacritic(t.token));

28
src/services/search/services/search.ts
View File

@@ -1,21 +1,21 @@
"use strict";
import normalizeString = require('normalize-strings');
import lex = require('./lex');
import handleParens = require('./handle_parens');
import parse = require('./parse');
import SearchResult = require('../search_result');
import SearchContext = require('../search_context');
import becca = require('../../../becca/becca');
import beccaService = require('../../../becca/becca_service');
import utils = require('../../utils');
import log = require('../../log');
import hoistedNoteService = require('../../hoisted_note');
import BNote = require('../../../becca/entities/bnote');
import BAttribute = require('../../../becca/entities/battribute');
import lex from "./lex.js";
import handleParens from "./handle_parens.js";
import parse from "./parse.js";
import SearchResult from "../search_result.js";
import SearchContext from "../search_context.js";
import becca from "../../../becca/becca.js";
import beccaService from "../../../becca/becca_service.js";
import utils from "../../utils.js";
import log from "../../log.js";
import hoistedNoteService from "../../hoisted_note.js";
import BNote from "../../../becca/entities/bnote.js";
import BAttribute from "../../../becca/entities/battribute.js";
import { SearchParams, TokenData } from "./types";
import Expression = require('../expressions/expression');
import sql = require('../../sql');
import Expression from "../expressions/expression.js";
import sql from "../../sql.js";
function searchFromNote(note: BNote) {
let searchResultNoteIds;

2
src/services/search/value_extractor.ts
View File

@@ -1,6 +1,6 @@
"use strict";
import BNote = require('../../becca/entities/bnote');
import BNote from "../../becca/entities/bnote.js";
/**
* Search string is lower cased for case-insensitive comparison. But when retrieving properties,

4
src/services/session_secret.ts
View File

@@ -2,8 +2,8 @@
import fs = require('fs');
import crypto = require('crypto');
import dataDir = require('./data_dir');
import log = require('./log');
import dataDir from "./data_dir.js";
import log from "./log.js";
const sessionSecretPath = `${dataDir.TRILIUM_DATA_DIR}/session_secret.txt`;

18
src/services/setup.ts
View File

@@ -1,12 +1,12 @@
import syncService = require('./sync');
import log = require('./log');
import sqlInit = require('./sql_init');
import optionService = require('./options');
import syncOptions = require('./sync_options');
import request = require('./request');
import appInfo = require('./app_info');
import utils = require('./utils');
import becca = require('../becca/becca');
import syncService from "./sync.js";
import log from "./log.js";
import sqlInit from "./sql_init.js";
import optionService from "./options.js";
import syncOptions from "./sync_options.js";
import request from "./request.js";
import appInfo from "./app_info.js";
import utils from "./utils.js";
import becca from "../becca/becca.js";
import { SetupStatusResponse, SetupSyncSeedResponse } from './api-interface';
async function hasSyncServerSchemaAndSeed() {

20
src/services/special_notes.ts
View File

@@ -1,13 +1,13 @@
import attributeService = require('./attributes');
import dateNoteService = require('./date_notes');
import becca = require('../becca/becca');
import noteService = require('./notes');
import dateUtils = require('./date_utils');
import log = require('./log');
import hoistedNoteService = require('./hoisted_note');
import searchService = require('./search/services/search');
import SearchContext = require('./search/search_context');
import hiddenSubtree = require('./hidden_subtree');
import attributeService from "./attributes.js";
import dateNoteService from "./date_notes.js";
import becca from "../becca/becca.js";
import noteService from "./notes.js";
import dateUtils from "./date_utils.js";
import log from "./log.js";
import hoistedNoteService from "./hoisted_note.js";
import searchService from "./search/services/search.js";
import SearchContext from "./search/search_context.js";
import hiddenSubtree from "./hidden_subtree.js";
const { LBTPL_NOTE_LAUNCHER, LBTPL_CUSTOM_WIDGET, LBTPL_SPACER, LBTPL_SCRIPT } = hiddenSubtree;
function getInboxNote(date: string) {

6
src/services/sql.ts
View File

@@ -4,10 +4,10 @@
* @module sql
*/
import log = require('./log');
import log from "./log.js";
import type { Statement, Database as DatabaseType, RunResult } from "better-sqlite3";
import dataDir = require('./data_dir');
import cls = require('./cls');
import dataDir from "./data_dir.js";
import cls from "./cls.js";
import fs = require('fs-extra');
import Database = require('better-sqlite3');

22
src/services/sql_init.ts
View File

@@ -1,15 +1,15 @@
import log = require('./log');
import log from "./log.js";
import fs = require('fs');
import resourceDir = require('./resource_dir');
import sql = require('./sql');
import utils = require('./utils');
import optionService = require('./options');
import port = require('./port');
import BOption = require('../becca/entities/boption');
import TaskContext = require('./task_context');
import migrationService = require('./migration');
import cls = require('./cls');
import config = require('./config');
import resourceDir from "./resource_dir.js";
import sql from "./sql.js";
import utils from "./utils.js";
import optionService from "./options.js";
import port from "./port.js";
import BOption from "../becca/entities/boption.js";
import TaskContext from "./task_context.js";
import migrationService from "./migration.js";
import cls from "./cls.js";
import config from "./config.js";
import { OptionRow } from '../becca/entities/rows';
const dbReady = utils.deferred<void>();

34
src/services/sync.ts
View File

@@ -1,22 +1,22 @@
"use strict";
import log = require('./log');
import sql = require('./sql');
import optionService = require('./options');
import utils = require('./utils');
import instanceId = require('./instance_id');
import dateUtils = require('./date_utils');
import syncUpdateService = require('./sync_update');
import contentHashService = require('./content_hash');
import appInfo = require('./app_info');
import syncOptions = require('./sync_options');
import syncMutexService = require('./sync_mutex');
import cls = require('./cls');
import request = require('./request');
import ws = require('./ws');
import entityChangesService = require('./entity_changes');
import entityConstructor = require('../becca/entity_constructor');
import becca = require('../becca/becca');
import log from "./log.js";
import sql from "./sql.js";
import optionService from "./options.js";
import utils from "./utils.js";
import instanceId from "./instance_id.js";
import dateUtils from "./date_utils.js";
import syncUpdateService from "./sync_update.js";
import contentHashService from "./content_hash.js";
import appInfo from "./app_info.js";
import syncOptions from "./sync_options.js";
import syncMutexService from "./sync_mutex.js";
import cls from "./cls.js";
import request from "./request.js";
import ws from "./ws.js";
import entityChangesService from "./entity_changes.js";
import entityConstructor from "../becca/entity_constructor.js";
import becca from "../becca/becca.js";
import { EntityChange, EntityChangeRecord, EntityRow } from './entity_changes_interface';
import { CookieJar, ExecOpts } from './request_interface';

4
src/services/sync_options.ts
View File

@@ -1,7 +1,7 @@
"use strict";
import optionService = require('./options');
import config = require('./config');
import optionService from "./options.js";
import config from "./config.js";
/*
* Primary configuration for sync is in the options (document), but we allow to override

12
src/services/sync_update.ts
View File

@@ -1,9 +1,9 @@
import sql = require('./sql');
import log = require('./log');
import entityChangesService = require('./entity_changes');
import eventService = require('./events');
import entityConstructor = require('../becca/entity_constructor');
import ws = require('./ws');
import sql from "./sql.js";
import log from "./log.js";
import entityChangesService from "./entity_changes.js";
import eventService from "./events.js";
import entityConstructor from "../becca/entity_constructor.js";
import ws from "./ws.js";
import { EntityChange, EntityChangeRecord, EntityRow } from './entity_changes_interface';
interface UpdateContext {

2
src/services/task_context.ts
View File

@@ -1,7 +1,7 @@
"use strict";
import { TaskData } from './task_context_interface';
import ws = require('./ws');
import ws from "./ws.js";
// taskId => TaskContext
const taskContexts: Record<string, TaskContext> = {};

4
src/services/tray.ts
View File

@@ -1,7 +1,7 @@
import { Menu, Tray } from 'electron';
import path = require('path');
import windowService = require('./window');
import optionService = require('./options');
import windowService from "./window.js";
import optionService from "./options.js";
let tray: Tray;
// `mainWindow.isVisible` doesn't work with `mainWindow.show` and `mainWindow.hide` - it returns `false` when the window

12
src/services/tree.ts
View File

@@ -1,11 +1,11 @@
"use strict";
import sql = require('./sql');
import log = require('./log');
import BBranch = require('../becca/entities/bbranch');
import entityChangesService = require('./entity_changes');
import becca = require('../becca/becca');
import BNote = require('../becca/entities/bnote');
import sql from "./sql.js";
import log from "./log.js";
import BBranch from "../becca/entities/bbranch.js";
import entityChangesService from "./entity_changes.js";
import becca from "../becca/becca.js";
import BNote from "../becca/entities/bnote.js";
function validateParentChild(parentNoteId: string, childNoteId: string, branchId: string | null = null) {
if (['root', '_hidden', '_share', '_lbRoot', '_lbAvailableLaunchers', '_lbVisibleLaunchers'].includes(childNoteId)) {

14
src/services/window.ts
View File

@@ -1,12 +1,12 @@
import path = require('path');
import url = require('url');
import port = require('./port');
import optionService = require('./options');
import env = require('./env');
import log = require('./log');
import sqlInit = require('./sql_init');
import cls = require('./cls');
import keyboardActionsService = require('./keyboard_actions');
import port from "./port.js";
import optionService from "./options.js";
import env from "./env.js";
import log from "./log.js";
import sqlInit from "./sql_init.js";
import cls from "./cls.js";
import keyboardActionsService from "./keyboard_actions.js";
import remoteMain = require('@electron/remote/main')
import { App, BrowserWindow, WebContents, ipcMain } from 'electron';

20
src/services/ws.ts
View File

@@ -1,15 +1,15 @@
import WebSocket = require('ws');
import utils = require('./utils');
import log = require('./log');
import sql = require('./sql');
import cls = require('./cls');
import config = require('./config');
import syncMutexService = require('./sync_mutex');
import protectedSessionService = require('./protected_session');
import becca = require('../becca/becca');
import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity');
import utils from "./utils.js";
import log from "./log.js";
import sql from "./sql.js";
import cls from "./cls.js";
import config from "./config.js";
import syncMutexService from "./sync_mutex.js";
import protectedSessionService from "./protected_session.js";
import becca from "../becca/becca.js";
import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
import env = require('./env');
import env from "./env.js";
import { IncomingMessage, Server } from 'http';
import { EntityChange } from './entity_changes_interface';