Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 10:02:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(ts): enable verbatim module syntax

Browse Source
This commit is contained in:
Elian Doran 2025-01-09 18:36:24 +02:00
parent 4cbb529fd4
commit 324696bc54
No known key found for this signature in database
161 changed files with 244 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/search/becca_mocking.ts
View File

@ -4,7 +4,7 @@ import BAttribute from "../../src/becca/entities/battribute.js";
import becca from "../../src/becca/becca.js";
import randtoken from "rand-token";
import SearchResult from "../../src/services/search/search_result.js";
import { NoteType } from "../../src/becca/entities/rows.js";
import type { NoteType } from "../../src/becca/entities/rows.js";
randtoken.generator({ source: "crypto" });
function findNoteByTitle(searchResults: Array<SearchResult>, title: string): BNote | undefined {

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

@ -1,5 +1,5 @@
import handleParens from "../../src/services/search/services/handle_parens.js";
import { TokenStructure } from "../../src/services/search/services/types.js";
import type { TokenStructure } from "../../src/services/search/services/types.js";
describe("Parens handler", () => {
it("handles parens", () => {

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

@ -8,7 +8,7 @@ import BAttribute from "./entities/battribute.js";
import BBranch from "./entities/bbranch.js";
import BRevision from "./entities/brevision.js";
import BAttachment from "./entities/battachment.js";
import { AttachmentRow, BlobRow, RevisionRow } from "./entities/rows.js";
import type { AttachmentRow, BlobRow, RevisionRow } from "./entities/rows.js";
import BBlob from "./entities/bblob.js";
import BRecentNote from "./entities/brecent_note.js";
import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";

2
src/becca/becca_loader.ts
View File

@ -11,7 +11,7 @@ import BOption from "./entities/boption.js";
import BEtapiToken from "./entities/betapi_token.js";
import cls from "../services/cls.js";
import entityConstructor from "../becca/entity_constructor.js";
import { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from "./entities/rows.js";
import type { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from "./entities/rows.js";
import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
import ws from "../services/ws.js";

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

@ -9,7 +9,7 @@ import cls from "../../services/cls.js";
import log from "../../services/log.js";
import protectedSessionService from "../../services/protected_session.js";
import blobService from "../../services/blob.js";
import Becca, { ConstructorData } from "../becca-interface.js";
import Becca, { type ConstructorData } from "../becca-interface.js";
import becca from "../becca.js";
interface ContentOpts {

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

@ -6,7 +6,7 @@ import AbstractBeccaEntity from "./abstract_becca_entity.js";
import sql from "../../services/sql.js";
import protectedSessionService from "../../services/protected_session.js";
import log from "../../services/log.js";
import { AttachmentRow } from "./rows.js";
import type { AttachmentRow } from "./rows.js";
import BNote from "./bnote.js";
import BBranch from "./bbranch.js";
import noteService from "../../services/notes.js";

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

@ -5,7 +5,7 @@ import AbstractBeccaEntity from "./abstract_becca_entity.js";
import dateUtils from "../../services/date_utils.js";
import promotedAttributeDefinitionParser from "../../services/promoted_attribute_definition_parser.js";
import sanitizeAttributeName from "../../services/sanitize_attribute_name.js";
import { AttributeRow, AttributeType } from "./rows.js";
import type { AttributeRow, AttributeType } from "./rows.js";
interface SavingOpts {
skipValidation?: boolean;

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

@ -1,5 +1,5 @@
import AbstractBeccaEntity from "./abstract_becca_entity.js";
import { BlobRow } from "./rows.js";
import type { BlobRow } from "./rows.js";
// TODO: Why this does not extend the abstract becca?
class BBlob extends AbstractBeccaEntity<BBlob> {

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

@ -7,7 +7,7 @@ import utils from "../../services/utils.js";
import TaskContext from "../../services/task_context.js";
import cls from "../../services/cls.js";
import log from "../../services/log.js";
import { BranchRow } from "./rows.js";
import type { BranchRow } from "./rows.js";
import handlers from "../../services/handlers.js";
/**

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

@ -1,6 +1,6 @@
"use strict";
import { EtapiTokenRow } from "./rows.js";
import type { EtapiTokenRow } from "./rows.js";
import dateUtils from "../../services/date_utils.js";
import AbstractBeccaEntity from "./abstract_becca_entity.js";

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

@ -14,12 +14,12 @@ import TaskContext from "../../services/task_context.js";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc.js";
import eventService from "../../services/events.js";
import { AttachmentRow, AttributeType, NoteRow, NoteType, RevisionRow } from "./rows.js";
import type { AttachmentRow, AttributeType, NoteRow, NoteType, RevisionRow } from "./rows.js";
import BBranch from "./bbranch.js";
import BAttribute from "./battribute.js";
import { NotePojo } from "../becca-interface.js";
import type { NotePojo } from "../becca-interface.js";
import searchService from "../../services/search/services/search.js";
import cloningService, { CloneResponse } from "../../services/cloning.js";
import cloningService, { type CloneResponse } from "../../services/cloning.js";
import noteService from "../../services/notes.js";
import handlers from "../../services/handlers.js";
dayjs.extend(utc);

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

@ -2,7 +2,7 @@
import dateUtils from "../../services/date_utils.js";
import AbstractBeccaEntity from "./abstract_becca_entity.js";
import { OptionRow } from "./rows.js";
import type { OptionRow } from "./rows.js";
/**
* Option represents a name-value pair, either directly configurable by the user or some system property.

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

@ -1,6 +1,6 @@
"use strict";
import { RecentNoteRow } from "./rows.js";
import type { RecentNoteRow } from "./rows.js";
import dateUtils from "../../services/date_utils.js";
import AbstractBeccaEntity from "./abstract_becca_entity.js";

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

@ -7,7 +7,7 @@ import becca from "../becca.js";
import AbstractBeccaEntity from "./abstract_becca_entity.js";
import sql from "../../services/sql.js";
import BAttachment from "./battachment.js";
import { AttachmentRow, RevisionRow } from "./rows.js";
import type { AttachmentRow, RevisionRow } from "./rows.js";
import eraseService from "../../services/erase.js";
interface ContentOpts {

2
src/becca/entity_constructor.ts
View File

@ -1,4 +1,4 @@
import { ConstructorData } from "./becca-interface.js";
import type { ConstructorData } from "./becca-interface.js";
import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
import BAttachment from "./entities/battachment.js";
import BAttribute from "./entities/battribute.js";

4
src/etapi/attachments.ts
View File

@ -4,8 +4,8 @@ import mappers from "./mappers.js";
import v from "./validators.js";
import utils from "../services/utils.js";
import { Router } from "express";
import { AttachmentRow } from "../becca/entities/rows.js";
import { ValidatorMap } from "./etapi-interface.js";
import type { AttachmentRow } from "../becca/entities/rows.js";
import type { ValidatorMap } from "./etapi-interface.js";
function register(router: Router) {
const ALLOWED_PROPERTIES_FOR_CREATE_ATTACHMENT: ValidatorMap = {

4
src/etapi/attributes.ts
View File

@ -4,8 +4,8 @@ import mappers from "./mappers.js";
import attributeService from "../services/attributes.js";
import v from "./validators.js";
import { Router } from "express";
import { AttributeRow } from "../becca/entities/rows.js";
import { ValidatorMap } from "./etapi-interface.js";
import type { AttributeRow } from "../becca/entities/rows.js";
import type { ValidatorMap } from "./etapi-interface.js";
function register(router: Router) {
eu.route(router, "get", "/etapi/attributes/:attributeId", (req, res, next) => {

2
src/etapi/auth.ts
View File

@ -2,7 +2,7 @@ import becca from "../becca/becca.js";
import eu from "./etapi_utils.js";
import passwordEncryptionService from "../services/encryption/password_encryption.js";
import etapiTokenService from "../services/etapi_tokens.js";
import { RequestHandler, Router } from "express";
import type { RequestHandler, Router } from "express";
function register(router: Router, loginMiddleware: RequestHandler[]) {
eu.NOT_AUTHENTICATED_ROUTE(router, "post", "/etapi/auth/login", loginMiddleware, (req, res, next) => {

2
src/etapi/branches.ts
View File

@ -6,7 +6,7 @@ import mappers from "./mappers.js";
import BBranch from "../becca/entities/bbranch.js";
import entityChangesService from "../services/entity_changes.js";
import v from "./validators.js";
import { BranchRow } from "../becca/entities/rows.js";
import type { BranchRow } from "../becca/entities/rows.js";
function register(router: Router) {
eu.route(router, "get", "/etapi/branches/:branchId", (req, res, next) => {

6
src/etapi/etapi_utils.ts
View File

@ -4,9 +4,9 @@ import log from "../services/log.js";
import becca from "../becca/becca.js";
import etapiTokenService from "../services/etapi_tokens.js";
import config from "../services/config.js";
import { NextFunction, Request, RequestHandler, Response, Router } from "express";
import { ValidatorMap } from "./etapi-interface.js";
import { ApiRequestHandler } from "../routes/routes.js";
import type { NextFunction, Request, RequestHandler, Response, Router } from "express";
import type { ValidatorMap } from "./etapi-interface.js";
import type { ApiRequestHandler } from "../routes/routes.js";
const GENERIC_CODE = "GENERIC";
type HttpMethod = "all" | "get" | "post" | "put" | "delete" | "patch" | "options" | "head";

10
src/etapi/notes.ts
View File

@ -9,11 +9,11 @@ import searchService from "../services/search/services/search.js";
import SearchContext from "../services/search/search_context.js";
import zipExportService from "../services/export/zip.js";
import zipImportService from "../services/import/zip.js";
import { Request, Router } from "express";
import { ParsedQs } from "qs";
import { NoteParams } from "../services/note-interface.js";
import { SearchParams } from "../services/search/services/types.js";
import { ValidatorMap } from "./etapi-interface.js";
import { type Request, Router } from "express";
import type { ParsedQs } from "qs";
import type { NoteParams } from "../services/note-interface.js";
import type { SearchParams } from "../services/search/services/types.js";
import type { ValidatorMap } from "./etapi-interface.js";
function register(router: Router) {
eu.route(router, "get", "/etapi/notes", (req, res, next) => {

18
src/public/app/components/app_context.ts
View File

@ -1,28 +1,28 @@
import froca from "../services/froca.js";
import bundleService from "../services/bundle.js";
import RootCommandExecutor from "./root_command_executor.js";
import Entrypoints, { SqlExecuteResults } from "./entrypoints.js";
import Entrypoints, { type SqlExecuteResults } from "./entrypoints.js";
import options from "../services/options.js";
import utils from "../services/utils.js";
import zoomComponent from "./zoom.js";
import TabManager from "./tab_manager.js";
import Component from "./component.js";
import keyboardActionsService from "../services/keyboard_actions.js";
import linkService, { ViewScope } from "../services/link.js";
import MobileScreenSwitcherExecutor, { Screen } from "./mobile_screen_switcher.js";
import linkService, { type ViewScope } from "../services/link.js";
import MobileScreenSwitcherExecutor, { type Screen } from "./mobile_screen_switcher.js";
import MainTreeExecutors from "./main_tree_executors.js";
import toast from "../services/toast.js";
import ShortcutComponent from "./shortcut_component.js";
import { t, initLocale } from "../services/i18n.js";
import NoteDetailWidget from "../widgets/note_detail.js";
import { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
import { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
import { ConfirmWithMessageOptions, ConfirmWithTitleOptions } from "../widgets/dialogs/confirm.js";
import { Node } from "../services/tree.js";
import type { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
import type { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
import type { ConfirmWithMessageOptions, ConfirmWithTitleOptions } from "../widgets/dialogs/confirm.js";
import type { Node } from "../services/tree.js";
import LoadResults from "../services/load_results.js";
import { Attribute } from "../services/attribute_parser.js";
import type { Attribute } from "../services/attribute_parser.js";
import NoteTreeWidget from "../widgets/note_tree.js";
import NoteContext, { GetTextEditorCallback } from "./note_context.js";
import NoteContext, { type GetTextEditorCallback } from "./note_context.js";
interface Layout {
getRootWidget: (appContext: AppContext) => RootWidget;

2
src/public/app/components/component.ts
View File

@ -1,5 +1,5 @@
import utils from "../services/utils.js";
import { CommandMappings, CommandNames } from "./app_context.js";
import type { CommandMappings, CommandNames } from "./app_context.js";
/**
* Abstract class for all components in the Trilium's frontend.

2
src/public/app/components/entrypoints.ts
View File

@ -2,7 +2,7 @@ import utils from "../services/utils.js";
import dateNoteService from "../services/date_notes.js";
import protectedSessionHolder from "../services/protected_session_holder.js";
import server from "../services/server.js";
import appContext, { NoteCommandData } from "./app_context.js";
import appContext, { type NoteCommandData } from "./app_context.js";
import Component from "./component.js";
import toastService from "../services/toast.js";
import ws from "../services/ws.js";

4
src/public/app/components/events.ts
View File

@ -1,5 +1,5 @@
import { MenuCommandItem } from "../menus/context_menu.js";
import { CommandNames } from "./app_context.js";
import type { MenuCommandItem } from "../menus/context_menu.js";
import type { CommandNames } from "./app_context.js";
type ListenerReturnType = void | Promise<void>;

4
src/public/app/components/note_context.ts
View File

@ -1,13 +1,13 @@
import protectedSessionHolder from "../services/protected_session_holder.js";
import server from "../services/server.js";
import utils from "../services/utils.js";
import appContext, { EventData, EventListener } from "./app_context.js";
import appContext, { type EventData, type EventListener } from "./app_context.js";
import treeService from "../services/tree.js";
import Component from "./component.js";
import froca from "../services/froca.js";
import hoistedNoteService from "../services/hoisted_note.js";
import options from "../services/options.js";
import { ViewScope } from "../services/link.js";
import type { ViewScope } from "../services/link.js";
import FNote from "../entities/fnote.js";
interface SetNoteOpts {

2
src/public/app/components/root_command_executor.ts
View File

@ -1,5 +1,5 @@
import Component from "./component.js";
import appContext, { CommandData, CommandListenerData } from "./app_context.js";
import appContext, { type CommandData, type CommandListenerData } from "./app_context.js";
import dateNoteService from "../services/date_notes.js";
import treeService from "../services/tree.js";
import openService from "../services/open.js";

4
src/public/app/components/shortcut_component.ts
View File

@ -1,9 +1,9 @@
import appContext, { EventData, EventListener } from "./app_context.js";
import appContext, { type EventData, type EventListener } from "./app_context.js";
import shortcutService from "../services/shortcuts.js";
import server from "../services/server.js";
import Component from "./component.js";
import froca from "../services/froca.js";
import { AttributeRow } from "../services/load_results.js";
import type { AttributeRow } from "../services/load_results.js";
export default class ShortcutComponent extends Component implements EventListener<"entitiesReloaded"> {
constructor() {

2
src/public/app/entities/fattachment.ts
View File

@ -1,4 +1,4 @@
import { Froca } from "../services/froca-interface.js";
import type { Froca } from "../services/froca-interface.js";
export interface FAttachmentRow {
attachmentId: string;

2
src/public/app/entities/fattribute.ts
View File

@ -1,4 +1,4 @@
import { Froca } from "../services/froca-interface.js";
import type { Froca } from "../services/froca-interface.js";
import promotedAttributeDefinitionParser from "../services/promoted_attribute_definition_parser.js";
/**

2
src/public/app/entities/fbranch.ts
View File

@ -1,4 +1,4 @@
import { Froca } from "../services/froca-interface.js";
import type { Froca } from "../services/froca-interface.js";
export interface FBranchRow {
branchId: string;

4
src/public/app/entities/fnote.ts
View File

@ -4,9 +4,9 @@ import ws from "../services/ws.js";
import froca from "../services/froca.js";
import protectedSessionHolder from "../services/protected_session_holder.js";
import cssClassManager from "../services/css_class_manager.js";
import { Froca } from "../services/froca-interface.js";
import type { Froca } from "../services/froca-interface.js";
import FAttachment from "./fattachment.js";
import FAttribute, { AttributeType } from "./fattribute.js";
import FAttribute, { type AttributeType } from "./fattribute.js";
import utils from "../services/utils.js";
const LABEL = "label";

2
src/public/app/menus/context_menu.ts
View File

@ -1,4 +1,4 @@
import { CommandNames } from "../components/app_context.js";
import type { CommandNames } from "../components/app_context.js";
import keyboardActionService from "../services/keyboard_actions.js";
import utils from "../services/utils.js";

4
src/public/app/menus/electron_context_menu.ts
View File

@ -1,10 +1,10 @@
import utils from "../services/utils.js";
import options from "../services/options.js";
import zoomService from "../components/zoom.js";
import contextMenu, { MenuItem } from "./context_menu.js";
import contextMenu, { type MenuItem } from "./context_menu.js";
import { t } from "../services/i18n.js";
import type { BrowserWindow } from "electron";
import { CommandNames } from "../components/app_context.js";
import type { CommandNames } from "../components/app_context.js";
function setupContextMenu() {
const electron = utils.dynamicRequire("electron");

6
src/public/app/menus/launcher_context_menu.ts
View File

@ -1,12 +1,12 @@
import treeService, { Node } from "../services/tree.js";
import treeService, { type Node } from "../services/tree.js";
import froca from "../services/froca.js";
import contextMenu, { MenuCommandItem, MenuItem } from "./context_menu.js";
import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";
import dialogService from "../services/dialog.js";
import server from "../services/server.js";
import { t } from "../services/i18n.js";
import type { SelectMenuItemEventListener } from "../components/events.js";
import NoteTreeWidget from "../widgets/note_tree.js";
import { FilteredCommandNames, ContextMenuCommandData } from "../components/app_context.js";
import type { FilteredCommandNames, ContextMenuCommandData } from "../components/app_context.js";
type LauncherCommandNames = FilteredCommandNames<ContextMenuCommandData>;

2
src/public/app/menus/link_context_menu.ts
View File

@ -1,7 +1,7 @@
import { t } from "../services/i18n.js";
import contextMenu from "./context_menu.js";
import appContext from "../components/app_context.js";
import { ViewScope } from "../services/link.js";
import type { ViewScope } from "../services/link.js";
function openContextMenu(notePath: string, e: PointerEvent, viewScope: ViewScope = {}, hoistedNoteId: string | null = null) {
contextMenu.show({

8
src/public/app/menus/tree_context_menu.ts
View File

@ -1,9 +1,9 @@
import treeService, { Node } from "../services/tree.js";
import treeService, { type Node } from "../services/tree.js";
import froca from "../services/froca.js";
import clipboard from "../services/clipboard.js";
import noteCreateService from "../services/note_create.js";
import contextMenu, { MenuCommandItem, MenuItem } from "./context_menu.js";
import appContext, { ContextMenuCommandData, FilteredCommandNames } from "../components/app_context.js";
import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";
import appContext, { type ContextMenuCommandData, type FilteredCommandNames } from "../components/app_context.js";
import noteTypesService from "../services/note_types.js";
import server from "../services/server.js";
import toastService from "../services/toast.js";
@ -11,7 +11,7 @@ import dialogService from "../services/dialog.js";
import { t } from "../services/i18n.js";
import NoteTreeWidget from "../widgets/note_tree.js";
import FAttachment from "../entities/fattachment.js";
import { SelectMenuItemEventListener } from "../components/events.js";
import type { SelectMenuItemEventListener } from "../components/events.js";
// TODO: Deduplicate once client/server is well split.
interface ConvertToAttachmentResponse {

2
src/public/app/server_types.ts
View File

@ -1,4 +1,4 @@
import { EntityRowNames } from "./services/load_results.js";
import type { EntityRowNames } from "./services/load_results.js";
// TODO: Deduplicate with src/services/entity_changes_interface.ts
export interface EntityChange {

2
src/public/app/services/attribute_autocomplete.ts
View File

@ -1,4 +1,4 @@
import { AttributeType } from "../entities/fattribute.js";
import type { AttributeType } from "../entities/fattribute.js";
import server from "./server.js";
interface InitOptions {

2
src/public/app/services/attribute_parser.ts
View File

@ -1,4 +1,4 @@
import FAttribute, { AttributeType, FAttributeRow } from "../entities/fattribute.js";
import type { AttributeType, FAttributeRow } from "../entities/fattribute.js";
import utils from "./utils.js";
interface Token {

2
src/public/app/services/attributes.ts
View File

@ -1,7 +1,7 @@
import server from "./server.js";
import froca from "./froca.js";
import FNote from "../entities/fnote.js";
import { AttributeRow } from "./load_results.js";
import type { AttributeRow } from "./load_results.js";
async function addLabel(noteId: string, name: string, value: string = "") {
await server.put(`notes/${noteId}/attribute`, {

6
src/public/app/services/branches.ts
View File

@ -1,13 +1,13 @@
import utils from "./utils.js";
import server from "./server.js";
import toastService, { ToastOptions } from "./toast.js";
import toastService, { type ToastOptions } from "./toast.js";
import froca from "./froca.js";
import hoistedNoteService from "./hoisted_note.js";
import ws from "./ws.js";
import appContext from "../components/app_context.js";
import { t } from "./i18n.js";
import { Node } from "./tree.js";
import { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
import type { Node } from "./tree.js";
import type { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
// TODO: Deduplicate type with server
interface Response {

2
src/public/app/services/bundle.ts
View File

@ -4,7 +4,7 @@ import toastService from "./toast.js";
import froca from "./froca.js";
import utils from "./utils.js";
import { t } from "./i18n.js";
import { Entity } from "./frontend_script_api.js";
import type { Entity } from "./frontend_script_api.js";
// TODO: Deduplicate with server.
export interface Bundle {

2
src/public/app/services/date_notes.ts
View File

@ -1,5 +1,5 @@
import dayjs from "dayjs";
import { FNoteRow } from "../entities/fnote.js";
import type { FNoteRow } from "../entities/fnote.js";
import froca from "./froca.js";
import server from "./server.js";
import ws from "./ws.js";

4
src/public/app/services/dialog.ts
View File

@ -1,6 +1,6 @@
import appContext from "../components/app_context.js";
import { ConfirmDialogOptions, ConfirmWithMessageOptions } from "../widgets/dialogs/confirm.js";
import { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
import type { ConfirmDialogOptions, ConfirmWithMessageOptions } from "../widgets/dialogs/confirm.js";
import type { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
async function info(message: string) {
return new Promise((res) => appContext.triggerCommand("showInfoDialog", { message, callback: res }));

12
src/public/app/services/froca.ts
View File

@ -1,11 +1,11 @@
import FBranch, { FBranchRow } from "../entities/fbranch.js";
import FNote, { FNoteRow } from "../entities/fnote.js";
import FAttribute, { FAttributeRow } from "../entities/fattribute.js";
import FBranch, { type FBranchRow } from "../entities/fbranch.js";
import FNote, { type FNoteRow } from "../entities/fnote.js";
import FAttribute, { type FAttributeRow } from "../entities/fattribute.js";
import server from "./server.js";
import appContext from "../components/app_context.js";
import FBlob, { FBlobRow } from "../entities/fblob.js";
import FAttachment, { FAttachmentRow } from "../entities/fattachment.js";
import { Froca } from "./froca-interface.js";
import FBlob, { type FBlobRow } from "../entities/fblob.js";
import FAttachment, { type FAttachmentRow } from "../entities/fattachment.js";
import type { Froca } from "./froca-interface.js";
interface SubtreeResponse {
notes: FNoteRow[];

8
src/public/app/services/froca_updater.ts
View File

@ -3,10 +3,10 @@ import froca from "./froca.js";
import utils from "./utils.js";
import options from "./options.js";
import noteAttributeCache from "./note_attribute_cache.js";
import FBranch, { FBranchRow } from "../entities/fbranch.js";
import FAttribute, { FAttributeRow } from "../entities/fattribute.js";
import FAttachment, { FAttachmentRow } from "../entities/fattachment.js";
import FNote, { FNoteRow } from "../entities/fnote.js";
import FBranch, { type FBranchRow } from "../entities/fbranch.js";
import FAttribute, { type FAttributeRow } from "../entities/fattribute.js";
import FAttachment, { type FAttachmentRow } from "../entities/fattachment.js";
import FNote, { type FNoteRow } from "../entities/fnote.js";
import type { EntityChange } from "../server_types.js";
async function processEntityChanges(entityChanges: EntityChange[]) {

2
src/public/app/services/hoisted_note.ts
View File

@ -1,5 +1,5 @@
import appContext from "../components/app_context.js";
import treeService, { Node } from "./tree.js";
import treeService, { type Node } from "./tree.js";
import dialogService from "./dialog.js";
import froca from "./froca.js";
import NoteContext from "../components/note_context.js";

2
src/public/app/services/import.ts
View File

@ -1,4 +1,4 @@
import toastService, { ToastOptions } from "./toast.js";
import toastService, { type ToastOptions } from "./toast.js";
import server from "./server.js";
import ws from "./ws.js";
import utils from "./utils.js";

2
src/public/app/services/keyboard_actions.ts
View File

@ -1,5 +1,5 @@
import server from "./server.js";
import appContext, { CommandNames } from "../components/app_context.js";
import appContext, { type CommandNames } from "../components/app_context.js";
import shortcutService from "./shortcuts.js";
import Component from "../components/component.js";

2
src/public/app/services/link.ts
View File

@ -1,6 +1,6 @@
import treeService from "./tree.js";
import linkContextMenuService from "../menus/link_context_menu.js";
import appContext, { NoteCommandData } from "../components/app_context.js";
import appContext, { type NoteCommandData } from "../components/app_context.js";
import froca from "./froca.js";
import utils from "./utils.js";

4
src/public/app/services/load_results.ts
View File

@ -1,5 +1,5 @@
import { AttributeType } from "../entities/fattribute.js";
import { EntityChange } from "../server_types.js";
import type { AttributeType } from "../entities/fattribute.js";
import type { EntityChange } from "../server_types.js";
// TODO: Deduplicate with server.

2
src/public/app/services/note_create.ts
View File

@ -8,7 +8,7 @@ import toastService from "./toast.js";
import { t } from "./i18n.js";
import FNote from "../entities/fnote.js";
import FBranch from "../entities/fbranch.js";
import { ChooseNoteTypeResponse } from "../widgets/dialogs/note_type_chooser.js";
import type { ChooseNoteTypeResponse } from "../widgets/dialogs/note_type_chooser.js";
interface CreateNoteOpts {
isProtected?: boolean;

4
src/public/app/services/note_types.ts
View File

@ -1,8 +1,8 @@
import server from "./server.js";
import froca from "./froca.js";
import { t } from "./i18n.js";
import { MenuItem } from "../menus/context_menu.js";
import { ContextMenuCommandData, FilteredCommandNames } from "../components/app_context.js";
import type { MenuItem } from "../menus/context_menu.js";
import type { ContextMenuCommandData, FilteredCommandNames } from "../components/app_context.js";
type NoteTypeCommandNames = FilteredCommandNames<ContextMenuCommandData>;

2
src/public/app/services/render.ts
View File

@ -1,5 +1,5 @@
import server from "./server.js";
import bundleService, { Bundle } from "./bundle.js";
import bundleService, { type Bundle } from "./bundle.js";
import FNote from "../entities/fnote.js";
async function render(note: FNote, $el: JQuery<HTMLElement>) {

2
src/public/app/services/script_context.ts
View File

@ -1,4 +1,4 @@
import FrontendScriptApi, { Entity } from "./frontend_script_api.js";
import FrontendScriptApi, { type Entity } from "./frontend_script_api.js";
import utils from "./utils.js";
import froca from "./froca.js";

2
src/public/app/services/ws.ts
View File

@ -5,7 +5,7 @@ import options from "./options.js";
import frocaUpdater from "./froca_updater.js";
import appContext from "../components/app_context.js";
import { t } from "./i18n.js";
import { EntityChange } from "../server_types.js";
import type { EntityChange } from "../server_types.js";
type MessageHandler = (message: any) => void;
const messageHandlers: MessageHandler[] = [];

4
src/public/app/widgets/attribute_widgets/attribute_detail.ts
View File

@ -10,9 +10,7 @@ import SpacedUpdate from "../../services/spaced_update.js";
import utils from "../../services/utils.js";
import shortcutService from "../../services/shortcuts.js";
import appContext from "../../components/app_context.js";
import FAttribute from "../../entities/fattribute.js";
import FNote, { FNoteRow } from "../../entities/fnote.js";
import { Attribute } from "../../services/attribute_parser.js";
import type { Attribute } from "../../services/attribute_parser.js";
const TPL = `
<div class="attr-detail">

6
src/public/app/widgets/attribute_widgets/attribute_editor.ts
View File

@ -3,7 +3,7 @@ import NoteContextAwareWidget from "../note_context_aware_widget.js";
import noteAutocompleteService from "../../services/note_autocomplete.js";
import server from "../../services/server.js";
import contextMenuService from "../../menus/context_menu.js";
import attributeParser, { Attribute } from "../../services/attribute_parser.js";
import attributeParser from "../../services/attribute_parser.js";
import libraryLoader from "../../services/library_loader.js";
import froca from "../../services/froca.js";
import attributeRenderer from "../../services/attribute_renderer.js";
@ -11,8 +11,8 @@ import noteCreateService from "../../services/note_create.js";
import attributeService from "../../services/attributes.js";
import linkService from "../../services/link.js";
import AttributeDetailWidget from "./attribute_detail.js";
import { CommandData, EventData, EventListener, FilteredCommandNames } from "../../components/app_context.js";
import FAttribute, { AttributeType } from "../../entities/fattribute.js";
import type { CommandData, EventData, EventListener, FilteredCommandNames } from "../../components/app_context.js";
import FAttribute, { type AttributeType } from "../../entities/fattribute.js";
import FNote from "../../entities/fnote.js";
const HELP_TEXT = `

6
src/public/app/widgets/buttons/command_button.ts
View File

@ -1,6 +1,6 @@
import { CommandNames } from "../../components/app_context.js";
import keyboardActionsService, { Action } from "../../services/keyboard_actions.js";
import AbstractButtonWidget, { AbstractButtonWidgetSettings } from "./abstract_button.js";
import type { CommandNames } from "../../components/app_context.js";
import keyboardActionsService, { type Action } from "../../services/keyboard_actions.js";
import AbstractButtonWidget, { type AbstractButtonWidgetSettings } from "./abstract_button.js";
let actions: Action[];

2
src/public/app/widgets/buttons/onclick_button.ts
View File

@ -1,4 +1,4 @@
import AbstractButtonWidget, { AbstractButtonWidgetSettings } from "./abstract_button.js";
import AbstractButtonWidget, { type AbstractButtonWidgetSettings } from "./abstract_button.js";
import { t } from "../../services/i18n.js";
export type ClickHandler = (widget: OnClickButtonWidget, e: JQuery.ClickEvent<any, any, any, any>) => void;

2
src/public/app/widgets/containers/launcher.ts
View File

@ -12,7 +12,7 @@ import TodayLauncher from "../buttons/launcher/today_launcher.js";
import HistoryNavigationButton from "../buttons/history_navigation.js";
import QuickSearchLauncherWidget from "../quick_search_launcher.js";
import FNote from "../../entities/fnote.js";
import { CommandNames } from "../../components/app_context.js";
import type { CommandNames } from "../../components/app_context.js";
interface InnerWidget extends BasicWidget {
settings?: {

2
src/public/app/widgets/containers/launcher_container.ts
View File

@ -1,6 +1,6 @@
import FlexContainer from "./flex_container.js";
import froca from "../../services/froca.js";
import appContext, { EventData } from "../../components/app_context.js";
import appContext, { type EventData } from "../../components/app_context.js";
import LauncherWidget from "./launcher.js";
import utils from "../../services/utils.js";

2
src/public/app/widgets/dialogs/delete_notes.ts
View File

@ -4,7 +4,7 @@ import linkService from "../../services/link.js";
import utils from "../../services/utils.js";
import BasicWidget from "../basic_widget.js";
import { t } from "../../services/i18n.js";
import FAttribute, { FAttributeRow } from "../../entities/fattribute.js";
import type { FAttributeRow } from "../../entities/fattribute.js";
// TODO: Use common with server.
interface Response {

4
src/public/app/widgets/dialogs/note_type_chooser.ts
View File

@ -1,5 +1,5 @@
import { CommandNames } from "../../components/app_context.js";
import { MenuCommandItem } from "../../menus/context_menu.js";
import type { CommandNames } from "../../components/app_context.js";
import type { MenuCommandItem } from "../../menus/context_menu.js";
import { t } from "../../services/i18n.js";
import noteTypesService from "../../services/note_types.js";
import BasicWidget from "../basic_widget.js";

2
src/public/app/widgets/highlights_list.ts
View File

@ -10,7 +10,7 @@ import attributeService from "../services/attributes.js";
import RightPanelWidget from "./right_panel_widget.js";
import options from "../services/options.js";
import OnClickButtonWidget from "./buttons/onclick_button.js";
import appContext, { EventData } from "../components/app_context.js";
import appContext, { type EventData } from "../components/app_context.js";
import libraryLoader from "../services/library_loader.js";
import FNote from "../entities/fnote.js";

6
src/public/app/widgets/mobile_widgets/sidebar_container.ts
View File

@ -1,7 +1,7 @@
import { EventData } from "../../components/app_context.js";
import { Screen } from "../../components/mobile_screen_switcher.js";
import type { EventData } from "../../components/app_context.js";
import type { Screen } from "../../components/mobile_screen_switcher.js";
import BasicWidget from "../basic_widget.js";
import FlexContainer, { FlexDirection } from "../containers/flex_container.js";
import FlexContainer, { type FlexDirection } from "../containers/flex_container.js";
const DRAG_STATE_NONE = 0;
const DRAG_STATE_INITIAL_DRAG = 1;

2
src/public/app/widgets/note_context_aware_widget.ts
View File

@ -1,5 +1,5 @@
import BasicWidget from "./basic_widget.js";
import appContext, { EventData } from "../components/app_context.js";
import appContext, { type EventData } from "../components/app_context.js";
import FNote from "../entities/fnote.js";
import NoteContext from "../components/note_context.js";

2
src/public/app/widgets/type_widgets/options/appearance/fonts.ts
View File

@ -1,7 +1,7 @@
import OptionsWidget from "../options_widget.js";
import utils from "../../../../services/utils.js";
import { t } from "../../../../services/i18n.js";
import { FontFamily, OptionMap, OptionNames } from "../../../../../../services/options_interface.js";
import type { FontFamily, OptionMap, OptionNames } from "../../../../../../services/options_interface.js";
interface FontFamilyEntry {
value: FontFamily;

4
src/public/app/widgets/type_widgets/options/options_widget.ts
View File

@ -1,5 +1,5 @@
import { FilterOptionsByType, OptionDefinitions, OptionMap, OptionNames } from "../../../../../services/options_interface.js";
import { EventData, EventListener } from "../../../components/app_context.js";
import type { FilterOptionsByType, OptionDefinitions, OptionMap, OptionNames } from "../../../../../services/options_interface.js";
import type { EventData, EventListener } from "../../../components/app_context.js";
import FNote from "../../../entities/fnote.js";
import { t } from "../../../services/i18n.js";
import server from "../../../services/server.js";

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

@ -2,7 +2,7 @@ import becca from "../../becca/becca.js";
import blobService from "../../services/blob.js";
import ValidationError from "../../errors/validation_error.js";
import imageService from "../../services/image.js";
import { Request } from "express";
import type { Request } from "express";
function getAttachmentBlob(req: Request) {
const preview = req.query.preview === "true";

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

@ -6,7 +6,7 @@ import attributeService from "../../services/attributes.js";
import BAttribute from "../../becca/entities/battribute.js";
import becca from "../../becca/becca.js";
import ValidationError from "../../errors/validation_error.js";
import { Request } from "express";
import type { Request } from "express";
function getEffectiveNoteAttributes(req: Request) {
const note = becca.getNote(req.params.noteId);

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

@ -6,7 +6,7 @@ import log from "../../services/log.js";
import utils from "../../services/utils.js";
import cls from "../../services/cls.js";
import becca from "../../becca/becca.js";
import { Request } from "express";
import type { Request } from "express";
import ValidationError from "../../errors/validation_error.js";
function getAutocomplete(req: Request) {

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

@ -11,7 +11,7 @@ import branchService from "../../services/branches.js";
import log from "../../services/log.js";
import ValidationError from "../../errors/validation_error.js";
import eventService from "../../services/events.js";
import { Request } from "express";
import type { Request } from "express";
/**
* Code in this file deals with moving and cloning branches. The relationship between note and parent note is unique

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

@ -1,4 +1,4 @@
import { Request } from "express";
import type { Request } from "express";
import becca from "../../becca/becca.js";
import bulkActionService from "../../services/bulk_actions.js";

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

@ -1,6 +1,6 @@
"use strict";
import { Request } from "express";
import type { Request } from "express";
import attributeService from "../../services/attributes.js";
import cloneService from "../../services/cloning.js";

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

@ -1,6 +1,6 @@
"use strict";
import { Request } from "express";
import type { Request } from "express";
import cloningService from "../../services/cloning.js";
function cloneNoteToBranch(req: Request) {

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

@ -5,7 +5,7 @@ import log from "../../services/log.js";
import backupService from "../../services/backup.js";
import anonymizationService from "../../services/anonymization.js";
import consistencyChecksService from "../../services/consistency_checks.js";
import { Request } from "express";
import type { Request } from "express";
import ValidationError from "../../errors/validation_error.js";
import sql_init from "../../services/sql_init.js";
import becca_loader from "../../becca/becca_loader.js";

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

@ -1,4 +1,4 @@
import { Request } from "express";
import type { Request } from "express";
import etapiTokenService from "../../services/etapi_tokens.js";
function getTokens() {

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

@ -7,7 +7,7 @@ import becca from "../../becca/becca.js";
import TaskContext from "../../services/task_context.js";
import log from "../../services/log.js";
import NotFoundError from "../../errors/not_found_error.js";
import { Request, Response } from "express";
import type { Request, Response } from "express";
import ValidationError from "../../errors/validation_error.js";
function exportBranch(req: Request, res: Response) {

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

@ -11,7 +11,7 @@ import chokidar from "chokidar";
import ws from "../../services/ws.js";
import becca from "../../becca/becca.js";
import ValidationError from "../../errors/validation_error.js";
import { Request, Response } from "express";
import type { Request, Response } from "express";
import BNote from "../../becca/entities/bnote.js";
import BAttachment from "../../becca/entities/battachment.js";

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

@ -1,6 +1,6 @@
import { Request, Response } from "express";
import type { Request, Response } from "express";
import optionService from "../../services/options.js";
import { OptionMap } from "../../services/options_interface.js";
import type { OptionMap } from "../../services/options_interface.js";
const SYSTEM_SANS_SERIF = [
"system-ui",

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

@ -3,7 +3,7 @@
import imageService from "../../services/image.js";
import becca from "../../becca/becca.js";
import fs from "fs";
import { Request, Response } from "express";
import type { Request, Response } from "express";
import BNote from "../../becca/entities/bnote.js";
import BRevision from "../../becca/entities/brevision.js";
import { RESOURCE_DIR } from "../../services/resource_dir.js";

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

@ -11,7 +11,7 @@ import beccaLoader from "../../becca/becca_loader.js";
import log from "../../services/log.js";
import TaskContext from "../../services/task_context.js";
import ValidationError from "../../errors/validation_error.js";
import { Request } from "express";
import type { Request } from "express";
import BNote from "../../becca/entities/bnote.js";
async function importNotesToBranch(req: Request) {

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

@ -12,7 +12,7 @@ import sqlInit from "../../services/sql_init.js";
import sql from "../../services/sql.js";
import ws from "../../services/ws.js";
import etapiTokenService from "../../services/etapi_tokens.js";
import { Request } from "express";
import type { Request } from "express";
function loginSync(req: Request) {
if (!sqlInit.schemaExists()) {

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

@ -4,7 +4,7 @@ import becca from "../../becca/becca.js";
import { JSDOM } from "jsdom";
import BNote from "../../becca/entities/bnote.js";
import BAttribute from "../../becca/entities/battribute.js";
import { Request } from "express";
import type { Request } from "express";
function buildDescendantCountMap(noteIdsToCount: string[]) {
if (!Array.isArray(noteIdsToCount)) {

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

@ -10,9 +10,9 @@ import TaskContext from "../../services/task_context.js";
import becca from "../../becca/becca.js";
import ValidationError from "../../errors/validation_error.js";
import blobService from "../../services/blob.js";
import { Request } from "express";
import type { Request } from "express";
import BBranch from "../../becca/entities/bbranch.js";
import { AttributeRow } from "../../becca/entities/rows.js";
import type { AttributeRow } from "../../becca/entities/rows.js";
function getNote(req: Request) {
return becca.getNoteOrThrow(req.params.noteId);

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

@ -4,7 +4,7 @@ import optionService from "../../services/options.js";
import log from "../../services/log.js";
import searchService from "../../services/search/services/search.js";
import ValidationError from "../../errors/validation_error.js";
import { Request } from "express";
import type { Request } from "express";
import { changeLanguage } from "../../services/i18n.js";
import { listSyntaxHighlightingThemes } from "../../services/code_block_theme.js";
import type { OptionNames } from "../../services/options_interface.js";

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

@ -1,4 +1,4 @@
import { Request } from "express";
import type { Request } from "express";
import becca from "../../becca/becca.js";
import markdownService from "../../services/import/markdown.js";

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

@ -2,7 +2,7 @@
import passwordService from "../../services/encryption/password.js";
import ValidationError from "../../errors/validation_error.js";
import { Request } from "express";
import type { Request } from "express";
function changePassword(req: Request) {
if (passwordService.isPasswordSet()) {

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

@ -4,8 +4,8 @@ import sql from "../../services/sql.js";
import protectedSessionService from "../../services/protected_session.js";
import noteService from "../../services/notes.js";
import becca from "../../becca/becca.js";
import { Request } from "express";
import { RevisionRow } from "../../becca/entities/rows.js";
import type { Request } from "express";
import type { RevisionRow } from "../../becca/entities/rows.js";
interface RecentChangeRow {
noteId: string;

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

@ -3,7 +3,7 @@
import BRecentNote from "../../becca/entities/brecent_note.js";
import sql from "../../services/sql.js";
import dateUtils from "../../services/date_utils.js";
import { Request } from "express";
import type { Request } from "express";
function addRecentNote(req: Request) {
new BRecentNote({

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

@ -1,4 +1,4 @@
import { Request } from "express";
import type { Request } from "express";
import becca from "../../becca/becca.js";
import sql from "../../services/sql.js";

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

@ -9,10 +9,10 @@ import path from "path";
import becca from "../../becca/becca.js";
import blobService from "../../services/blob.js";
import eraseService from "../../services/erase.js";
import { Request, Response } from "express";
import type { Request, Response } from "express";
import BRevision from "../../becca/entities/brevision.js";
import BNote from "../../becca/entities/bnote.js";
import { NotePojo } from "../../becca/becca-interface.js";
import { type NotePojo } from "../../becca/becca-interface.js";
interface NotePath {
noteId: string;

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

@ -5,7 +5,7 @@ import attributeService from "../../services/attributes.js";
import becca from "../../becca/becca.js";
import syncService from "../../services/sync.js";
import sql from "../../services/sql.js";
import { Request } from "express";
import type { Request } from "express";
interface ScriptBody {
script: string;

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

@ -1,10 +1,10 @@
"use strict";
import { Request } from "express";
import type { Request } from "express";
import becca from "../../becca/becca.js";
import SearchContext from "../../services/search/search_context.js";
import searchService, { EMPTY_RESULT, SearchNoteResult } from "../../services/search/services/search.js";
import searchService, { EMPTY_RESULT, type SearchNoteResult } from "../../services/search/services/search.js";
import bulkActionService from "../../services/bulk_actions.js";
import cls from "../../services/cls.js";
import attributeFormatter from "../../services/attribute_formatter.js";

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

@ -5,7 +5,7 @@ import imageService from "../../services/image.js";
import noteService from "../../services/notes.js";
import sanitizeAttributeName from "../../services/sanitize_attribute_name.js";
import specialNotesService from "../../services/special_notes.js";
import { Request } from "express";
import type { Request } from "express";
async function uploadImage(req: Request) {
const file = req.file;

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

@ -4,7 +4,7 @@ import sqlInit from "../../services/sql_init.js";
import setupService from "../../services/setup.js";
import log from "../../services/log.js";
import appInfo from "../../services/app_info.js";
import { Request } from "express";
import type { Request } from "express";
function getStatus() {
return {

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

@ -1,6 +1,6 @@
"use strict";
import { Request } from "express";
import type { Request } from "express";
import similarityService from "../../becca/similarity.js";
import becca from "../../becca/becca.js";

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

@ -5,7 +5,7 @@ import sql from "../../services/sql.js";
import cls from "../../services/cls.js";
import specialNotesService from "../../services/special_notes.js";
import becca from "../../becca/becca.js";
import { Request } from "express";
import type { Request } from "express";
function getInboxNote(req: Request) {
return specialNotesService.getInboxNote(req.params.date);

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