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

Merge branch 'next' into redesign

Browse Source
This commit is contained in:
zadam 2021-05-18 21:08:02 +02:00
commit d18b95d87c
82 changed files with 235 additions and 1650 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "trilium",
"version": "0.47.2",
"version": "0.47.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -2957,9 +2957,9 @@
}
},
"electron": {
"version": "13.0.0-beta.26",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0-beta.26.tgz",
"integrity": "sha512-glDAQjSzV26JvmB9pbdd1dLkjqUvBv9X0B8FrRvIK0BAhEmMzzZ3gKD6VPsxg2omDYMI35oThQ+92D4RxRcb+g==",
"version": "13.0.0-beta.27",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0-beta.27.tgz",
"integrity": "sha512-Co5143QQBiUHLY8qKPbe4axGnFxFLIPbdBuKh0pMvhmsGsVbTK3mEihmhl/lBKQe36cu+gnODpvtZZ0uGsqlxA==",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",

12
spec/search/note_cache_mocking.js
View File

@ -1,7 +1,7 @@
const Note = require('../../src/services/becca/entities/note.js');
const Branch = require('../../src/services/becca/entities/branch.js');
const Attribute = require('../../src/services/becca/entities/attribute.js');
const becca = require('../../src/services/becca/becca.js');
const Note = require('../../src/becca/entities/note.js');
const Branch = require('../../src/becca/entities/branch.js');
const Attribute = require('../../src/becca/entities/attribute.js');
const becca = require('../../src/becca/becca.js');
const randtoken = require('rand-token').generator({source: 'crypto'});
/** @return {Note} */
@ -17,7 +17,7 @@ class NoteBuilder {
}
label(name, value = '', isInheritable = false) {
new Attribute(becca, {
new Attribute({
attributeId: id(),
noteId: this.note.noteId,
type: 'label',
@ -30,7 +30,7 @@ class NoteBuilder {
}
relation(name, targetNote) {
new Attribute(becca, {
new Attribute({
attributeId: id(),
noteId: this.note.noteId,
type: 'relation',

10
spec/search/search.spec.js
View File

@ -1,9 +1,9 @@
const searchService = require('../../src/services/search/services/search.js');
const Note = require('../../src/services/becca/entities/note.js');
const Branch = require('../../src/services/becca/entities/branch.js');
const Note = require('../../src/becca/entities/note.js');
const Branch = require('../../src/becca/entities/branch.js');
const SearchContext = require('../../src/services/search/search_context.js');
const dateUtils = require('../../src/services/date_utils.js');
const becca = require('../../src/services/becca/becca.js');
const becca = require('../../src/becca/becca.js');
const {NoteBuilder, findNoteByTitle, note} = require('./note_cache_mocking.js');
describe("Search", () => {
@ -337,11 +337,11 @@ describe("Search", () => {
const searchContext = new SearchContext();
let searchResults = searchService.findResultsWithQuery('#city AND note.ancestors.title = Europe', searchContext);
let searchResults = searchService.findResultsWithQuery('#city AND note.getAncestors().title = Europe', searchContext);
expect(searchResults.length).toEqual(1);
expect(findNoteByTitle(searchResults, "Prague")).toBeTruthy();
searchResults = searchService.findResultsWithQuery('#city AND note.ancestors.title = Asia', searchContext);
searchResults = searchService.findResultsWithQuery('#city AND note.getAncestors().title = Asia', searchContext);
expect(searchResults.length).toEqual(1);
expect(findNoteByTitle(searchResults, "Taipei")).toBeTruthy();
});

2
spec/search/value_extractor.spec.js
View File

@ -1,6 +1,6 @@
const {note} = require('./note_cache_mocking.js');
const ValueExtractor = require('../../src/services/search/value_extractor.js');
const becca = require('../../src/services/becca/becca.js');
const becca = require('../../src/becca/becca.js');
const SearchContext = require("../../src/services/search/search_context.js");
const dsc = new SearchContext();

2
src/app.js
View File

@ -10,7 +10,7 @@ const FileStore = require('session-file-store')(session);
const sessionSecret = require('./services/session_secret');
const dataDir = require('./services/data_dir');
require('./services/handlers');
require('./services/becca/becca_loader.js');
require('./becca/becca_loader.js');
const app = express();

4
src/services/becca/becca.js → src/becca/becca.js
View File

@ -1,6 +1,6 @@
"use strict";
const sql = require("../sql.js");
const sql = require("../services/sql.js");
const NoteRevision = require("./entities/note_revision.js");
const RecentNote = require("./entities/recent_note.js");
@ -93,7 +93,7 @@ class Becca {
return this.options[name];
}
getEntityFromName(entityName, entityId) {
getEntity(entityName, entityId) {
if (!entityName || !entityId) {
return null;
}

24
src/services/becca/becca_loader.js → src/becca/becca_loader.js
View File

@ -1,21 +1,21 @@
"use strict";
const sql = require('../sql.js');
const eventService = require('../events.js');
const sql = require('../services/sql.js');
const eventService = require('../services/events.js');
const becca = require('./becca.js');
const sqlInit = require('../sql_init');
const log = require('../log');
const Note = require('./entities/note');
const Branch = require('./entities/branch');
const Attribute = require('./entities/attribute');
const Option = require('./entities/option');
const cls = require("../cls.js");
const sqlInit = require('../services/sql_init');
const log = require('../services/log');
const Note = require('./entities/note.js');
const Branch = require('./entities/branch.js');
const Attribute = require('./entities/attribute.js');
const Option = require('./entities/option.js');
const cls = require("../services/cls.js");
const beccaLoaded = new Promise((res, rej) => {
sqlInit.dbReady.then(() => {
load();
cls.init(() => require('../options_init').initStartupOptions());
cls.init(() => require('../services/options_init').initStartupOptions());
res();
});
@ -115,7 +115,7 @@ function attributeDeleted(attribute) {
if (note) {
// first invalidate and only then remove the attribute (otherwise invalidation wouldn't be complete)
if (attribute.isAffectingSubtree || note.isTemplate) {
if (attribute.isAffectingSubtree || note.isTemplate()) {
note.invalidateSubTree();
} else {
note.invalidateThisCache();
@ -143,7 +143,7 @@ function attributeUpdated(attribute) {
const note = becca.notes[attribute.noteId];
if (note) {
if (attribute.isAffectingSubtree || note.isTemplate) {
if (attribute.isAffectingSubtree || note.isTemplate()) {
note.invalidateSubTree();
} else {
note.invalidateThisCache();

10
src/services/becca/becca_service.js → src/becca/becca_service.js
View File

@ -1,9 +1,9 @@
"use strict";
const becca = require('./becca.js');
const cls = require('../cls');
const protectedSessionService = require('../protected_session');
const log = require('../log');
const cls = require('../services/cls');
const protectedSessionService = require('../services/protected_session');
const log = require('../services/log');
function isNotePathArchived(notePath) {
const noteId = notePath[notePath.length - 1];
@ -17,7 +17,7 @@ function isNotePathArchived(notePath) {
const note = becca.notes[notePath[i]];
// this is going through parents so archived must be inheritable
if (note.hasInheritableOwnedArchivedLabel) {
if (note.hasInheritableOwnedArchivedLabel()) {
return true;
}
}
@ -123,7 +123,7 @@ function getNoteTitleForPath(notePathArray) {
* Returns notePath for noteId from cache. Note hoisting is respected.
* Archived notes are also returned, but non-archived paths are preferred if available
* - this means that archived paths is returned only if there's no non-archived path
* - you can check whether returned path is archived using isArchived()
* - you can check whether returned path is archived using isArchived
*/
function getSomePath(note, path = []) {
// first try to find note within hoisted note, otherwise take any existing note path

14
src/services/becca/entities/abstract_entity.js → src/becca/entities/abstract_entity.js
View File

@ -1,11 +1,11 @@
"use strict";
const utils = require('../../utils');
const sql = require('../../sql');
const entityChangesService = require('../../entity_changes');
const eventService = require("../../events");
const dateUtils = require("../../date_utils");
const cls = require("../../cls");
const utils = require('../../services/utils');
const sql = require('../../services/sql');
const entityChangesService = require('../../services/entity_changes');
const eventService = require("../../services/events");
const dateUtils = require("../../services/date_utils");
const cls = require("../../services/cls");
let becca = null;
@ -41,7 +41,7 @@ class AbstractEntity {
get becca() {
if (!becca) {
becca = require('../becca');
becca = require('../becca.js');
}
return becca;

2
src/services/becca/entities/api_token.js → src/becca/entities/api_token.js
View File

@ -1,6 +1,6 @@
"use strict";
const dateUtils = require('../../date_utils.js');
const dateUtils = require('../../services/date_utils.js');
const AbstractEntity = require("./abstract_entity.js");
/**

6
src/services/becca/entities/attribute.js → src/becca/entities/attribute.js
View File

@ -2,9 +2,9 @@
const Note = require('./note.js');
const AbstractEntity = require("./abstract_entity.js");
const sql = require("../../sql.js");
const dateUtils = require("../../date_utils.js");
const promotedAttributeDefinitionParser = require("../../promoted_attribute_definition_parser");
const sql = require("../../services/sql.js");
const dateUtils = require("../../services/date_utils.js");
const promotedAttributeDefinitionParser = require("../../services/promoted_attribute_definition_parser");
class Attribute extends AbstractEntity {
static get entityName() { return "attributes"; }

4
src/services/becca/entities/branch.js → src/becca/entities/branch.js
View File

@ -2,8 +2,8 @@
const Note = require('./note.js');
const AbstractEntity = require("./abstract_entity.js");
const sql = require("../../sql.js");
const dateUtils = require("../../date_utils.js");
const sql = require("../../services/sql.js");
const dateUtils = require("../../services/date_utils.js");
class Branch extends AbstractEntity {
static get entityName() { return "branches"; }

54
src/services/becca/entities/note.js → src/becca/entities/note.js
View File

@ -1,13 +1,13 @@
"use strict";
const protectedSessionService = require('../../protected_session');
const log = require('../../log');
const sql = require('../../sql');
const utils = require('../../utils');
const dateUtils = require('../../date_utils');
const entityChangesService = require('../../entity_changes');
const AbstractEntity = require("./abstract_entity");
const NoteRevision = require("./note_revision");
const protectedSessionService = require('../../services/protected_session');
const log = require('../../services/log');
const sql = require('../../services/sql');
const utils = require('../../services/utils');
const dateUtils = require('../../services/date_utils');
const entityChangesService = require('../../services/entity_changes');
const AbstractEntity = require("./abstract_entity.js");
const NoteRevision = require("./note_revision.js");
const LABEL = 'label';
const RELATION = 'relation';
@ -79,7 +79,7 @@ class Note extends AbstractEntity {
// ------ Derived attributes ------
/** @param {boolean} */
this.isDecrypted = !row.isProtected || row.isContentAvailable;
this.isDecrypted = !this.isProtected;
this.decrypt();
@ -87,7 +87,7 @@ class Note extends AbstractEntity {
this.flatTextCache = null;
}
get isContentAvailable() {
isContentAvailable() {
return !this.noteId // new note which was not encrypted yet
|| !this.isProtected
|| protectedSessionService.isProtectedSessionAvailable()
@ -572,7 +572,7 @@ class Note extends AbstractEntity {
return this.hasAttribute('label', 'archived');
}
get hasInheritableOwnedArchivedLabel() {
hasInheritableOwnedArchivedLabel() {
return !!this.ownedAttributes.find(attr => attr.type === 'label' && attr.name === 'archived' && attr.isInheritable);
}
@ -581,7 +581,7 @@ class Note extends AbstractEntity {
resortParents() {
this.parentBranches.sort((a, b) =>
a.branchId.startsWith('virt-')
|| a.parentNote.hasInheritableOwnedArchivedLabel ? 1 : -1);
|| a.parentNote.hasInheritableOwnedArchivedLabel() ? 1 : -1);
this.parents = this.parentBranches.map(branch => branch.parentNote);
}
@ -593,7 +593,7 @@ class Note extends AbstractEntity {
*
* @return {string} - returns flattened textual representation of note, prefixes and attributes
*/
get flatText() {
getFlatText() {
if (!this.flatTextCache) {
this.flatTextCache = this.noteId + ' ' + this.type + ' ' + this.mime + ' ';
@ -674,16 +674,16 @@ class Note extends AbstractEntity {
}
}
get isTemplate() {
isTemplate() {
return !!this.targetRelations.find(rel => rel.name === 'template');
}
/** @return {Note[]} */
get subtreeNotesIncludingTemplated() {
getSubtreeNotesIncludingTemplated() {
const arr = [[this]];
for (const childNote of this.children) {
arr.push(childNote.subtreeNotesIncludingTemplated);
arr.push(childNote.getSubtreeNotesIncludingTemplated());
}
for (const targetRelation of this.targetRelations) {
@ -691,7 +691,7 @@ class Note extends AbstractEntity {
const note = targetRelation.note;
if (note) {
arr.push(note.subtreeNotesIncludingTemplated);
arr.push(note.getSubtreeNotesIncludingTemplated());
}
}
}
@ -700,23 +700,23 @@ class Note extends AbstractEntity {
}
/** @return {Note[]} */
get subtreeNotes() {
getSubtreeNotes() {
const arr = [[this]];
for (const childNote of this.children) {
arr.push(childNote.subtreeNotes);
arr.push(childNote.getSubtreeNotes());
}
return arr.flat();
}
/** @return {String[]} */
get subtreeNoteIds() {
return this.subtreeNotes.map(note => note.noteId);
getSubtreeNoteIds() {
return this.getSubtreeNotes().map(note => note.noteId);
}
getDescendantNoteIds() {
return this.subtreeNoteIds;
return this.getSubtreeNoteIds();
}
get parentCount() {
@ -767,7 +767,7 @@ class Note extends AbstractEntity {
return this.getAttributes().length;
}
get ancestors() {
getAncestors() {
if (!this.ancestorCache) {
const noteIds = new Set();
this.ancestorCache = [];
@ -778,7 +778,7 @@ class Note extends AbstractEntity {
noteIds.add(parent.noteId);
}
for (const ancestorNote of parent.ancestors) {
for (const ancestorNote of parent.getAncestors()) {
if (!noteIds.has(ancestorNote.noteId)) {
this.ancestorCache.push(ancestorNote);
noteIds.add(ancestorNote.noteId);
@ -796,7 +796,7 @@ class Note extends AbstractEntity {
/** @return {Note[]} - returns only notes which are templated, does not include their subtrees
* in effect returns notes which are influenced by note's non-inheritable attributes */
get templatedNotes() {
getTemplatedNotes() {
const arr = [this];
for (const targetRelation of this.targetRelations) {
@ -879,7 +879,7 @@ class Note extends AbstractEntity {
}
}
else {
const Attribute = require("./attribute");
const Attribute = require("./attribute.js");
new Attribute({
noteId: this.noteId,
@ -911,7 +911,7 @@ class Note extends AbstractEntity {
* @return {Attribute}
*/
addAttribute(type, name, value = "", isInheritable = false, position = 1000) {
const Attribute = require("./attribute");
const Attribute = require("./attribute.js");
return new Attribute({
noteId: this.noteId,

14
src/services/becca/entities/note_revision.js → src/becca/entities/note_revision.js
View File

@ -1,12 +1,12 @@
"use strict";
const protectedSessionService = require('../../protected_session');
const utils = require('../../utils');
const sql = require('../../sql');
const dateUtils = require('../../date_utils');
const becca = require('../../becca/becca');
const entityChangesService = require('../../entity_changes');
const AbstractEntity = require("./abstract_entity");
const protectedSessionService = require('../../services/protected_session');
const utils = require('../../services/utils');
const sql = require('../../services/sql');
const dateUtils = require('../../services/date_utils');
const becca = require('../becca.js');
const entityChangesService = require('../../services/entity_changes');
const AbstractEntity = require("./abstract_entity.js");
/**
* NoteRevision represents snapshot of note's title and content at some point in the past. It's used for seamless note versioning.

2
src/services/becca/entities/option.js → src/becca/entities/option.js
View File

@ -1,6 +1,6 @@
"use strict";
const dateUtils = require('../../date_utils.js');
const dateUtils = require('../../services/date_utils.js');
const AbstractEntity = require("./abstract_entity.js");
/**

2
src/services/becca/entities/recent_note.js → src/becca/entities/recent_note.js
View File

@ -1,6 +1,6 @@
"use strict";
const dateUtils = require('../../date_utils.js');
const dateUtils = require('../../services/date_utils.js');
const AbstractEntity = require("./abstract_entity.js");
/**

22
src/entities/entity_constructor.js → src/becca/entity_constructor.js
View File

@ -1,11 +1,9 @@
const repository = require('../services/repository');
const Note = require('../entities/note');
const NoteRevision = require('../services/becca/entities/note_revision.js');
const Branch = require('../entities/branch');
const Attribute = require('../entities/attribute');
const RecentNote = require('../services/becca/entities/recent_note.js');
const ApiToken = require('../services/becca/entities/api_token.js');
const cls = require('../services/cls');
const Note = require('./entities/note.js');
const NoteRevision = require('./entities/note_revision.js');
const Branch = require('./entities/branch.js');
const Attribute = require('./entities/attribute.js');
const RecentNote = require('./entities/recent_note.js');
const ApiToken = require('./entities/api_token.js');
const ENTITY_NAME_TO_ENTITY = {
"attributes": Attribute,
@ -31,13 +29,9 @@ function createEntityFromRow(row) {
if (row.attributeId) {
entity = new Attribute(row);
cls.setEntityToCache('attributes', row.attributeId, entity);
}
else if (row.noteRevisionId) {
entity = new NoteRevision(row);
cls.setEntityToCache('note_revisions', row.noteRevisionId, entity);
}
else if (row.branchId && row.notePath) {
entity = new RecentNote(row);
@ -47,13 +41,9 @@ function createEntityFromRow(row) {
}
else if (row.branchId) {
entity = new Branch(row);
cls.setEntityToCache('branches', row.branchId, entity);
}
else if (row.noteId) {
entity = new Note(row);
cls.setEntityToCache('notes', row.noteId, entity);
}
else {
throw new Error('Unknown entity type for row: ' + JSON.stringify(row));

8
src/services/becca/similarity.js → src/becca/similarity.js
View File

@ -1,7 +1,7 @@
const becca = require('./becca.js');
const log = require('../log');
const log = require('../services/log');
const beccaService = require('./becca_service.js');
const dateUtils = require('../date_utils');
const dateUtils = require('../services/date_utils');
const { JSDOM } = require("jsdom");
const DEBUG = false;
@ -64,7 +64,7 @@ function buildRewardMap(note) {
}
}
for (const ancestorNote of note.ancestors) {
for (const ancestorNote of note.getAncestors()) {
if (ancestorNote.noteId === 'root') {
continue;
}
@ -249,7 +249,7 @@ async function findSimilarNotes(noteId) {
const rewardMap = buildRewardMap(baseNote);
let ancestorRewardCache = {};
const ancestorNoteIds = new Set(baseNote.ancestors.map(note => note.noteId));
const ancestorNoteIds = new Set(baseNote.getAncestors().map(note => note.noteId));
ancestorNoteIds.add(baseNote.noteId);
let displayRewards = false;

124
src/entities/attribute.js
View File

@ -1,124 +0,0 @@
"use strict";
const Entity = require('./entity');
const dateUtils = require('../services/date_utils');
const sql = require('../services/sql');
const promotedAttributeDefinitionParser = require("../services/promoted_attribute_definition_parser");
/**
* Attribute is key value pair owned by a note.
*
* @property {string} attributeId - immutable
* @property {string} noteId - immutable
* @property {string} type - immutable
* @property {string} name - immutable
* @property {string} value
* @property {int} position
* @property {boolean} isInheritable - immutable
* @property {boolean} isDeleted
* @property {string|null} deleteId - ID identifying delete transaction
* @property {string} utcDateModified
*
* @extends Entity
*/
class Attribute extends Entity {
static get entityName() { return "attributes"; }
static get primaryKeyName() { return "attributeId"; }
static get hashedProperties() { return ["attributeId", "noteId", "type", "name", "value", "isInheritable", "isDeleted"]; }
constructor(row) {
super(row);
this.isInheritable = !!this.isInheritable;
}
isAutoLink() {
return this.type === 'relation' && ['internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink'].includes(this.name);
}
/**
* @returns {Note|null}
*/
getNote() {
return this.becca.getNote(this.noteId);
}
/**
* @returns {Note|null}
*/
getTargetNote() {
if (this.type !== 'relation') {
throw new Error(`Attribute ${this.attributeId} is not relation`);
}
if (!this.value) {
return null;
}
return this.becca.getNote(this.value);
}
/**
* @return {boolean}
*/
isDefinition() {
return this.type === 'label' && (this.name.startsWith('label:') || this.name.startsWith('relation:'));
}
getDefinition() {
return promotedAttributeDefinitionParser.parse(this.value);
}
getDefinedName() {
if (this.type === 'label' && this.name.startsWith('label:')) {
return this.name.substr(6);
} else if (this.type === 'label' && this.name.startsWith('relation:')) {
return this.name.substr(9);
} else {
return this.name;
}
}
beforeSaving() {
if (!this.value) {
if (this.type === 'relation') {
throw new Error(`Cannot save relation ${this.name} since it does not target any note.`);
}
// null value isn't allowed
this.value = "";
}
if (this.position === undefined) {
this.position = 1 + sql.getValue(`SELECT COALESCE(MAX(position), 0) FROM attributes WHERE noteId = ?`, [this.noteId]);
}
if (!this.isInheritable) {
this.isInheritable = false;
}
if (!this.isDeleted) {
this.isDeleted = false;
}
super.beforeSaving();
this.utcDateModified = dateUtils.utcNowDateTime();
}
createClone(type, name, value, isInheritable) {
return new Attribute({
noteId: this.noteId,
type: type,
name: name,
value: value,
position: this.position,
isInheritable: isInheritable,
isDeleted: false,
utcDateModified: this.utcDateModified
});
}
}
module.exports = Attribute;

77
src/entities/branch.js
View File

@ -1,77 +0,0 @@
"use strict";
const Entity = require('./entity');
const dateUtils = require('../services/date_utils');
const sql = require('../services/sql');
/**
* Branch represents note's placement in the tree - it's essentially pair of noteId and parentNoteId.
* Each note can have multiple (at least one) branches, meaning it can be placed into multiple places in the tree.
*
* @property {string} branchId - primary key, immutable
* @property {string} noteId - immutable
* @property {string} parentNoteId - immutable
* @property {int} notePosition
* @property {string} prefix
* @property {boolean} isExpanded
* @property {boolean} isDeleted
* @property {string|null} deleteId - ID identifying delete transaction
* @property {string} utcDateModified
* @property {string} utcDateCreated
*
* @extends Entity
*/
class Branch extends Entity {
static get entityName() { return "branches"; }
static get primaryKeyName() { return "branchId"; }
// notePosition is not part of hash because it would produce a lot of updates in case of reordering
static get hashedProperties() { return ["branchId", "noteId", "parentNoteId", "isDeleted", "deleteId", "prefix"]; }
/** @returns {Note|null} */
getNote() {
return this.becca.getNote(this.noteId);
}
/** @returns {Note|null} */
getParentNote() {
return this.becca.getNote(this.parentNoteId);
}
beforeSaving() {
if (this.notePosition === undefined || this.notePosition === null) {
const maxNotePos = sql.getValue('SELECT MAX(notePosition) FROM branches WHERE parentNoteId = ? AND isDeleted = 0', [this.parentNoteId]);
this.notePosition = maxNotePos === null ? 0 : maxNotePos + 10;
}
if (!this.isExpanded) {
this.isExpanded = false;
}
if (!this.isDeleted) {
this.isDeleted = false;
}
if (!this.utcDateCreated) {
this.utcDateCreated = dateUtils.utcNowDateTime();
}
super.beforeSaving();
this.utcDateModified = dateUtils.utcNowDateTime();
}
createClone(parentNoteId, notePosition) {
return new Branch({
noteId: this.noteId,
parentNoteId: parentNoteId,
notePosition: notePosition,
prefix: this.prefix,
isExpanded: this.isExpanded,
isDeleted: false,
utcDateCreated: this.utcDateCreated,
utcDateModified: this.utcDateModified
});
}
}
module.exports = Branch;

62
src/entities/entity.js
View File

@ -1,62 +0,0 @@
"use strict";
const utils = require('../services/utils');
let repo = null;
class Entity {
/**
* @param {object} [row] - database row representing given entity
*/
constructor(row = {}) {
for (const key in row) {
// ! is used when joint-fetching notes and note_contents objects for performance
if (!key.startsWith('!')) {
this[key] = row[key];
}
}
if ('isDeleted' in this && this.constructor.entityName !== 'recent_notes') {
this.isDeleted = !!this.isDeleted;
}
}
beforeSaving() {
this.generateIdIfNecessary();
}
generateIdIfNecessary() {
if (!this[this.constructor.primaryKeyName]) {
this[this.constructor.primaryKeyName] = utils.newEntityId();
}
}
generateHash() {
let contentToHash = "";
for (const propertyName of this.constructor.hashedProperties) {
contentToHash += "|" + this[propertyName];
}
return utils.hash(contentToHash).substr(0, 10);
}
getUtcDateChanged() {
return this.utcDateModified || this.utcDateCreated;
}
get repository() {
if (!repo) {
repo = require('../services/repository');
}
return repo;
}
save() {
this.repository.updateEntity(this);
return this;
}
}
module.exports = Entity;

957
src/entities/note.js
View File

@ -1,957 +0,0 @@
"use strict";
const Entity = require('./entity');
const Attribute = require('./attribute');
const protectedSessionService = require('../services/protected_session');
const sql = require('../services/sql');
const utils = require('../services/utils');
const dateUtils = require('../services/date_utils');
const entityChangesService = require('../services/entity_changes.js');
const LABEL = 'label';
const RELATION = 'relation';
/**
* This represents a Note which is a central object in the Trilium Notes project.
*
* @property {string} noteId - primary key
* @property {string} type - one of "text", "code", "file" or "render"
* @property {string} mime - MIME type, e.g. "text/html"
* @property {string} title - note title
* @property {boolean} isProtected - true if note is protected
* @property {boolean} isDeleted - true if note is deleted
* @property {string|null} deleteId - ID identifying delete transaction
* @property {string} dateCreated - local date time (with offset)
* @property {string} dateModified - local date time (with offset)
* @property {string} utcDateCreated
* @property {string} utcDateModified
*
* @extends Entity
*/
class Note extends Entity {
static get entityName() { return "notes"; }
static get primaryKeyName() { return "noteId"; }
static get hashedProperties() { return ["noteId", "title", "type", "mime", "isProtected", "isDeleted", "deleteId"]; }
/**
* @param row - object containing database row from "notes" table
*/
constructor(row) {
super(row);
this.isProtected = !!this.isProtected;
/* true if content is either not encrypted
* or encrypted, but with available protected session (so effectively decrypted) */
this.isContentAvailable = true;
// check if there's noteId, otherwise this is a new entity which wasn't encrypted yet
if (this.isProtected && this.noteId) {
this.isContentAvailable = protectedSessionService.isProtectedSessionAvailable();
if (this.isContentAvailable) {
try {
this.title = protectedSessionService.decryptString(this.title);
}
catch (e) {
throw new Error(`Could not decrypt title of note ${this.noteId}: ${e.message} ${e.stack}`)
}
}
else {
this.title = "[protected]";
}
}
}
/*
* Note content has quite special handling - it's not a separate entity, but a lazily loaded
* part of Note entity with it's own sync. Reasons behind this hybrid design has been:
*
* - content can be quite large and it's not necessary to load it / fill memory for any note access even if we don't need a content, especially for bulk operations like search
* - changes in the note metadata or title should not trigger note content sync (so we keep separate utcDateModified and entity changes records)
* - but to the user note content and title changes are one and the same - single dateModified (so all changes must go through Note and content is not a separate entity)
*/
/** @returns {*} */
getContent(silentNotFoundError = false) {
if (this.content === undefined) {
const row = sql.getRow(`SELECT content FROM note_contents WHERE noteId = ?`, [this.noteId]);
if (!row) {
if (silentNotFoundError) {
return undefined;
}
else {
throw new Error("Cannot find note content for noteId=" + this.noteId);
}
}
this.content = row.content;
if (this.isProtected) {
if (this.isContentAvailable) {
this.content = this.content === null ? null : protectedSessionService.decrypt(this.content);
}
else {
this.content = "";
}
}
}
if (this.isStringNote()) {
return this.content === null
? ""
: this.content.toString("UTF-8");
}
else {
return this.content;
}
}
/** @returns {{contentLength, dateModified, utcDateModified}} */
getContentMetadata() {
return sql.getRow(`
SELECT
LENGTH(content) AS contentLength,
dateModified,
utcDateModified
FROM note_contents
WHERE noteId = ?`, [this.noteId]);
}
/** @returns {*} */
getJsonContent() {
const content = this.getContent();
if (!content || !content.trim()) {
return null;
}
return JSON.parse(content);
}
setContent(content) {
if (content === null || content === undefined) {
throw new Error(`Cannot set null content to note ${this.noteId}`);
}
if (this.isStringNote()) {
content = content.toString();
}
else {
content = Buffer.isBuffer(content) ? content : Buffer.from(content);
}
this.content = content;
const pojo = {
noteId: this.noteId,
content: content,
dateModified: dateUtils.localNowDateTime(),
utcDateModified: dateUtils.utcNowDateTime()
};
if (this.isProtected) {
if (this.isContentAvailable) {
pojo.content = protectedSessionService.encrypt(pojo.content);
}
else {
throw new Error(`Cannot update content of noteId=${this.noteId} since we're out of protected session.`);
}
}
sql.upsert("note_contents", "noteId", pojo);
const hash = utils.hash(this.noteId + "|" + pojo.content.toString());
entityChangesService.addEntityChange({
entityName: 'note_contents',
entityId: this.noteId,
hash: hash,
isErased: false,
utcDateChanged: pojo.utcDateModified
}, null);
}
setJsonContent(content) {
this.setContent(JSON.stringify(content, null, '\t'));
}
/** @returns {boolean} true if this note is the root of the note tree. Root note has "root" noteId */
isRoot() {
return this.noteId === 'root';
}
/** @returns {boolean} true if this note is of application/json content type */
isJson() {
return this.mime === "application/json";
}
/** @returns {boolean} true if this note is JavaScript (code or attachment) */
isJavaScript() {
return (this.type === "code" || this.type === "file")
&& (this.mime.startsWith("application/javascript")
|| this.mime === "application/x-javascript"
|| this.mime === "text/javascript");
}
/** @returns {boolean} true if this note is HTML */
isHtml() {
return (this.type === "code" || this.type === "file" || this.type === "render") && this.mime === "text/html";
}
/** @returns {boolean} true if the note has string content (not binary) */
isStringNote() {
return utils.isStringNote(this.type, this.mime);
}
/** @returns {string} JS script environment - either "frontend" or "backend" */
getScriptEnv() {
if (this.isHtml() || (this.isJavaScript() && this.mime.endsWith('env=frontend'))) {
return "frontend";
}
if (this.type === 'render') {
return "frontend";
}
if (this.isJavaScript() && this.mime.endsWith('env=backend')) {
return "backend";
}
return null;
}
loadOwnedAttributesToCache() {
this.__ownedAttributeCache = this.repository.getEntities(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`, [this.noteId]);
return this.__ownedAttributeCache;
}
/**
* This method is a faster variant of getAttributes() which looks for only owned attributes.
* Use when inheritance is not needed and/or in batch/performance sensitive operations.
*
* @param {string} [type] - (optional) attribute type to filter
* @param {string} [name] - (optional) attribute name to filter
* @returns {Attribute[]} note's "owned" attributes - excluding inherited ones
*/
getOwnedAttributes(type, name) {
if (!this.__ownedAttributeCache) {
this.loadOwnedAttributesToCache();
}
if (type && name) {
return this.__ownedAttributeCache.filter(attr => attr.type === type && attr.name === name);
}
else if (type) {
return this.__ownedAttributeCache.filter(attr => attr.type === type);
}
else if (name) {
return this.__ownedAttributeCache.filter(attr => attr.name === name);
}
else {
return this.__ownedAttributeCache.slice();
}
}
/**
* @returns {Attribute} attribute belonging to this specific note (excludes inherited attributes)
*
* This method can be significantly faster than the getAttribute()
*/
getOwnedAttribute(type, name) {
const attrs = this.getOwnedAttributes(type, name);
return attrs.length > 0 ? attrs[0] : null;
}
/**
* @returns {Attribute[]} relations targetting this specific note
*/
getTargetRelations() {
return this.repository.getEntities("SELECT * FROM attributes WHERE type = 'relation' AND isDeleted = 0 AND value = ?", [this.noteId]);
}
/**
* @param {string} [type] - (optional) attribute type to filter
* @param {string} [name] - (optional) attribute name to filter
* @returns {Attribute[]} all note's attributes, including inherited ones
*/
getAttributes(type, name) {
if (!this.__attributeCache) {
this.loadAttributesToCache();
}
if (type && name) {
return this.__attributeCache.filter(attr => attr.type === type && attr.name === name);
}
else if (type) {
return this.__attributeCache.filter(attr => attr.type === type);
}
else if (name) {
return this.__attributeCache.filter(attr => attr.name === name);
}
else {
return this.__attributeCache.slice();
}
}
/**
* @param {string} [name] - label name to filter
* @returns {Attribute[]} all note's labels (attributes with type label), including inherited ones
*/
getLabels(name) {
return this.getAttributes(LABEL, name);
}
/**
* @param {string} [name] - label name to filter
* @returns {string[]} all note's label values, including inherited ones
*/
getLabelValues(name) {
return this.getLabels(name).map(l => l.value);
}
/**
* @param {string} [name] - label name to filter
* @returns {Attribute[]} all note's labels (attributes with type label), excluding inherited ones
*/
getOwnedLabels(name) {
return this.getOwnedAttributes(LABEL, name);
}
/**
* @param {string} [name] - label name to filter
* @returns {string[]} all note's label values, excluding inherited ones
*/
getOwnedLabelValues(name) {
return this.getOwnedAttributes(LABEL, name).map(l => l.value);
}
/**
* @param {string} [name] - relation name to filter
* @returns {Attribute[]} all note's relations (attributes with type relation), including inherited ones
*/
getRelations(name) {
return this.getAttributes(RELATION, name);
}
/**
* @param {string} [name] - relation name to filter
* @returns {Attribute[]} all note's relations (attributes with type relation), excluding inherited ones
*/
getOwnedRelations(name) {
return this.getOwnedAttributes(RELATION, name);
}
/**
* @param {string} [name] - relation name to filter
* @returns {Note[]}
*/
getRelationTargets(name) {
const relations = this.getRelations(name);
const targets = [];
for (const relation of relations) {
targets.push(relation.getTargetNote());
}
return targets;
}
/**
* Clear note's attributes cache to force fresh reload for next attribute request.
* Cache is note instance scoped.
*/
invalidateAttributeCache() {
this.__attributeCache = null;
this.__ownedAttributeCache = null;
}
loadAttributesToCache() {
const attributes = this.repository.getEntities(`
WITH RECURSIVE
tree(noteId, level) AS (
SELECT ?, 0
UNION
SELECT branches.parentNoteId, tree.level + 1
FROM branches
JOIN tree ON branches.noteId = tree.noteId
WHERE branches.isDeleted = 0
),
treeWithAttrs(noteId, level) AS (
SELECT * FROM tree
UNION
SELECT attributes.value, treeWithAttrs.level FROM attributes
JOIN treeWithAttrs ON treeWithAttrs.noteId = attributes.noteId
WHERE attributes.isDeleted = 0
AND attributes.type = 'relation'
AND attributes.name = 'template'
)
SELECT attributes.* FROM attributes JOIN treeWithAttrs ON attributes.noteId = treeWithAttrs.noteId
WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR treeWithAttrs.level = 0)
ORDER BY level, noteId, position`, [this.noteId]);
// attributes are ordered so that "closest" attributes are first
// we order by noteId so that attributes from same note stay together. Actual noteId ordering doesn't matter.
const filteredAttributes = attributes.filter((attr, index) => {
// if this exact attribute already appears then don't include it (can happen via cloning)
if (attributes.findIndex(it => it.attributeId === attr.attributeId) !== index) {
return false;
}
// FIXME: this code is quite questionable, one problem is that other caches (Froca, Becca) have nothing like that
if (attr.isDefinition()) {
const firstDefinitionIndex = attributes.findIndex(el => el.type === attr.type && el.name === attr.name);
// keep only if this element is the first definition for this type & name
return firstDefinitionIndex === index;
}
else {
const definitionAttr = attributes.find(el => el.type === 'label' && el.name === attr.type + ':' + attr.name);
if (!definitionAttr) {
return true;
}
const definition = definitionAttr.getDefinition();
if (definition.multiplicity === 'multi') {
return true;
}
else {
const firstAttrIndex = attributes.findIndex(el => el.type === attr.type && el.name === attr.name);
// in case of single-valued attribute we'll keep it only if it's first (closest)
return firstAttrIndex === index;
}
}
});
this.__attributeCache = filteredAttributes;
}
/**
* @param {string} type - attribute type (label, relation, etc.)
* @param {string} name - attribute name
* @returns {boolean} true if note has an attribute with given type and name (including inherited)
*/
hasAttribute(type, name) {
return !!this.getAttribute(type, name);
}
/**
* @param {string} type - attribute type (label, relation, etc.)
* @param {string} name - attribute name
* @returns {boolean} true if note has an attribute with given type and name (excluding inherited)
*/
hasOwnedAttribute(type, name) {
return !!this.getOwnedAttribute(type, name);
}
/**
* @param {string} type - attribute type (label, relation, etc.)
* @param {string} name - attribute name
* @returns {Attribute} attribute of given type and name. If there's more such attributes, first is returned. Returns null if there's no such attribute belonging to this note.
*/
getAttribute(type, name) {
const attributes = this.getAttributes();
return attributes.find(attr => attr.type === type && attr.name === name);
}
/**
* @param {string} type - attribute type (label, relation, etc.)
* @param {string} name - attribute name
* @returns {string|null} attribute value of given type and name or null if no such attribute exists.
*/
getAttributeValue(type, name) {
const attr = this.getAttribute(type, name);
return attr ? attr.value : null;
}
/**
* @param {string} type - attribute type (label, relation, etc.)
* @param {string} name - attribute name
* @returns {string|null} attribute value of given type and name or null if no such attribute exists.
*/
getOwnedAttributeValue(type, name) {
const attr = this.getOwnedAttribute(type, name);
return attr ? attr.value : null;
}
/**
* Based on enabled, attribute is either set or removed.
*
* @param {string} type - attribute type ('relation', 'label' etc.)
* @param {boolean} enabled - toggle On or Off
* @param {string} name - attribute name
* @param {string} [value] - attribute value (optional)
*/
toggleAttribute(type, enabled, name, value) {
if (enabled) {
this.setAttribute(type, name, value);
}
else {
this.removeAttribute(type, name, value);
}
}
/**
* Update's given attribute's value or creates it if it doesn't exist
*
* @param {string} type - attribute type (label, relation, etc.)
* @param {string} name - attribute name
* @param {string} [value] - attribute value (optional)
*/
setAttribute(type, name, value) {
const attributes = this.loadOwnedAttributesToCache();
let attr = attributes.find(attr => attr.type === type && attr.name === name);
if (attr) {
if (attr.value !== value) {
attr.value = value;
attr.save();
this.invalidateAttributeCache();
}
}
else {
attr = new Attribute({
noteId: this.noteId,
type: type,
name: name,
value: value !== undefined ? value : ""
});
attr.save();
this.invalidateAttributeCache();
}
}
/**
* Removes given attribute name-value pair if it exists.
*
* @param {string} type - attribute type (label, relation, etc.)
* @param {string} name - attribute name
* @param {string} [value] - attribute value (optional)
*/
removeAttribute(type, name, value) {
const attributes = this.loadOwnedAttributesToCache();
for (const attribute of attributes) {
if (attribute.type === type && attribute.name === name && (value === undefined || value === attribute.value)) {
attribute.markAsDeleted();
this.invalidateAttributeCache();
}
}
}
/**
* @return {Attribute}
*/
addAttribute(type, name, value = "", isInheritable = false, position = 1000) {
const attr = new Attribute({
noteId: this.noteId,
type: type,
name: name,
value: value,
isInheritable: isInheritable,
position: position
});
attr.save();
this.invalidateAttributeCache();
return attr;
}
addLabel(name, value = "", isInheritable = false) {
return this.addAttribute(LABEL, name, value, isInheritable);
}
addRelation(name, targetNoteId, isInheritable = false) {
return this.addAttribute(RELATION, name, targetNoteId, isInheritable);
}
/**
* @param {string} name - label name
* @returns {boolean} true if label exists (including inherited)
*/
hasLabel(name) { return this.hasAttribute(LABEL, name); }
/**
* @param {string} name - label name
* @returns {boolean} true if label exists (excluding inherited)
*/
hasOwnedLabel(name) { return this.hasOwnedAttribute(LABEL, name); }
/**
* @param {string} name - relation name
* @returns {boolean} true if relation exists (including inherited)
*/
hasRelation(name) { return this.hasAttribute(RELATION, name); }
/**
* @param {string} name - relation name
* @returns {boolean} true if relation exists (excluding inherited)
*/
hasOwnedRelation(name) { return this.hasOwnedAttribute(RELATION, name); }
/**
* @param {string} name - label name
* @returns {Attribute|null} label if it exists, null otherwise
*/
getLabel(name) { return this.getAttribute(LABEL, name); }
/**
* @param {string} name - label name
* @returns {Attribute|null} label if it exists, null otherwise
*/
getOwnedLabel(name) { return this.getOwnedAttribute(LABEL, name); }
/**
* @param {string} name - relation name
* @returns {Attribute|null} relation if it exists, null otherwise
*/
getRelation(name) { return this.getAttribute(RELATION, name); }
/**
* @param {string} name - relation name
* @returns {Attribute|null} relation if it exists, null otherwise
*/
getOwnedRelation(name) { return this.getOwnedAttribute(RELATION, name); }
/**
* @param {string} name - label name
* @returns {string|null} label value if label exists, null otherwise
*/
getLabelValue(name) { return this.getAttributeValue(LABEL, name); }
/**
* @param {string} name - label name
* @returns {string|null} label value if label exists, null otherwise
*/
getOwnedLabelValue(name) { return this.getOwnedAttributeValue(LABEL, name); }
/**
* @param {string} name - relation name
* @returns {string|null} relation value if relation exists, null otherwise
*/
getRelationValue(name) { return this.getAttributeValue(RELATION, name); }
/**
* @param {string} name - relation name
* @returns {string|null} relation value if relation exists, null otherwise
*/
getOwnedRelationValue(name) { return this.getOwnedAttributeValue(RELATION, name); }
/**
* @param {string} name
* @returns {Note|null} target note of the relation or null (if target is empty or note was not found)
*/
getRelationTarget(name) {
const relation = this.getRelation(name);
return relation ? this.becca.getNote(relation.value) : null;
}
/**
* @param {string} name
* @returns {Note|null} target note of the relation or null (if target is empty or note was not found)
*/
getOwnedRelationTarget(name) {
const relation = this.getOwnedRelation(name);
return relation ? this.becca.getNote(relation.value) : null;
}
/**
* Based on enabled, label is either set or removed.
*
* @param {boolean} enabled - toggle On or Off
* @param {string} name - label name
* @param {string} [value] - label value (optional)
*/
toggleLabel(enabled, name, value) { return this.toggleAttribute(LABEL, enabled, name, value); }
/**
* Based on enabled, relation is either set or removed.
*
* @param {boolean} enabled - toggle On or Off
* @param {string} name - relation name
* @param {string} [value] - relation value (noteId)
*/
toggleRelation(enabled, name, value) { return this.toggleAttribute(RELATION, enabled, name, value); }
/**
* Update's given label's value or creates it if it doesn't exist
*
* @param {string} name - label name
* @param {string} [value] - label value
*/
setLabel(name, value) { return this.setAttribute(LABEL, name, value); }
/**
* Update's given relation's value or creates it if it doesn't exist
*
* @param {string} name - relation name
* @param {string} value - relation value (noteId)
*/
setRelation(name, value) { return this.setAttribute(RELATION, name, value); }
/**
* Remove label name-value pair, if it exists.
*
* @param {string} name - label name
* @param {string} [value] - label value
*/
removeLabel(name, value) { return this.removeAttribute(LABEL, name, value); }
/**
* Remove relation name-value pair, if it exists.
*
* @param {string} name - relation name
* @param {string} [value] - relation value (noteId)
*/
removeRelation(name, value) { return this.removeAttribute(RELATION, name, value); }
/**
* @return {string[]} return list of all descendant noteIds of this note. Returning just noteIds because number of notes can be huge. Includes also this note's noteId
*/
getDescendantNoteIds() {
return sql.getColumn(`
WITH RECURSIVE
tree(noteId) AS (
SELECT ?
UNION
SELECT branches.noteId FROM branches
JOIN tree ON branches.parentNoteId = tree.noteId
JOIN notes ON notes.noteId = branches.noteId
WHERE notes.isDeleted = 0
AND branches.isDeleted = 0
)
SELECT noteId FROM tree`, [this.noteId]);
}
/**
* Finds descendant notes with given attribute name and value. Only own attributes are considered, not inherited ones
*
* @param {string} type - attribute type (label, relation, etc.)
* @param {string} name - attribute name
* @param {string} [value] - attribute value
* @returns {Note[]}
*/
getDescendantNotesWithAttribute(type, name, value) {
const params = [this.noteId, name];
let valueCondition = "";
if (value !== undefined) {
params.push(value);
valueCondition = " AND attributes.value = ?";
}
const notes = this.repository.getEntities(`
WITH RECURSIVE
tree(noteId) AS (
SELECT ?
UNION
SELECT branches.noteId FROM branches
JOIN tree ON branches.parentNoteId = tree.noteId
JOIN notes ON notes.noteId = branches.noteId
WHERE notes.isDeleted = 0
AND branches.isDeleted = 0
)
SELECT notes.* FROM notes
JOIN tree ON tree.noteId = notes.noteId
JOIN attributes ON attributes.noteId = notes.noteId
WHERE attributes.isDeleted = 0
AND attributes.name = ?
${valueCondition}
ORDER BY noteId, position`, params);
return notes;
}
/**
* Finds descendant notes with given label name and value. Only own labels are considered, not inherited ones
*
* @param {string} name - label name
* @param {string} [value] - label value
* @returns {Note[]}
*/
getDescendantNotesWithLabel(name, value) { return this.getDescendantNotesWithAttribute(LABEL, name, value); }
/**
* Finds descendant notes with given relation name and value. Only own relations are considered, not inherited ones
*
* @param {string} name - relation name
* @param {string} [value] - relation value
* @returns {Note[]}
*/
getDescendantNotesWithRelation(name, value) { return this.getDescendantNotesWithAttribute(RELATION, name, value); }
/**
* Returns note revisions of this note.
*
* @returns {NoteRevision[]}
*/
getNoteRevisions() {
return this.repository.getEntities("SELECT * FROM note_revisions WHERE noteId = ?", [this.noteId]);
}
/**
* Get list of links coming out of this note.
*
* @deprecated - not intended for general use
* @returns {Attribute[]}
*/
getLinks() {
return this.repository.getEntities(`
SELECT *
FROM attributes
WHERE noteId = ? AND
isDeleted = 0 AND
type = 'relation' AND
name IN ('internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink')`, [this.noteId]);
}
/**
* @returns {Branch[]}
*/
getBranches() {
return this.repository.getEntities("SELECT * FROM branches WHERE isDeleted = 0 AND noteId = ?", [this.noteId]);
}
/**
* @returns {boolean} - true if note has children
*/
hasChildren() {
return this.getChildNotes().length > 0;
}
/**
* @returns {Note[]} child notes of this note
*/
getChildNotes() {
return this.repository.getEntities(`
SELECT notes.*
FROM branches
JOIN notes USING(noteId)
WHERE notes.isDeleted = 0
AND branches.isDeleted = 0
AND branches.parentNoteId = ?
ORDER BY branches.notePosition`, [this.noteId]);
}
/**
* @returns {Branch[]} child branches of this note
*/
getChildBranches() {
return this.repository.getEntities(`
SELECT branches.*
FROM branches
WHERE branches.isDeleted = 0
AND branches.parentNoteId = ?
ORDER BY branches.notePosition`, [this.noteId]);
}
/**
* @returns {Note[]} parent notes of this note (note can have multiple parents because of cloning)
*/
getParentNotes() {
return this.repository.getEntities(`
SELECT parent_notes.*
FROM
branches AS child_tree
JOIN notes AS parent_notes ON parent_notes.noteId = child_tree.parentNoteId
WHERE child_tree.noteId = ?
AND child_tree.isDeleted = 0
AND parent_notes.isDeleted = 0`, [this.noteId]);
}
/**
* @return {string[][]} - array of notePaths (each represented by array of noteIds constituting the particular note path)
*/
getAllNotePaths() {
if (this.noteId === 'root') {
return [['root']];
}
const notePaths = [];
for (const parentNote of this.getParentNotes()) {
for (const parentPath of parentNote.getAllNotePaths()) {
parentPath.push(this.noteId);
notePaths.push(parentPath);
}
}
return notePaths;
}
getRelationDefinitions() {
return this.getLabels()
.filter(l => l.name.startsWith("relation:"));
}
getLabelDefinitions() {
return this.getLabels()
.filter(l => l.name.startsWith("relation:"));
}
/**
* @param ancestorNoteId
* @return {boolean} - true if ancestorNoteId occurs in at least one of the note's paths
*/
isDescendantOfNote(ancestorNoteId) {
const notePaths = this.getAllNotePaths();
return notePaths.some(path => path.includes(ancestorNoteId));
}
beforeSaving() {
if (!this.isDeleted) {
this.isDeleted = false;
}
if (!this.dateCreated) {
this.dateCreated = dateUtils.localNowDateTime();
}
if (!this.utcDateCreated) {
this.utcDateCreated = dateUtils.utcNowDateTime();
}
super.beforeSaving();
this.dateModified = dateUtils.localNowDateTime();
this.utcDateModified = dateUtils.utcNowDateTime();
}
// cannot be static!
updatePojo(pojo) {
if (pojo.isProtected) {
if (this.isContentAvailable) {
pojo.title = protectedSessionService.encrypt(pojo.title);
}
else {
// updating protected note outside of protected session means we will keep original ciphertexts
delete pojo.title;
}
}
delete pojo.isContentAvailable;
delete pojo.__attributeCache;
delete pojo.__ownedAttributeCache;
delete pojo.content;
/** zero references to contentHash, probably can be removed */
delete pojo.contentHash;
}
}
module.exports = Note;

14
src/public/app/services/entrypoints.js
View File

@ -128,20 +128,6 @@ export default class Entrypoints extends Component {
}
}
toggleZenModeCommand() {
if (!this.zenModeActive) {
$(".hide-in-zen-mode,.gutter").addClass("hidden-by-zen-mode");
$("#root-widget").addClass("zen-mode");
this.zenModeActive = true;
}
else {
// not hiding / showing explicitly since element might be hidden also for other reasons
$(".hide-in-zen-mode,.gutter").removeClass("hidden-by-zen-mode");
$("#root-widget").removeClass("zen-mode");
this.zenModeActive = false;
}
}
reloadFrontendAppCommand() {
utils.reloadApp();
}

17
src/public/app/widgets/containers/root_container.js
View File

@ -22,6 +22,23 @@ export default class RootContainer extends FlexContainer {
this.$widget.toggleClass("protected", note.isProtected);
}
this.setZenMode(this.isZenModeActive);
}
setZenMode(active) {
this.isZenModeActive = active;
if (this.isZenModeActive) {
$("#root-widget").addClass("zen-mode");
}
else {
$("#root-widget").removeClass("zen-mode");
}
}
toggleZenModeEvent() {
this.setZenMode(!this.isZenModeActive);
}
tabNoteSwitchedEvent() {

28
src/public/stylesheets/style.css
View File

@ -103,26 +103,6 @@ span.fancytree-node.muted { opacity: 0.6; }
display: none;
}
.note-tab-content-template {
display: none !important;
}
.note-tab-content {
display: flex;
flex-direction: row;
height: 100%;
width: 100%;
}
/** we disable shield background when in zen mode because I couldn't get it to stay static
(it kept growing with content) */
#root-widget:not(.zen-mode) .note-tab-content.protected {
/* DON'T COLLAPSE THE RULES INTO SINGLE ONE, BACKGROUND WON'T DISPLAY */
background: url('../images/shield.svg') no-repeat;
background-size: contain;
background-position: center;
}
.zen-mode #center-pane {
width: 100% !important;
/* limit max width to improve readability */
@ -131,6 +111,10 @@ span.fancytree-node.muted { opacity: 0.6; }
margin-right: auto;
}
.zen-mode .hide-in-zen-mode, .zen-mode .gutter {
display: none !important;
}
.ui-autocomplete {
max-height: 300px;
overflow-y: auto;
@ -775,10 +759,6 @@ body {
font-size: var(--main-font-size);
}
.hidden-by-zen-mode {
display: none !important;
}
.gutter {
background: linear-gradient(to bottom, transparent, var(--accented-background-color), transparent);
}

46
src/routes/api/attributes.js
View File

@ -3,9 +3,8 @@
const sql = require('../../services/sql');
const log = require('../../services/log');
const attributeService = require('../../services/attributes');
const repository = require('../../services/repository');
const Attribute = require('../../services/becca/entities/attribute');
const becca = require("../../services/becca/becca");
const Attribute = require('../../becca/entities/attribute.js');
const becca = require("../../becca/becca.js");
function getEffectiveNoteAttributes(req) {
const note = becca.getNote(req.params.noteId);
@ -48,10 +47,11 @@ function updateNoteAttribute(req) {
return {};
}
attribute = new Attribute();
attribute.noteId = noteId;
attribute.name = body.name;
attribute.type = body.type;
attribute = new Attribute({
noteId: noteId,
name: body.name,
type: body.type
});
}
if (attribute.type === 'label' || body.value.trim()) {
@ -73,16 +73,17 @@ function setNoteAttribute(req) {
const noteId = req.params.noteId;
const body = req.body;
let attr = repository.getEntity(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ? AND type = ? AND name = ?`, [noteId, body.type, body.name]);
const attributeId = sql.getValue(`SELECT attributeId FROM attributes WHERE isDeleted = 0 AND noteId = ? AND type = ? AND name = ?`, [noteId, body.type, body.name]);
if (attr) {
if (attributeId) {
const attr = becca.getAttribute(attributeId);
attr.value = body.value;
attr.save();
} else {
attr = new Attribute(body);
const attr = new Attribute(body);
attr.noteId = noteId;
attr.save();
}
attr.save();
}
function addNoteAttribute(req) {
@ -195,16 +196,16 @@ function createRelation(req) {
const targetNoteId = req.params.targetNoteId;
const name = req.params.name;
let attribute = repository.getEntity(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ? AND type = 'relation' AND name = ? AND value = ?`, [sourceNoteId, name, targetNoteId]);
const attributeId = sql.getValue(`SELECT attributeId FROM attributes WHERE isDeleted = 0 AND noteId = ? AND type = 'relation' AND name = ? AND value = ?`, [sourceNoteId, name, targetNoteId]);
let attribute = becca.getAttribute(attributeId);
if (!attribute) {
attribute = new Attribute();
attribute.noteId = sourceNoteId;
attribute.name = name;
attribute.type = 'relation';
attribute.value = targetNoteId;
attribute.save();
attribute = new Attribute({
noteId: sourceNoteId,
name: name,
type: 'relation',
value: targetNoteId
}).save();
}
return attribute;
@ -215,9 +216,10 @@ function deleteRelation(req) {
const targetNoteId = req.params.targetNoteId;
const name = req.params.name;
let attribute = repository.getEntity(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ? AND type = 'relation' AND name = ? AND value = ?`, [sourceNoteId, name, targetNoteId]);
const attributeId = sql.getValue(`SELECT attributeId FROM attributes WHERE isDeleted = 0 AND noteId = ? AND type = 'relation' AND name = ? AND value = ?`, [sourceNoteId, name, targetNoteId]);
if (attribute) {
if (attributeId) {
const attribute = becca.getAttribute(attributeId);
attribute.markAsDeleted();
}
}

5
src/routes/api/autocomplete.js
View File

@ -1,12 +1,11 @@
"use strict";
const beccaService = require('../../services/becca/becca_service.js');
const beccaService = require('../../becca/becca_service.js');
const searchService = require('../../services/search/services/search.js');
const repository = require('../../services/repository');
const log = require('../../services/log');
const utils = require('../../services/utils');
const cls = require('../../services/cls');
const becca = require("../../services/becca/becca");
const becca = require("../../becca/becca.js");
function getAutocomplete(req) {
const query = req.query.query.trim();

3
src/routes/api/branches.js
View File

@ -5,8 +5,7 @@ const utils = require('../../services/utils');
const entityChangesService = require('../../services/entity_changes.js');
const treeService = require('../../services/tree');
const noteService = require('../../services/notes');
const becca = require('../../services/becca/becca.js');
const repository = require('../../services/repository');
const becca = require('../../becca/becca.js');
const TaskContext = require('../../services/task_context');
/**

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

@ -10,7 +10,7 @@ const ws = require('../../services/ws.js');
const log = require('../../services/log');
const utils = require('../../services/utils');
const path = require('path');
const Attribute = require('../../services/becca/entities/attribute');
const Attribute = require('../../becca/entities/attribute.js');
const htmlSanitizer = require('../../services/html_sanitizer');
function findClippingNote(todayNote, pageUrl) {

1
src/routes/api/export.js
View File

@ -3,7 +3,6 @@
const zipExportService = require('../../services/export/zip');
const singleExportService = require('../../services/export/single');
const opmlExportService = require('../../services/export/opml');
const repository = require("../../services/repository");
const TaskContext = require("../../services/task_context");
const log = require("../../services/log");

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

@ -9,7 +9,7 @@ const fs = require('fs');
const { Readable } = require('stream');
const chokidar = require('chokidar');
const ws = require('../../services/ws');
const becca = require("../../services/becca/becca");
const becca = require("../../becca/becca.js");
function updateFile(req) {
const {noteId} = req.params;

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

@ -1,7 +1,7 @@
"use strict";
const imageService = require('../../services/image');
const becca = require('../../services/becca/becca');
const becca = require('../../becca/becca.js');
const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
const fs = require('fs');

3
src/routes/api/import.js
View File

@ -1,13 +1,12 @@
"use strict";
const repository = require('../../services/repository');
const enexImportService = require('../../services/import/enex');
const opmlImportService = require('../../services/import/opml');
const zipImportService = require('../../services/import/zip');
const singleImportService = require('../../services/import/single');
const cls = require('../../services/cls');
const path = require('path');
const beccaLoader = require('../../services/becca/becca_loader.js');
const beccaLoader = require('../../becca/becca_loader.js');
const log = require('../../services/log');
const TaskContext = require('../../services/task_context.js');

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

@ -11,7 +11,7 @@ const eventService = require('../../services/events');
const sqlInit = require('../../services/sql_init');
const sql = require('../../services/sql');
const optionService = require('../../services/options');
const ApiToken = require('../../services/becca/entities/api_token.js');
const ApiToken = require('../../becca/entities/api_token.js');
const ws = require("../../services/ws.js");
function loginSync(req) {

5
src/routes/api/note_revisions.js
View File

@ -1,13 +1,12 @@
"use strict";
const repository = require('../../services/repository');
const beccaService = require('../../services/becca/becca_service.js');
const beccaService = require('../../becca/becca_service.js');
const protectedSessionService = require('../../services/protected_session');
const noteRevisionService = require('../../services/note_revisions');
const utils = require('../../services/utils');
const sql = require('../../services/sql');
const path = require('path');
const becca = require("../../services/becca/becca");
const becca = require("../../becca/becca.js");
function getNoteRevisions(req) {
return becca.getNoteRevisionsFromQuery(`

5
src/routes/api/notes.js
View File

@ -2,14 +2,13 @@
const noteService = require('../../services/notes');
const treeService = require('../../services/tree');
const repository = require('../../services/repository');
const sql = require('../../services/sql');
const utils = require('../../services/utils');
const log = require('../../services/log');
const TaskContext = require('../../services/task_context');
const fs = require('fs');
const noteRevisionService = require("../../services/note_revisions.js");
const becca = require("../../services/becca/becca");
const becca = require("../../becca/becca.js");
function getNote(req) {
const noteId = req.params.noteId;
@ -196,7 +195,7 @@ function changeTitle(req) {
return [404, `Note ${noteId} has not been found`];
}
if (!note.isContentAvailable) {
if (!note.isContentAvailable()) {
return [400, `Note ${noteId} is not available for change`];
}

2
src/routes/api/recent_changes.js
View File

@ -3,7 +3,7 @@
const sql = require('../../services/sql');
const protectedSessionService = require('../../services/protected_session');
const noteService = require('../../services/notes');
const beccaService = require('../../services/becca/becca_service.js');
const beccaService = require('../../becca/becca_service.js');
function getRecentChanges(req) {
const {ancestorNoteId} = req.params;

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

@ -1,6 +1,6 @@
"use strict";
const RecentNote = require('../../services/becca/entities/recent_note.js');
const RecentNote = require('../../becca/entities/recent_note.js');
const sql = require('../../services/sql');
const dateUtils = require('../../services/date_utils');

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

@ -2,7 +2,7 @@
const scriptService = require('../../services/script');
const attributeService = require('../../services/attributes');
const becca = require('../../services/becca/becca');
const becca = require('../../becca/becca.js');
const syncService = require('../../services/sync');
function exec(req) {

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

@ -1,6 +1,6 @@
"use strict";
const becca = require('../../services/becca/becca');
const becca = require('../../becca/becca.js');
const SearchContext = require('../../services/search/search_context');
const log = require('../../services/log');
const scriptService = require('../../services/script');
@ -182,7 +182,7 @@ function searchFromRelation(note, relationName) {
return [];
}
if (!note.isContentAvailable) {
if (!note.isContentAvailable()) {
log.info(`Note ${scriptNote.noteId} is not available outside of protected session.`);
return [];

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

@ -1,7 +1,7 @@
"use strict";
const similarityService = require('../../services/becca/similarity.js');
const becca = require("../../services/becca/becca");
const similarityService = require('../../becca/similarity.js');
const becca = require("../../becca/becca.js");
async function getSimilarNotes(req) {
const noteId = req.params.noteId;

1
src/routes/api/sql.js
View File

@ -1,7 +1,6 @@
"use strict";
const sql = require('../../services/sql');
const repository = require('../../services/repository');
function getSchema() {
const tableNames = sql.getColumn(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY name`);

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

@ -1,5 +1,5 @@
const sql = require('../../services/sql');
const becca = require('../../services/becca/becca.js');
const becca = require('../../becca/becca.js');
function getNoteSize(req) {
const {noteId} = req.params;
@ -29,7 +29,7 @@ function getSubtreeSize(req) {
return [404, `Note ${noteId} was not found.`];
}
const subTreeNoteIds = note.subtreeNotes.map(note => note.noteId);
const subTreeNoteIds = note.getSubtreeNotes().map(note => note.noteId);
sql.fillParamList(subTreeNoteIds);

1
src/routes/api/sync.js
View File

@ -10,7 +10,6 @@ const contentHashService = require('../../services/content_hash');
const log = require('../../services/log');
const syncOptions = require('../../services/sync_options');
const dateUtils = require('../../services/date_utils');
const entityConstructor = require('../../entities/entity_constructor');
const utils = require('../../services/utils');
async function testSync() {

2
src/routes/api/tree.js
View File

@ -1,6 +1,6 @@
"use strict";
const becca = require('../../services/becca/becca.js');
const becca = require('../../becca/becca.js');
const log = require('../../services/log');
function getNotesAndBranchesAndAttributes(noteIds) {

3
src/routes/custom.js
View File

@ -1,10 +1,9 @@
const repository = require('../services/repository');
const log = require('../services/log');
const fileUploadService = require('./api/files.js');
const scriptService = require('../services/script');
const cls = require('../services/cls');
const sql = require("../services/sql");
const becca = require("../services/becca/becca");
const becca = require("../becca/becca.js");
function handleRequest(req, res) {
// express puts content after first slash into 0 index element

4
src/services/attributes.js
View File

@ -2,8 +2,8 @@
const searchService = require('./search/services/search');
const sql = require('./sql');
const becca = require('./becca/becca.js');
const Attribute = require('./becca/entities/attribute');
const becca = require('../becca/becca.js');
const Attribute = require('../becca/entities/attribute.js');
const {formatAttrForSearch} = require("./attribute_formatter.js");
const ATTRIBUTE_TYPES = [ 'label', 'relation' ];

3
src/services/backend_script_api.js
View File

@ -6,7 +6,6 @@ const attributeService = require('./attributes');
const dateNoteService = require('./date_notes');
const treeService = require('./tree');
const config = require('./config');
const repository = require('./repository');
const axios = require('axios');
const dayjs = require('dayjs');
const xml2js = require('xml2js');
@ -14,7 +13,7 @@ const cloningService = require('./cloning');
const appInfo = require('./app_info');
const searchService = require('./search/services/search');
const SearchContext = require("./search/search_context.js");
const becca = require("./becca/becca");
const becca = require("../becca/becca.js");
/**
* This is the main backend API interface for scripts. It's published in the local "api" object.

2
src/services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2021-04-26T22:32:54+02:00", buildRevision: "6f1b0b92fe8dcea736c15217c69512c7fee769cb" };
module.exports = { buildDate:"2021-05-15T23:05:20+02:00", buildRevision: "f6dd1110e842a8b84f2bbdaadad315763045c152" };

4
src/services/cloning.js
View File

@ -4,10 +4,10 @@ const sql = require('./sql');
const eventChangesService = require('./entity_changes.js');
const treeService = require('./tree');
const noteService = require('./notes');
const Branch = require('../services/becca/entities/branch');
const Branch = require('../becca/entities/branch.js');
const TaskContext = require("./task_context.js");
const utils = require('./utils');
const becca = require("./becca/becca");
const becca = require("../becca/becca.js");
function cloneNoteToParent(noteId, parentBranchId, prefix) {
const parentBranch = becca.getBranch(parentBranchId);

10
src/services/cls.js
View File

@ -72,14 +72,6 @@ function reset() {
clsHooked.reset();
}
function getEntityFromCache(entityName, entityId) {
return namespace.get(entityName + '-' + entityId);
}
function setEntityToCache(entityName, entityId, entity) {
namespace.set(entityName + '-' + entityId, entity);
}
function ignoreEntityChanges() {
namespace.set('ignoreEntityChanges', true);
}
@ -99,7 +91,5 @@ module.exports = {
clearEntityChanges,
getAndClearEntityChanges,
addEntityChange,
getEntityFromCache,
setEntityToCache,
ignoreEntityChanges
};

9
src/services/consistency_checks.js
View File

@ -5,15 +5,14 @@ const sqlInit = require('./sql_init');
const log = require('./log');
const ws = require('./ws.js');
const syncMutexService = require('./sync_mutex');
const repository = require('./repository');
const cls = require('./cls');
const entityChangesService = require('./entity_changes.js');
const optionsService = require('./options');
const Branch = require('../services/becca/entities/branch');
const Branch = require('../becca/entities/branch.js');
const dateUtils = require('./date_utils');
const attributeService = require('./attributes');
const noteRevisionService = require('./note_revisions');
const becca = require("./becca/becca");
const becca = require("../becca/becca.js");
class ConsistencyChecks {
constructor(autoFix) {
@ -459,7 +458,7 @@ class ConsistencyChecks {
entity_changes.id IS NULL AND ` + (entityName === 'options' ? 'options.isSynced = 1' : '1'),
({entityId}) => {
if (this.autoFix) {
const entity = repository.getEntity(`SELECT * FROM ${entityName} WHERE ${key} = ?`, [entityId]);
const entity = becca.getEntity(entityName, entityId);
entityChangesService.addEntityChange({
entityName,
@ -580,7 +579,7 @@ class ConsistencyChecks {
}
if (this.fixedIssues) {
require("../services/becca/becca_loader").load();
require("../becca/becca_loader.js").load();
}
return !this.unrecoveredConsistencyErrors;

2
src/services/date_notes.js
View File

@ -3,7 +3,7 @@
const noteService = require('./notes');
const attributeService = require('./attributes');
const dateUtils = require('./date_utils');
const becca = require('./becca/becca');
const becca = require('../becca/becca.js');
const sql = require('./sql');
const protectedSessionService = require('./protected_session');

4
src/services/entity_changes.js
View File

@ -3,6 +3,7 @@ const sourceIdService = require('./source_id');
const dateUtils = require('./date_utils');
const log = require('./log');
const cls = require('./cls');
const becca = require("../becca/becca.js");
let maxEntityChangeId = 0;
@ -82,7 +83,6 @@ function cleanupEntityChangesForMissingEntities(entityName, entityPrimaryKey) {
function fillEntityChanges(entityName, entityPrimaryKey, condition = '') {
try {
cleanupEntityChangesForMissingEntities(entityName, entityPrimaryKey);
const repository = require("./repository.js");
sql.transactional(() => {
const entityIds = sql.getColumn(`SELECT ${entityPrimaryKey} FROM ${entityName}`
@ -97,7 +97,7 @@ function fillEntityChanges(entityName, entityPrimaryKey, condition = '') {
if (existingRows === 0) {
createdCount++;
const entity = repository.getEntity(`SELECT * FROM ${entityName} WHERE ${entityPrimaryKey} = ?`, [entityId]);
const entity = becca.getEntity(entityName, entityId);
addEntityChange({
entityName,

3
src/services/export/opml.js
View File

@ -1,8 +1,7 @@
"use strict";
const repository = require("../repository");
const utils = require('../utils');
const becca = require("../becca/becca");
const becca = require("../../becca/becca.js");
function exportToOpml(taskContext, branch, version, res) {
if (!['1.0', '2.0'].includes(version)) {

1
src/services/export/zip.js
View File

@ -1,7 +1,6 @@
"use strict";
const html = require('html');
const repository = require('../repository');
const dateUtils = require('../date_utils');
const path = require('path');
const mimeTypes = require('mime-types');

6
src/services/handlers.js
View File

@ -2,8 +2,8 @@ const eventService = require('./events');
const scriptService = require('./script');
const treeService = require('./tree');
const noteService = require('./notes');
const becca = require('./becca/becca.js');
const Attribute = require('./becca/entities/attribute');
const becca = require('../becca/becca.js');
const Attribute = require('../becca/entities/attribute.js');
function runAttachedRelations(note, relationName, originEntity) {
// same script note can get here with multiple ways, but execute only once
@ -89,7 +89,7 @@ eventService.subscribe(eventService.ENTITY_CREATED, ({ entityName, entity }) =>
const note = becca.notes[entity.noteId];
if (note) {
for (const noteId of note.subtreeNoteIds) {
for (const noteId of note.getSubtreeNoteIds()) {
treeService.sortNotesByTitle(noteId);
}
}

2
src/services/image.js
View File

@ -1,6 +1,6 @@
"use strict";
const becca = require('./becca/becca');
const becca = require('../becca/becca.js');
const log = require('./log');
const protectedSessionService = require('./protected_session');
const noteService = require('./notes');

6
src/services/import/zip.js
View File

@ -1,11 +1,11 @@
"use strict";
const Attribute = require('../../services/becca/entities/attribute');
const Attribute = require('../../becca/entities/attribute.js');
const utils = require('../../services/utils');
const log = require('../../services/log');
const noteService = require('../../services/notes');
const attributeService = require('../../services/attributes');
const Branch = require('../../services/becca/entities/branch');
const Branch = require('../../becca/entities/branch.js');
const path = require('path');
const commonmark = require('commonmark');
const protectedSessionService = require('../protected_session');
@ -13,7 +13,7 @@ const mimeService = require("./mime");
const treeService = require("../tree");
const yauzl = require("yauzl");
const htmlSanitizer = require('../html_sanitizer');
const becca = require("../becca/becca.js");
const becca = require("../../becca/becca.js");
/**
* @param {TaskContext} taskContext

2
src/services/note_revisions.js
View File

@ -1,6 +1,6 @@
"use strict";
const NoteRevision = require('./becca/entities/note_revision.js');
const NoteRevision = require('../becca/entities/note_revision.js');
const dateUtils = require('./date_utils');
const log = require('./log');
const sql = require('./sql');

10
src/services/notes.js
View File

@ -13,10 +13,10 @@ const attributeService = require('../services/attributes');
const request = require('./request');
const path = require('path');
const url = require('url');
const becca = require('../services/becca/becca');
const Branch = require('../services/becca/entities/branch');
const Note = require('../services/becca/entities/note');
const Attribute = require('../services/becca/entities/attribute');
const becca = require('../becca/becca.js');
const Branch = require('../becca/entities/branch.js');
const Note = require('../becca/entities/note.js');
const Attribute = require('../becca/entities/attribute.js');
function getNewNotePosition(parentNoteId) {
const note = becca.notes[parentNoteId];
@ -475,7 +475,7 @@ function saveNoteRevision(note) {
function updateNote(noteId, noteUpdates) {
const note = becca.getNote(noteId);
if (!note.isContentAvailable) {
if (!note.isContentAvailable()) {
throw new Error(`Note ${noteId} is not available for change!`);
}

6
src/services/options.js
View File

@ -1,7 +1,7 @@
const becca = require('./becca/becca');
const becca = require('../becca/becca.js');
function getOption(name) {
const option = require('./becca/becca').getOption(name);
const option = require('../becca/becca.js').getOption(name);
if (!option) {
throw new Error(`Option "${name}" doesn't exist`);
@ -57,7 +57,7 @@ function setOption(name, value) {
function createOption(name, value, isSynced) {
// to avoid circular dependency, need to find better solution
const Option = require('../services/becca/entities/option');
const Option = require('../becca/entities/option.js');
new Option({
name: name,

146
src/services/repository.js
View File

@ -1,146 +0,0 @@
"use strict";
const sql = require('./sql');
const entityChangesService = require('./entity_changes.js');
const eventService = require('./events');
const cls = require('./cls');
const entityConstructor = require('../entities/entity_constructor');
function getEntities(query, params = []) {
const rows = sql.getRows(query, params);
return rows.map(entityConstructor.createEntityFromRow);
}
function getEntity(query, params = []) {
const row = sql.getRowOrNull(query, params);
if (!row) {
return null;
}
return entityConstructor.createEntityFromRow(row);
}
function getCachedEntity(entityName, entityId, query) {
let entity = cls.getEntityFromCache(entityName, entityId);
if (!entity) {
entity = getEntity(query, [entityId]);
cls.setEntityToCache(entityName, entityId, entity);
}
return entity;
}
/** @returns {Note|null} */
function getNote(noteId) {
return getCachedEntity('notes', noteId, "SELECT * FROM notes WHERE noteId = ?");
}
/** @returns {Note[]} */
function getNotes(noteIds) {
// this note might be optimised, but remember that it must keep the existing order of noteIds
// (important e.g. for @orderBy in search)
const notes = [];
for (const noteId of noteIds) {
const note = getNote(noteId);
notes.push(note);
}
return notes;
}
/** @returns {NoteRevision|null} */
function getNoteRevision(noteRevisionId) {
return getCachedEntity('note_revisions', noteRevisionId, "SELECT * FROM note_revisions WHERE noteRevisionId = ?");
}
/** @returns {Branch|null} */
function getBranch(branchId) {
return getCachedEntity('branches', branchId, "SELECT * FROM branches WHERE branchId = ?", [branchId]);
}
/** @returns {Attribute|null} */
function getAttribute(attributeId) {
return getCachedEntity('attributes', attributeId, "SELECT * FROM attributes WHERE attributeId = ?");
}
/** @returns {Option|null} */
function getOption(name) {
return getEntity("SELECT * FROM options WHERE name = ?", [name]);
}
function updateEntity(entity) {
const entityName = entity.constructor.entityName;
const primaryKeyName = entity.constructor.primaryKeyName;
const isNewEntity = !entity[primaryKeyName];
if (entity.beforeSaving) {
entity.beforeSaving();
}
let clone;
if (entity.getPojo) {
clone = entity.getPojo();
}
else {
// FIXME: delete this branch after migration to becca
clone = Object.assign({}, entity);
// this check requires that updatePojo is not static
if (entity.updatePojo) {
entity.updatePojo(clone);
}
}
for (const key in clone) {
// !isBuffer is for images and attachments
if (clone[key] !== null && typeof clone[key] === 'object' && !Buffer.isBuffer(clone[key])) {
clone[key] = JSON.stringify(clone[key]);
}
}
sql.transactional(() => {
sql.upsert(entityName, primaryKeyName, clone);
if (entityName === 'recent_notes') {
return;
}
const entityId = entity[primaryKeyName];
const isSynced = entityName !== 'options' || entity.isSynced;
entityChangesService.addEntityChange({
entityName,
entityId,
hash: entity.generateHash(),
isErased: false,
utcDateChanged: entity.getUtcDateChanged()
}, null, isSynced);
if (!cls.isEntityEventsDisabled()) {
const eventPayload = {
entityName,
entity
};
if (isNewEntity && !entity.isDeleted) {
eventService.emit(eventService.ENTITY_CREATED, eventPayload);
}
eventService.emit(entity.isDeleted ? eventService.ENTITY_DELETED : eventService.ENTITY_CHANGED, eventPayload);
}
});
}
module.exports = {
getEntities,
updateEntity
};

2
src/services/scheduler.js
View File

@ -4,7 +4,7 @@ const sqlInit = require('./sql_init');
const config = require('./config');
const log = require('./log');
const sql = require("./sql");
const becca = require("./becca/becca");
const becca = require("../becca/becca.js");
function getRunAtHours(note) {
try {

8
src/services/script.js
View File

@ -1,10 +1,10 @@
const ScriptContext = require('./script_context');
const cls = require('./cls');
const log = require('./log');
const becca = require("./becca/becca");
const becca = require("../becca/becca.js");
function executeNote(note, apiParams) {
if (!note.isJavaScript() || note.getScriptEnv() !== 'backend' || !note.isContentAvailable) {
if (!note.isJavaScript() || note.getScriptEnv() !== 'backend' || !note.isContentAvailable()) {
log.info(`Cannot execute note ${note.noteId} "${note.title}", note must be of type "Code: JS frontend"`);
return;
@ -57,7 +57,7 @@ function executeBundle(bundle, apiParams = {}) {
function executeScript(script, params, startNoteId, currentNoteId, originEntityName, originEntityId) {
const startNote = becca.getNote(startNoteId);
const currentNote = becca.getNote(currentNoteId);
const originEntity = becca.getEntityFromName(originEntityName, originEntityId);
const originEntity = becca.getEntity(originEntityName, originEntityId);
// we're just executing an excerpt of the original frontend script in the backend context so we must
// override normal note's content and it's mime type / script environment
@ -105,7 +105,7 @@ function getScriptBundleForFrontend(note) {
}
function getScriptBundle(note, root = true, scriptEnv = null, includedNoteIds = [], backendOverrideContent = null) {
if (!note.isContentAvailable) {
if (!note.isContentAvailable()) {
return;
}

4
src/services/search/expressions/ancestor.js
View File

@ -3,7 +3,7 @@
const Expression = require('./expression');
const NoteSet = require('../note_set');
const log = require('../../log');
const becca = require('../../becca/becca.js');
const becca = require('../../../becca/becca.js');
class AncestorExp extends Expression {
constructor(ancestorNoteId, ancestorDepth) {
@ -23,7 +23,7 @@ class AncestorExp extends Expression {
return new NoteSet([]);
}
const subTreeNoteSet = new NoteSet(ancestorNote.subtreeNotes).intersection(inputNoteSet);
const subTreeNoteSet = new NoteSet(ancestorNote.getSubtreeNotes()).intersection(inputNoteSet);
if (!this.ancestorDepthComparator) {
return subTreeNoteSet;

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

@ -1,7 +1,7 @@
"use strict";
const NoteSet = require('../note_set');
const becca = require('../../becca/becca.js');
const becca = require('../../../becca/becca.js');
const Expression = require('./expression');
class AttributeExistsExp extends Expression {
@ -25,10 +25,10 @@ class AttributeExistsExp extends Expression {
if (inputNoteSet.hasNoteId(note.noteId)) {
if (attr.isInheritable) {
resultNoteSet.addAll(note.subtreeNotesIncludingTemplated);
resultNoteSet.addAll(note.getSubtreeNotesIncludingTemplated());
}
else if (note.isTemplate) {
resultNoteSet.addAll(note.templatedNotes);
else if (note.isTemplate()) {
resultNoteSet.addAll(note.getTemplatedNotes());
}
else {
resultNoteSet.add(note);

4
src/services/search/expressions/descendant_of.js
View File

@ -2,7 +2,7 @@
const Expression = require('./expression');
const NoteSet = require('../note_set');
const becca = require('../../becca/becca.js');
const becca = require('../../../becca/becca.js');
class DescendantOfExp extends Expression {
constructor(subExpression) {
@ -18,7 +18,7 @@ class DescendantOfExp extends Expression {
const subTreeNoteSet = new NoteSet();
for (const note of subResNoteSet.notes) {
subTreeNoteSet.addAll(note.subtreeNotes);
subTreeNoteSet.addAll(note.getSubtreeNotes());
}
return inputNoteSet.intersection(subTreeNoteSet);

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

@ -2,7 +2,7 @@
const Expression = require('./expression');
const NoteSet = require('../note_set');
const becca = require('../../becca/becca.js');
const becca = require('../../../becca/becca.js');
class LabelComparisonExp extends Expression {
constructor(attributeType, attributeName, comparator) {
@ -23,10 +23,10 @@ class LabelComparisonExp extends Expression {
if (inputNoteSet.hasNoteId(note.noteId) && this.comparator(value)) {
if (attr.isInheritable) {
resultNoteSet.addAll(note.subtreeNotesIncludingTemplated);
resultNoteSet.addAll(note.getSubtreeNotesIncludingTemplated());
}
else if (note.isTemplate) {
resultNoteSet.addAll(note.templatedNotes);
else if (note.isTemplate()) {
resultNoteSet.addAll(note.getTemplatedNotes());
}
else {
resultNoteSet.add(note);

6
src/services/search/expressions/note_cache_flat_text.js
View File

@ -2,7 +2,7 @@
const Expression = require('./expression');
const NoteSet = require('../note_set');
const becca = require('../../becca/becca.js');
const becca = require('../../../becca/becca.js');
class BeccaFlatTextExp extends Expression {
constructor(tokens) {
@ -13,7 +13,7 @@ class BeccaFlatTextExp extends Expression {
execute(inputNoteSet, executionContext) {
// has deps on SQL which breaks unit test so needs to be dynamically required
const beccaService = require('../../becca/becca_service.js');
const beccaService = require('../../../becca/becca_service.js');
const resultNoteSet = new NoteSet();
function searchDownThePath(note, tokens, path) {
@ -129,7 +129,7 @@ class BeccaFlatTextExp extends Expression {
for (const note of noteSet.notes) {
for (const token of this.tokens) {
if (note.flatText.includes(token)) {
if (note.getFlatText().includes(token)) {
candidateNotes.push(note);
break;
}

2
src/services/search/expressions/note_content_protected_fulltext.js
View File

@ -3,7 +3,7 @@
const Expression = require('./expression');
const NoteSet = require('../note_set');
const log = require('../../log');
const becca = require('../../becca/becca.js');
const becca = require('../../../becca/becca.js');
const protectedSessionService = require('../../protected_session');
const striptags = require('striptags');

2
src/services/search/expressions/note_content_unprotected_fulltext.js
View File

@ -2,7 +2,7 @@
const Expression = require('./expression');
const NoteSet = require('../note_set');
const becca = require('../../becca/becca.js');
const becca = require('../../../becca/becca.js');
const striptags = require('striptags');
class NoteContentUnprotectedFulltextExp extends Expression {

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

@ -2,7 +2,7 @@
const Expression = require('./expression');
const NoteSet = require('../note_set');
const becca = require('../../becca/becca.js');
const becca = require('../../../becca/becca.js');
class RelationWhereExp extends Expression {
constructor(relationName, subExpression) {
@ -24,9 +24,9 @@ class RelationWhereExp extends Expression {
if (subResNoteSet.hasNote(attr.targetNote)) {
if (attr.isInheritable) {
candidateNoteSet.addAll(note.subtreeNotesIncludingTemplated);
} else if (note.isTemplate) {
candidateNoteSet.addAll(note.templatedNotes);
candidateNoteSet.addAll(note.getSubtreeNotesIncludingTemplated());
} else if (note.isTemplate()) {
candidateNoteSet.addAll(note.getTemplatedNotes());
} else {
candidateNoteSet.add(note);
}

2
src/services/search/search_result.js
View File

@ -1,6 +1,6 @@
"use strict";
const beccaService = require('../becca/becca_service.js');
const beccaService = require('../../becca/becca_service.js');
class SearchResult {
constructor(notePathArray) {

6
src/services/search/services/search.js
View File

@ -6,8 +6,8 @@ const parse = require('./parse.js');
const NoteSet = require("../note_set.js");
const SearchResult = require("../search_result.js");
const SearchContext = require("../search_context.js");
const becca = require('../../becca/becca.js');
const beccaService = require('../../becca/becca_service.js');
const becca = require('../../../becca/becca.js');
const beccaService = require('../../../becca/becca_service.js');
const utils = require('../../utils.js');
const log = require('../../log.js');
@ -153,6 +153,8 @@ function findResultsWithQuery(query, searchContext) {
const expression = parseQueryToExpression(query, searchContext);
console.log("expression", expression);
if (!expression) {
return [];
}

3
src/services/setup.js
View File

@ -1,13 +1,12 @@
const syncService = require('./sync');
const log = require('./log');
const sqlInit = require('./sql_init');
const repository = require('./repository');
const optionService = require('./options');
const syncOptions = require('./sync_options');
const request = require('./request');
const appInfo = require('./app_info');
const utils = require('./utils');
const becca = require("./becca/becca");
const becca = require("../becca/becca.js");
async function hasSyncServerSchemaAndSeed() {
const response = await requestToSyncServer('GET', '/api/setup/status');

2
src/services/sql.js
View File

@ -249,7 +249,7 @@ function transactional(func) {
if (entityChanges.length > 0) {
log.info("Transaction rollback dirtied the becca, forcing reload.");
require('./becca/becca_loader.js').load();
require('../becca/becca_loader.js').load();
}
throw e;

8
src/services/sql_init.js
View File

@ -5,7 +5,7 @@ const sql = require('./sql');
const utils = require('./utils');
const optionService = require('./options');
const port = require('./port');
const Option = require('./becca/entities/option');
const Option = require('../becca/entities/option.js');
const TaskContext = require('./task_context.js');
const migrationService = require('./migration');
const cls = require('./cls');
@ -60,10 +60,10 @@ async function createInitialDatabase(username, password, theme) {
sql.transactional(() => {
sql.executeScript(schema);
require("./becca/becca_loader").load();
require("../becca/becca_loader.js").load();
const Note = require("./becca/entities/note");
const Branch = require("./becca/entities/branch");
const Note = require("../becca/entities/note.js");
const Branch = require("../becca/entities/branch.js");
rootNote = new Note({
noteId: 'root',

5
src/services/sync.js
View File

@ -2,7 +2,6 @@
const log = require('./log');
const sql = require('./sql');
const sqlInit = require('./sql_init');
const optionService = require('./options');
const utils = require('./utils');
const sourceIdService = require('./source_id');
@ -16,7 +15,7 @@ const cls = require('./cls');
const request = require('./request');
const ws = require('./ws');
const entityChangesService = require('./entity_changes.js');
const entityConstructor = require('../entities/entity_constructor');
const entityConstructor = require('../becca/entity_constructor.js');
let proxyToggle = true;
@ -386,7 +385,7 @@ function getOutstandingPullCount() {
return outstandingPullCount;
}
require("./becca/becca_loader").beccaLoaded.then(() => {
require("../becca/becca_loader.js").beccaLoaded.then(() => {
setInterval(cls.wrap(sync), 60000);
// kickoff initial sync immediately

2
src/services/sync_update.js
View File

@ -2,7 +2,7 @@ const sql = require('./sql');
const log = require('./log');
const entityChangesService = require('./entity_changes.js');
const eventService = require('./events');
const entityConstructor = require('../entities/entity_constructor');
const entityConstructor = require("../becca/entity_constructor.js");
function updateEntity(entityChange, entity, sourceId) {
// can be undefined for options with isSynced=false

4
src/services/tree.js
View File

@ -2,10 +2,10 @@
const sql = require('./sql');
const log = require('./log');
const Branch = require('../services/becca/entities/branch');
const Branch = require('../becca/entities/branch.js');
const entityChangesService = require('./entity_changes.js');
const protectedSessionService = require('./protected_session');
const becca = require('./becca/becca.js');
const becca = require('../becca/becca.js');
function getNotes(noteIds) {
// we return also deleted notes which have been specifically asked for

1
src/tools/generate_document.js
View File

@ -9,7 +9,6 @@ const noteService = require('../services/notes');
const attributeService = require('../services/attributes');
const cls = require('../services/cls');
const cloningService = require('../services/cloning');
const repository = require('../services/repository');
const noteRevisionService = require('../services/note_revisions');
const loremIpsum = require('lorem-ipsum').loremIpsum;