mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	server: Fix missing .js import for rows file
This commit is contained in:
		| @@ -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"; | ||||
| import { NoteType } from "../../src/becca/entities/rows.js"; | ||||
| randtoken.generator({ source: "crypto" }); | ||||
|  | ||||
| function findNoteByTitle( | ||||
|   | ||||
| @@ -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, RevisionRow } from './entities/rows'; | ||||
| import { AttachmentRow, 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"; | ||||
|   | ||||
| @@ -12,7 +12,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'; | ||||
| import { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from './entities/rows.js'; | ||||
| import AbstractBeccaEntity from "./entities/abstract_becca_entity.js"; | ||||
| import options_init from "../services/options_init.js"; | ||||
| import ws from "../services/ws.js"; | ||||
|   | ||||
| @@ -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'; | ||||
| import { AttachmentRow } from './rows.js'; | ||||
| import BNote from "./bnote.js"; | ||||
| import BBranch from "./bbranch.js"; | ||||
| import noteService from "../../services/notes.js"; | ||||
|   | ||||
| @@ -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'; | ||||
| import { AttributeRow, AttributeType } from './rows.js'; | ||||
|  | ||||
| interface SavingOpts { | ||||
|     skipValidation?: boolean; | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import AbstractBeccaEntity from "./abstract_becca_entity.js"; | ||||
| import { BlobRow } from "./rows"; | ||||
| import { BlobRow } from "./rows.js"; | ||||
|  | ||||
| // TODO: Why this does not extend the abstract becca? | ||||
| class BBlob extends AbstractBeccaEntity<BBlob> { | ||||
|   | ||||
| @@ -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'; | ||||
| import { BranchRow } from './rows.js'; | ||||
| import handlers from "../../services/handlers.js"; | ||||
|  | ||||
| /** | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| "use strict"; | ||||
|  | ||||
| import { EtapiTokenRow } from "./rows"; | ||||
| import { EtapiTokenRow } from "./rows.js"; | ||||
|  | ||||
| import dateUtils from "../../services/date_utils.js"; | ||||
| import AbstractBeccaEntity from "./abstract_becca_entity.js"; | ||||
|   | ||||
| @@ -12,7 +12,7 @@ import TaskContext from "../../services/task_context.js"; | ||||
| import dayjs from "dayjs"; | ||||
| import utc from "dayjs/plugin/utc"; | ||||
| import eventService from "../../services/events.js"; | ||||
| import { AttachmentRow, AttributeType, NoteRow, NoteType, RevisionRow } from './rows'; | ||||
| import { AttachmentRow, AttributeType, NoteRow, NoteType, RevisionRow } from './rows.js'; | ||||
| import BBranch from "./bbranch.js"; | ||||
| import BAttribute from "./battribute.js"; | ||||
| import { NotePojo } from '../becca-interface'; | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|  | ||||
| import dateUtils from "../../services/date_utils.js"; | ||||
| import AbstractBeccaEntity from "./abstract_becca_entity.js"; | ||||
| import { OptionRow } from './rows'; | ||||
| import { OptionRow } from './rows.js'; | ||||
|  | ||||
| /** | ||||
|  * Option represents a name-value pair, either directly configurable by the user or some system property. | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| "use strict"; | ||||
|  | ||||
| import { RecentNoteRow } from "./rows"; | ||||
| import { RecentNoteRow } from "./rows.js"; | ||||
|  | ||||
| import dateUtils from "../../services/date_utils.js"; | ||||
| import AbstractBeccaEntity from "./abstract_becca_entity.js"; | ||||
|   | ||||
| @@ -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'; | ||||
| import { AttachmentRow, RevisionRow } from './rows.js'; | ||||
| import eraseService from "../../services/erase.js"; | ||||
|  | ||||
| interface ContentOpts { | ||||
|   | ||||
| @@ -4,7 +4,7 @@ import mappers from "./mappers.js"; | ||||
| import v from "./validators.js"; | ||||
| import utils from "../services/utils.js"; | ||||
| import { Router } from 'express'; | ||||
| import { AttachmentRow } from '../becca/entities/rows'; | ||||
| import { AttachmentRow } from '../becca/entities/rows.js'; | ||||
| import { ValidatorMap } from './etapi-interface'; | ||||
|  | ||||
| function register(router: Router) { | ||||
|   | ||||
| @@ -4,7 +4,7 @@ import mappers from "./mappers.js"; | ||||
| import attributeService from "../services/attributes.js"; | ||||
| import v from "./validators.js"; | ||||
| import { Router } from 'express'; | ||||
| import { AttributeRow } from '../becca/entities/rows'; | ||||
| import { AttributeRow } from '../becca/entities/rows.js'; | ||||
| import { ValidatorMap } from './etapi-interface'; | ||||
|  | ||||
| function register(router: Router) { | ||||
|   | ||||
| @@ -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"; | ||||
| import { BranchRow } from "../becca/entities/rows.js"; | ||||
|  | ||||
| function register(router: Router) { | ||||
|     eu.route(router, 'get', '/etapi/branches/:branchId', (req, res, next) => { | ||||
|   | ||||
| @@ -12,7 +12,7 @@ import ValidationError from "../../errors/validation_error.js"; | ||||
| import blobService from "../../services/blob.js"; | ||||
| import { Request } from 'express'; | ||||
| import BBranch from "../../becca/entities/bbranch.js"; | ||||
| import { AttributeRow } from '../../becca/entities/rows'; | ||||
| import { AttributeRow } from '../../becca/entities/rows.js'; | ||||
|  | ||||
| function getNote(req: Request) { | ||||
|     return becca.getNoteOrThrow(req.params.noteId); | ||||
|   | ||||
| @@ -5,7 +5,7 @@ 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'; | ||||
| import { RevisionRow } from '../../becca/entities/rows.js'; | ||||
|  | ||||
| interface RecentChangeRow { | ||||
|     noteId: string; | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| import { OptionRow } from "../becca/entities/rows"; | ||||
| import { OptionRow } from "../becca/entities/rows.js"; | ||||
|  | ||||
| /** | ||||
|  * Response for /api/setup/status. | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| "use strict"; | ||||
|  | ||||
| import { AttributeRow } from "../becca/entities/rows"; | ||||
| import { AttributeRow } from "../becca/entities/rows.js"; | ||||
|  | ||||
| function formatAttrForSearch(attr: AttributeRow, searchWithValue: boolean) { | ||||
|     let searchStr = ''; | ||||
|   | ||||
| @@ -7,7 +7,7 @@ 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'; | ||||
| import { AttributeRow } from '../becca/entities/rows.js'; | ||||
|  | ||||
| const ATTRIBUTE_TYPES = ['label', 'relation']; | ||||
|  | ||||
|   | ||||
| @@ -30,7 +30,7 @@ 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 { AttributeRow, AttributeType, NoteType } from '../becca/entities/rows.js'; | ||||
| import Becca from '../becca/becca-interface'; | ||||
| import { NoteParams } from './note-interface'; | ||||
| import { ApiParams } from './backend_script_api_interface'; | ||||
|   | ||||
| @@ -14,7 +14,7 @@ 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 { BranchRow } from '../becca/entities/rows.js'; | ||||
| import { EntityChange } from './entity_changes_interface'; | ||||
| import becca_loader from "../becca/becca_loader.js"; | ||||
| const noteTypes = noteTypesService.getNoteTypeNames(); | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import BAttribute from "../becca/entities/battribute.js"; | ||||
| import { AttributeType, NoteType } from "../becca/entities/rows"; | ||||
| import { AttributeType, NoteType } from "../becca/entities/rows.js"; | ||||
|  | ||||
| import becca from "../becca/becca.js"; | ||||
| import noteService from "./notes.js"; | ||||
|   | ||||
| @@ -20,7 +20,7 @@ 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'; | ||||
| import { ALLOWED_NOTE_TYPES, NoteType } from '../../becca/entities/rows.js'; | ||||
|  | ||||
| interface MetaFile { | ||||
|     files: NoteMeta[] | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| import { AttributeType } from "../../becca/entities/rows"; | ||||
| import { AttributeType } from "../../becca/entities/rows.js"; | ||||
|  | ||||
| interface AttributeMeta { | ||||
|     noteId?: string; | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| import { NoteType } from "../becca/entities/rows"; | ||||
| import { NoteType } from "../becca/entities/rows.js"; | ||||
|  | ||||
| export interface NoteParams { | ||||
|     /** optionally can force specific noteId */ | ||||
|   | ||||
| @@ -23,7 +23,7 @@ import noteTypesService from "./note_types.js"; | ||||
| import fs from "fs"; | ||||
| import ws from "./ws.js"; | ||||
| import html2plaintext from "html2plaintext"; | ||||
| import { AttachmentRow, AttributeRow, BranchRow, NoteRow, NoteType } from '../becca/entities/rows'; | ||||
| import { AttachmentRow, AttributeRow, BranchRow, NoteRow, NoteType } from '../becca/entities/rows.js'; | ||||
| import TaskContext from "./task_context.js"; | ||||
| import { NoteParams } from './note-interface'; | ||||
| import imageService from "./image.js"; | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import becca from "../becca/becca.js"; | ||||
| import BOption from "../becca/entities/boption.js"; | ||||
| import { OptionRow } from '../becca/entities/rows'; | ||||
| import { OptionRow } from '../becca/entities/rows.js'; | ||||
| import sql from "./sql.js"; | ||||
|  | ||||
| function getOptionOrNull(name: string): string | null { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| "use strict"; | ||||
|  | ||||
| import { NoteRow } from "../../../becca/entities/rows"; | ||||
| import { NoteRow } from "../../../becca/entities/rows.js"; | ||||
| import SearchContext from "../search_context.js"; | ||||
|  | ||||
| import Expression from "./expression.js"; | ||||
|   | ||||
| @@ -10,7 +10,7 @@ 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'; | ||||
| import { OptionRow } from '../becca/entities/rows.js'; | ||||
| import optionsInitService from "./options_init.js"; | ||||
| import BNote from "../becca/entities/bnote.js"; | ||||
| import BBranch from "../becca/entities/bbranch.js"; | ||||
|   | ||||
| @@ -5,7 +5,7 @@ import utils from "../../../services/utils.js"; | ||||
| import AbstractShacaEntity from "./abstract_shaca_entity.js"; | ||||
| import SNote from "./snote.js"; | ||||
| import { Blob } from '../../../services/blob-interface'; | ||||
| import { SAttachmentRow } from './rows'; | ||||
| import { SAttachmentRow } from './rows.js'; | ||||
|  | ||||
| class SAttachment extends AbstractShacaEntity { | ||||
|     private attachmentId: string; | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| "use strict"; | ||||
|  | ||||
| import AbstractShacaEntity from "./abstract_shaca_entity"; | ||||
| import { SAttributeRow } from "./rows"; | ||||
| import { SAttributeRow } from "./rows.js"; | ||||
| import SNote from "./snote.js"; | ||||
|  | ||||
| class SAttribute extends AbstractShacaEntity { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| "use strict"; | ||||
|  | ||||
| import AbstractShacaEntity from "./abstract_shaca_entity.js"; | ||||
| import { SBranchRow } from './rows'; | ||||
| import { SBranchRow } from './rows.js'; | ||||
| import SNote from "./snote.js"; | ||||
|  | ||||
| class SBranch extends AbstractShacaEntity { | ||||
|   | ||||
| @@ -8,7 +8,7 @@ import { Blob } from '../../../services/blob-interface'; | ||||
| import SAttachment from "./sattachment.js"; | ||||
| import SAttribute from "./sattribute.js"; | ||||
| import SBranch from "./sbranch.js"; | ||||
| import { SNoteRow } from './rows'; | ||||
| import { SNoteRow } from './rows.js'; | ||||
|  | ||||
| const LABEL = 'label'; | ||||
| const RELATION = 'relation'; | ||||
|   | ||||
| @@ -9,7 +9,7 @@ import SAttribute from "./entities/sattribute.js"; | ||||
| import SAttachment from "./entities/sattachment.js"; | ||||
| import shareRoot from "../share_root.js"; | ||||
| import eventService from "../../services/events.js"; | ||||
| import { SAttachmentRow, SAttributeRow, SBranchRow, SNoteRow } from './entities/rows'; | ||||
| import { SAttachmentRow, SAttributeRow, SBranchRow, SNoteRow } from './entities/rows.js'; | ||||
|  | ||||
| function load() { | ||||
|     const start = Date.now(); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user