mirror of
https://github.com/zadam/trilium.git
synced 2025-06-06 18:08:33 +02:00
moved becca to top level source dir
This commit is contained in:
parent
8bd3e17a3b
commit
439ef4a8cb
@ -1,7 +1,7 @@
|
|||||||
const Note = require('../../src/services/becca/entities/note.js');
|
const Note = require('../../src/becca/entities/note.js');
|
||||||
const Branch = require('../../src/services/becca/entities/branch.js');
|
const Branch = require('../../src/becca/entities/branch.js');
|
||||||
const Attribute = require('../../src/services/becca/entities/attribute.js');
|
const Attribute = require('../../src/becca/entities/attribute.js');
|
||||||
const becca = require('../../src/services/becca/becca.js');
|
const becca = require('../../src/becca/becca.js');
|
||||||
const randtoken = require('rand-token').generator({source: 'crypto'});
|
const randtoken = require('rand-token').generator({source: 'crypto'});
|
||||||
|
|
||||||
/** @return {Note} */
|
/** @return {Note} */
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
const searchService = require('../../src/services/search/services/search.js');
|
const searchService = require('../../src/services/search/services/search.js');
|
||||||
const Note = require('../../src/services/becca/entities/note.js');
|
const Note = require('../../src/becca/entities/note.js');
|
||||||
const Branch = require('../../src/services/becca/entities/branch.js');
|
const Branch = require('../../src/becca/entities/branch.js');
|
||||||
const SearchContext = require('../../src/services/search/search_context.js');
|
const SearchContext = require('../../src/services/search/search_context.js');
|
||||||
const dateUtils = require('../../src/services/date_utils.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');
|
const {NoteBuilder, findNoteByTitle, note} = require('./note_cache_mocking.js');
|
||||||
|
|
||||||
describe("Search", () => {
|
describe("Search", () => {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
const {note} = require('./note_cache_mocking.js');
|
const {note} = require('./note_cache_mocking.js');
|
||||||
const ValueExtractor = require('../../src/services/search/value_extractor.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 SearchContext = require("../../src/services/search/search_context.js");
|
||||||
|
|
||||||
const dsc = new SearchContext();
|
const dsc = new SearchContext();
|
||||||
|
@ -10,7 +10,7 @@ const FileStore = require('session-file-store')(session);
|
|||||||
const sessionSecret = require('./services/session_secret');
|
const sessionSecret = require('./services/session_secret');
|
||||||
const dataDir = require('./services/data_dir');
|
const dataDir = require('./services/data_dir');
|
||||||
require('./services/handlers');
|
require('./services/handlers');
|
||||||
require('./services/becca/becca_loader.js');
|
require('./becca/becca_loader.js');
|
||||||
|
|
||||||
const app = express();
|
const app = express();
|
||||||
|
|
||||||
|
@ -1,21 +1,21 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const sql = require('../sql.js');
|
const sql = require('../services/sql.js');
|
||||||
const eventService = require('../events.js');
|
const eventService = require('../services/events.js');
|
||||||
const becca = require('./becca.js');
|
const becca = require('./becca.js');
|
||||||
const sqlInit = require('../sql_init');
|
const sqlInit = require('../services/sql_init');
|
||||||
const log = require('../log');
|
const log = require('../services/log');
|
||||||
const Note = require('./entities/note');
|
const Note = require('./entities/note.js');
|
||||||
const Branch = require('./entities/branch');
|
const Branch = require('./entities/branch.js');
|
||||||
const Attribute = require('./entities/attribute');
|
const Attribute = require('./entities/attribute.js');
|
||||||
const Option = require('./entities/option');
|
const Option = require('./entities/option.js');
|
||||||
const cls = require("../cls.js");
|
const cls = require("../services/cls.js");
|
||||||
|
|
||||||
const beccaLoaded = new Promise((res, rej) => {
|
const beccaLoaded = new Promise((res, rej) => {
|
||||||
sqlInit.dbReady.then(() => {
|
sqlInit.dbReady.then(() => {
|
||||||
load();
|
load();
|
||||||
|
|
||||||
cls.init(() => require('../options_init').initStartupOptions());
|
cls.init(() => require('../services/options_init').initStartupOptions());
|
||||||
|
|
||||||
res();
|
res();
|
||||||
});
|
});
|
@ -1,11 +1,11 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const utils = require('../../utils');
|
const utils = require('../../services/utils');
|
||||||
const sql = require('../../sql');
|
const sql = require('../../services/sql');
|
||||||
const entityChangesService = require('../../entity_changes');
|
const entityChangesService = require('../../services/entity_changes');
|
||||||
const eventService = require("../../events");
|
const eventService = require("../../services/events");
|
||||||
const dateUtils = require("../../date_utils");
|
const dateUtils = require("../../services/date_utils");
|
||||||
const cls = require("../../cls");
|
const cls = require("../../services/cls");
|
||||||
|
|
||||||
let becca = null;
|
let becca = null;
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ class AbstractEntity {
|
|||||||
|
|
||||||
get becca() {
|
get becca() {
|
||||||
if (!becca) {
|
if (!becca) {
|
||||||
becca = require('../becca');
|
becca = require('../becca.js');
|
||||||
}
|
}
|
||||||
|
|
||||||
return becca;
|
return becca;
|
@ -1,13 +1,13 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const protectedSessionService = require('../../protected_session');
|
const protectedSessionService = require('../../services/protected_session');
|
||||||
const log = require('../../log');
|
const log = require('../../services/log');
|
||||||
const sql = require('../../sql');
|
const sql = require('../../services/sql');
|
||||||
const utils = require('../../utils');
|
const utils = require('../../services/utils');
|
||||||
const dateUtils = require('../../date_utils');
|
const dateUtils = require('../../services/date_utils');
|
||||||
const entityChangesService = require('../../entity_changes');
|
const entityChangesService = require('../../services/entity_changes');
|
||||||
const AbstractEntity = require("./abstract_entity");
|
const AbstractEntity = require("./abstract_entity.js");
|
||||||
const NoteRevision = require("./note_revision");
|
const NoteRevision = require("./note_revision.js");
|
||||||
|
|
||||||
const LABEL = 'label';
|
const LABEL = 'label';
|
||||||
const RELATION = 'relation';
|
const RELATION = 'relation';
|
||||||
@ -879,7 +879,7 @@ class Note extends AbstractEntity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
const Attribute = require("./attribute");
|
const Attribute = require("./attribute.js");
|
||||||
|
|
||||||
new Attribute({
|
new Attribute({
|
||||||
noteId: this.noteId,
|
noteId: this.noteId,
|
||||||
@ -911,7 +911,7 @@ class Note extends AbstractEntity {
|
|||||||
* @return {Attribute}
|
* @return {Attribute}
|
||||||
*/
|
*/
|
||||||
addAttribute(type, name, value = "", isInheritable = false, position = 1000) {
|
addAttribute(type, name, value = "", isInheritable = false, position = 1000) {
|
||||||
const Attribute = require("./attribute");
|
const Attribute = require("./attribute.js");
|
||||||
|
|
||||||
return new Attribute({
|
return new Attribute({
|
||||||
noteId: this.noteId,
|
noteId: this.noteId,
|
@ -1,12 +1,12 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const protectedSessionService = require('../../protected_session');
|
const protectedSessionService = require('../../services/protected_session');
|
||||||
const utils = require('../../utils');
|
const utils = require('../../services/utils');
|
||||||
const sql = require('../../sql');
|
const sql = require('../../services/sql');
|
||||||
const dateUtils = require('../../date_utils');
|
const dateUtils = require('../../services/date_utils');
|
||||||
const becca = require('../../becca/becca');
|
const becca = require('../becca.js');
|
||||||
const entityChangesService = require('../../entity_changes');
|
const entityChangesService = require('../../services/entity_changes');
|
||||||
const AbstractEntity = require("./abstract_entity");
|
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.
|
* NoteRevision represents snapshot of note's title and content at some point in the past. It's used for seamless note versioning.
|
@ -1,7 +1,7 @@
|
|||||||
const Note = require('./entities/note');
|
const Note = require('./entities/note.js');
|
||||||
const NoteRevision = require('./entities/note_revision.js');
|
const NoteRevision = require('./entities/note_revision.js');
|
||||||
const Branch = require('./entities/branch');
|
const Branch = require('./entities/branch.js');
|
||||||
const Attribute = require('./entities/attribute');
|
const Attribute = require('./entities/attribute.js');
|
||||||
const RecentNote = require('./entities/recent_note.js');
|
const RecentNote = require('./entities/recent_note.js');
|
||||||
const ApiToken = require('./entities/api_token.js');
|
const ApiToken = require('./entities/api_token.js');
|
||||||
|
|
@ -3,8 +3,8 @@
|
|||||||
const sql = require('../../services/sql');
|
const sql = require('../../services/sql');
|
||||||
const log = require('../../services/log');
|
const log = require('../../services/log');
|
||||||
const attributeService = require('../../services/attributes');
|
const attributeService = require('../../services/attributes');
|
||||||
const Attribute = require('../../services/becca/entities/attribute');
|
const Attribute = require('../../becca/entities/attribute.js');
|
||||||
const becca = require("../../services/becca/becca");
|
const becca = require("../../becca/becca.js");
|
||||||
|
|
||||||
function getEffectiveNoteAttributes(req) {
|
function getEffectiveNoteAttributes(req) {
|
||||||
const note = becca.getNote(req.params.noteId);
|
const note = becca.getNote(req.params.noteId);
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
"use strict";
|
"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 searchService = require('../../services/search/services/search.js');
|
||||||
const log = require('../../services/log');
|
const log = require('../../services/log');
|
||||||
const utils = require('../../services/utils');
|
const utils = require('../../services/utils');
|
||||||
const cls = require('../../services/cls');
|
const cls = require('../../services/cls');
|
||||||
const becca = require("../../services/becca/becca");
|
const becca = require("../../becca/becca.js");
|
||||||
|
|
||||||
function getAutocomplete(req) {
|
function getAutocomplete(req) {
|
||||||
const query = req.query.query.trim();
|
const query = req.query.query.trim();
|
||||||
|
@ -5,7 +5,7 @@ const utils = require('../../services/utils');
|
|||||||
const entityChangesService = require('../../services/entity_changes.js');
|
const entityChangesService = require('../../services/entity_changes.js');
|
||||||
const treeService = require('../../services/tree');
|
const treeService = require('../../services/tree');
|
||||||
const noteService = require('../../services/notes');
|
const noteService = require('../../services/notes');
|
||||||
const becca = require('../../services/becca/becca.js');
|
const becca = require('../../becca/becca.js');
|
||||||
const TaskContext = require('../../services/task_context');
|
const TaskContext = require('../../services/task_context');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -10,7 +10,7 @@ const ws = require('../../services/ws.js');
|
|||||||
const log = require('../../services/log');
|
const log = require('../../services/log');
|
||||||
const utils = require('../../services/utils');
|
const utils = require('../../services/utils');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const Attribute = require('../../services/becca/entities/attribute');
|
const Attribute = require('../../becca/entities/attribute.js');
|
||||||
const htmlSanitizer = require('../../services/html_sanitizer');
|
const htmlSanitizer = require('../../services/html_sanitizer');
|
||||||
|
|
||||||
function findClippingNote(todayNote, pageUrl) {
|
function findClippingNote(todayNote, pageUrl) {
|
||||||
|
@ -9,7 +9,7 @@ const fs = require('fs');
|
|||||||
const { Readable } = require('stream');
|
const { Readable } = require('stream');
|
||||||
const chokidar = require('chokidar');
|
const chokidar = require('chokidar');
|
||||||
const ws = require('../../services/ws');
|
const ws = require('../../services/ws');
|
||||||
const becca = require("../../services/becca/becca");
|
const becca = require("../../becca/becca.js");
|
||||||
|
|
||||||
function updateFile(req) {
|
function updateFile(req) {
|
||||||
const {noteId} = req.params;
|
const {noteId} = req.params;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const imageService = require('../../services/image');
|
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 RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ const zipImportService = require('../../services/import/zip');
|
|||||||
const singleImportService = require('../../services/import/single');
|
const singleImportService = require('../../services/import/single');
|
||||||
const cls = require('../../services/cls');
|
const cls = require('../../services/cls');
|
||||||
const path = require('path');
|
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 log = require('../../services/log');
|
||||||
const TaskContext = require('../../services/task_context.js');
|
const TaskContext = require('../../services/task_context.js');
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ const eventService = require('../../services/events');
|
|||||||
const sqlInit = require('../../services/sql_init');
|
const sqlInit = require('../../services/sql_init');
|
||||||
const sql = require('../../services/sql');
|
const sql = require('../../services/sql');
|
||||||
const optionService = require('../../services/options');
|
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");
|
const ws = require("../../services/ws.js");
|
||||||
|
|
||||||
function loginSync(req) {
|
function loginSync(req) {
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const beccaService = require('../../services/becca/becca_service.js');
|
const beccaService = require('../../becca/becca_service.js');
|
||||||
const protectedSessionService = require('../../services/protected_session');
|
const protectedSessionService = require('../../services/protected_session');
|
||||||
const noteRevisionService = require('../../services/note_revisions');
|
const noteRevisionService = require('../../services/note_revisions');
|
||||||
const utils = require('../../services/utils');
|
const utils = require('../../services/utils');
|
||||||
const sql = require('../../services/sql');
|
const sql = require('../../services/sql');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const becca = require("../../services/becca/becca");
|
const becca = require("../../becca/becca.js");
|
||||||
|
|
||||||
function getNoteRevisions(req) {
|
function getNoteRevisions(req) {
|
||||||
return becca.getNoteRevisionsFromQuery(`
|
return becca.getNoteRevisionsFromQuery(`
|
||||||
|
@ -8,7 +8,7 @@ const log = require('../../services/log');
|
|||||||
const TaskContext = require('../../services/task_context');
|
const TaskContext = require('../../services/task_context');
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const noteRevisionService = require("../../services/note_revisions.js");
|
const noteRevisionService = require("../../services/note_revisions.js");
|
||||||
const becca = require("../../services/becca/becca");
|
const becca = require("../../becca/becca.js");
|
||||||
|
|
||||||
function getNote(req) {
|
function getNote(req) {
|
||||||
const noteId = req.params.noteId;
|
const noteId = req.params.noteId;
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const sql = require('../../services/sql');
|
const sql = require('../../services/sql');
|
||||||
const protectedSessionService = require('../../services/protected_session');
|
const protectedSessionService = require('../../services/protected_session');
|
||||||
const noteService = require('../../services/notes');
|
const noteService = require('../../services/notes');
|
||||||
const beccaService = require('../../services/becca/becca_service.js');
|
const beccaService = require('../../becca/becca_service.js');
|
||||||
|
|
||||||
function getRecentChanges(req) {
|
function getRecentChanges(req) {
|
||||||
const {ancestorNoteId} = req.params;
|
const {ancestorNoteId} = req.params;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
"use strict";
|
"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 sql = require('../../services/sql');
|
||||||
const dateUtils = require('../../services/date_utils');
|
const dateUtils = require('../../services/date_utils');
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
const scriptService = require('../../services/script');
|
const scriptService = require('../../services/script');
|
||||||
const attributeService = require('../../services/attributes');
|
const attributeService = require('../../services/attributes');
|
||||||
const becca = require('../../services/becca/becca');
|
const becca = require('../../becca/becca.js');
|
||||||
const syncService = require('../../services/sync');
|
const syncService = require('../../services/sync');
|
||||||
|
|
||||||
function exec(req) {
|
function exec(req) {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const becca = require('../../services/becca/becca');
|
const becca = require('../../becca/becca.js');
|
||||||
const SearchContext = require('../../services/search/search_context');
|
const SearchContext = require('../../services/search/search_context');
|
||||||
const log = require('../../services/log');
|
const log = require('../../services/log');
|
||||||
const scriptService = require('../../services/script');
|
const scriptService = require('../../services/script');
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const similarityService = require('../../services/becca/similarity.js');
|
const similarityService = require('../../becca/similarity.js');
|
||||||
const becca = require("../../services/becca/becca");
|
const becca = require("../../becca/becca.js");
|
||||||
|
|
||||||
async function getSimilarNotes(req) {
|
async function getSimilarNotes(req) {
|
||||||
const noteId = req.params.noteId;
|
const noteId = req.params.noteId;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
const sql = require('../../services/sql');
|
const sql = require('../../services/sql');
|
||||||
const becca = require('../../services/becca/becca.js');
|
const becca = require('../../becca/becca.js');
|
||||||
|
|
||||||
function getNoteSize(req) {
|
function getNoteSize(req) {
|
||||||
const {noteId} = req.params;
|
const {noteId} = req.params;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const becca = require('../../services/becca/becca.js');
|
const becca = require('../../becca/becca.js');
|
||||||
const log = require('../../services/log');
|
const log = require('../../services/log');
|
||||||
|
|
||||||
function getNotesAndBranchesAndAttributes(noteIds) {
|
function getNotesAndBranchesAndAttributes(noteIds) {
|
||||||
|
@ -3,7 +3,7 @@ const fileUploadService = require('./api/files.js');
|
|||||||
const scriptService = require('../services/script');
|
const scriptService = require('../services/script');
|
||||||
const cls = require('../services/cls');
|
const cls = require('../services/cls');
|
||||||
const sql = require("../services/sql");
|
const sql = require("../services/sql");
|
||||||
const becca = require("../services/becca/becca");
|
const becca = require("../becca/becca.js");
|
||||||
|
|
||||||
function handleRequest(req, res) {
|
function handleRequest(req, res) {
|
||||||
// express puts content after first slash into 0 index element
|
// express puts content after first slash into 0 index element
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
const searchService = require('./search/services/search');
|
const searchService = require('./search/services/search');
|
||||||
const sql = require('./sql');
|
const sql = require('./sql');
|
||||||
const becca = require('./becca/becca.js');
|
const becca = require('../becca/becca.js');
|
||||||
const Attribute = require('./becca/entities/attribute');
|
const Attribute = require('../becca/entities/attribute.js');
|
||||||
const {formatAttrForSearch} = require("./attribute_formatter.js");
|
const {formatAttrForSearch} = require("./attribute_formatter.js");
|
||||||
|
|
||||||
const ATTRIBUTE_TYPES = [ 'label', 'relation' ];
|
const ATTRIBUTE_TYPES = [ 'label', 'relation' ];
|
||||||
|
@ -13,7 +13,7 @@ const cloningService = require('./cloning');
|
|||||||
const appInfo = require('./app_info');
|
const appInfo = require('./app_info');
|
||||||
const searchService = require('./search/services/search');
|
const searchService = require('./search/services/search');
|
||||||
const SearchContext = require("./search/search_context.js");
|
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.
|
* This is the main backend API interface for scripts. It's published in the local "api" object.
|
||||||
|
@ -4,10 +4,10 @@ const sql = require('./sql');
|
|||||||
const eventChangesService = require('./entity_changes.js');
|
const eventChangesService = require('./entity_changes.js');
|
||||||
const treeService = require('./tree');
|
const treeService = require('./tree');
|
||||||
const noteService = require('./notes');
|
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 TaskContext = require("./task_context.js");
|
||||||
const utils = require('./utils');
|
const utils = require('./utils');
|
||||||
const becca = require("./becca/becca");
|
const becca = require("../becca/becca.js");
|
||||||
|
|
||||||
function cloneNoteToParent(noteId, parentBranchId, prefix) {
|
function cloneNoteToParent(noteId, parentBranchId, prefix) {
|
||||||
const parentBranch = becca.getBranch(parentBranchId);
|
const parentBranch = becca.getBranch(parentBranchId);
|
||||||
|
@ -8,11 +8,11 @@ const syncMutexService = require('./sync_mutex');
|
|||||||
const cls = require('./cls');
|
const cls = require('./cls');
|
||||||
const entityChangesService = require('./entity_changes.js');
|
const entityChangesService = require('./entity_changes.js');
|
||||||
const optionsService = require('./options');
|
const optionsService = require('./options');
|
||||||
const Branch = require('../services/becca/entities/branch');
|
const Branch = require('../becca/entities/branch.js');
|
||||||
const dateUtils = require('./date_utils');
|
const dateUtils = require('./date_utils');
|
||||||
const attributeService = require('./attributes');
|
const attributeService = require('./attributes');
|
||||||
const noteRevisionService = require('./note_revisions');
|
const noteRevisionService = require('./note_revisions');
|
||||||
const becca = require("./becca/becca");
|
const becca = require("../becca/becca.js");
|
||||||
|
|
||||||
class ConsistencyChecks {
|
class ConsistencyChecks {
|
||||||
constructor(autoFix) {
|
constructor(autoFix) {
|
||||||
@ -579,7 +579,7 @@ class ConsistencyChecks {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.fixedIssues) {
|
if (this.fixedIssues) {
|
||||||
require("../services/becca/becca_loader").load();
|
require("../becca/becca_loader.js").load();
|
||||||
}
|
}
|
||||||
|
|
||||||
return !this.unrecoveredConsistencyErrors;
|
return !this.unrecoveredConsistencyErrors;
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const noteService = require('./notes');
|
const noteService = require('./notes');
|
||||||
const attributeService = require('./attributes');
|
const attributeService = require('./attributes');
|
||||||
const dateUtils = require('./date_utils');
|
const dateUtils = require('./date_utils');
|
||||||
const becca = require('./becca/becca');
|
const becca = require('../becca/becca.js');
|
||||||
const sql = require('./sql');
|
const sql = require('./sql');
|
||||||
const protectedSessionService = require('./protected_session');
|
const protectedSessionService = require('./protected_session');
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ const sourceIdService = require('./source_id');
|
|||||||
const dateUtils = require('./date_utils');
|
const dateUtils = require('./date_utils');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const cls = require('./cls');
|
const cls = require('./cls');
|
||||||
const becca = require("./becca/becca.js");
|
const becca = require("../becca/becca.js");
|
||||||
|
|
||||||
let maxEntityChangeId = 0;
|
let maxEntityChangeId = 0;
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const utils = require('../utils');
|
const utils = require('../utils');
|
||||||
const becca = require("../becca/becca");
|
const becca = require("../../becca/becca.js");
|
||||||
|
|
||||||
function exportToOpml(taskContext, branch, version, res) {
|
function exportToOpml(taskContext, branch, version, res) {
|
||||||
if (!['1.0', '2.0'].includes(version)) {
|
if (!['1.0', '2.0'].includes(version)) {
|
||||||
|
@ -2,8 +2,8 @@ const eventService = require('./events');
|
|||||||
const scriptService = require('./script');
|
const scriptService = require('./script');
|
||||||
const treeService = require('./tree');
|
const treeService = require('./tree');
|
||||||
const noteService = require('./notes');
|
const noteService = require('./notes');
|
||||||
const becca = require('./becca/becca.js');
|
const becca = require('../becca/becca.js');
|
||||||
const Attribute = require('./becca/entities/attribute');
|
const Attribute = require('../becca/entities/attribute.js');
|
||||||
|
|
||||||
function runAttachedRelations(note, relationName, originEntity) {
|
function runAttachedRelations(note, relationName, originEntity) {
|
||||||
// same script note can get here with multiple ways, but execute only once
|
// same script note can get here with multiple ways, but execute only once
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const becca = require('./becca/becca');
|
const becca = require('../becca/becca.js');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const protectedSessionService = require('./protected_session');
|
const protectedSessionService = require('./protected_session');
|
||||||
const noteService = require('./notes');
|
const noteService = require('./notes');
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const Attribute = require('../../services/becca/entities/attribute');
|
const Attribute = require('../../becca/entities/attribute.js');
|
||||||
const utils = require('../../services/utils');
|
const utils = require('../../services/utils');
|
||||||
const log = require('../../services/log');
|
const log = require('../../services/log');
|
||||||
const noteService = require('../../services/notes');
|
const noteService = require('../../services/notes');
|
||||||
const attributeService = require('../../services/attributes');
|
const attributeService = require('../../services/attributes');
|
||||||
const Branch = require('../../services/becca/entities/branch');
|
const Branch = require('../../becca/entities/branch.js');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const commonmark = require('commonmark');
|
const commonmark = require('commonmark');
|
||||||
const protectedSessionService = require('../protected_session');
|
const protectedSessionService = require('../protected_session');
|
||||||
@ -13,7 +13,7 @@ const mimeService = require("./mime");
|
|||||||
const treeService = require("../tree");
|
const treeService = require("../tree");
|
||||||
const yauzl = require("yauzl");
|
const yauzl = require("yauzl");
|
||||||
const htmlSanitizer = require('../html_sanitizer');
|
const htmlSanitizer = require('../html_sanitizer');
|
||||||
const becca = require("../becca/becca.js");
|
const becca = require("../../becca/becca.js");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {TaskContext} taskContext
|
* @param {TaskContext} taskContext
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const NoteRevision = require('./becca/entities/note_revision.js');
|
const NoteRevision = require('../becca/entities/note_revision.js');
|
||||||
const dateUtils = require('./date_utils');
|
const dateUtils = require('./date_utils');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const sql = require('./sql');
|
const sql = require('./sql');
|
||||||
|
@ -13,10 +13,10 @@ const attributeService = require('../services/attributes');
|
|||||||
const request = require('./request');
|
const request = require('./request');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const url = require('url');
|
const url = require('url');
|
||||||
const becca = require('../services/becca/becca');
|
const becca = require('../becca/becca.js');
|
||||||
const Branch = require('../services/becca/entities/branch');
|
const Branch = require('../becca/entities/branch.js');
|
||||||
const Note = require('../services/becca/entities/note');
|
const Note = require('../becca/entities/note.js');
|
||||||
const Attribute = require('../services/becca/entities/attribute');
|
const Attribute = require('../becca/entities/attribute.js');
|
||||||
|
|
||||||
function getNewNotePosition(parentNoteId) {
|
function getNewNotePosition(parentNoteId) {
|
||||||
const note = becca.notes[parentNoteId];
|
const note = becca.notes[parentNoteId];
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
const becca = require('./becca/becca');
|
const becca = require('../becca/becca.js');
|
||||||
|
|
||||||
function getOption(name) {
|
function getOption(name) {
|
||||||
const option = require('./becca/becca').getOption(name);
|
const option = require('../becca/becca.js').getOption(name);
|
||||||
|
|
||||||
if (!option) {
|
if (!option) {
|
||||||
throw new Error(`Option "${name}" doesn't exist`);
|
throw new Error(`Option "${name}" doesn't exist`);
|
||||||
@ -57,7 +57,7 @@ function setOption(name, value) {
|
|||||||
|
|
||||||
function createOption(name, value, isSynced) {
|
function createOption(name, value, isSynced) {
|
||||||
// to avoid circular dependency, need to find better solution
|
// 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({
|
new Option({
|
||||||
name: name,
|
name: name,
|
||||||
|
@ -4,7 +4,7 @@ const sqlInit = require('./sql_init');
|
|||||||
const config = require('./config');
|
const config = require('./config');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const sql = require("./sql");
|
const sql = require("./sql");
|
||||||
const becca = require("./becca/becca");
|
const becca = require("../becca/becca.js");
|
||||||
|
|
||||||
function getRunAtHours(note) {
|
function getRunAtHours(note) {
|
||||||
try {
|
try {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
const ScriptContext = require('./script_context');
|
const ScriptContext = require('./script_context');
|
||||||
const cls = require('./cls');
|
const cls = require('./cls');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const becca = require("./becca/becca");
|
const becca = require("../becca/becca.js");
|
||||||
|
|
||||||
function executeNote(note, apiParams) {
|
function executeNote(note, apiParams) {
|
||||||
if (!note.isJavaScript() || note.getScriptEnv() !== 'backend' || !note.isContentAvailable) {
|
if (!note.isJavaScript() || note.getScriptEnv() !== 'backend' || !note.isContentAvailable) {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const Expression = require('./expression');
|
const Expression = require('./expression');
|
||||||
const NoteSet = require('../note_set');
|
const NoteSet = require('../note_set');
|
||||||
const log = require('../../log');
|
const log = require('../../log');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../../becca/becca.js');
|
||||||
|
|
||||||
class AncestorExp extends Expression {
|
class AncestorExp extends Expression {
|
||||||
constructor(ancestorNoteId, ancestorDepth) {
|
constructor(ancestorNoteId, ancestorDepth) {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const NoteSet = require('../note_set');
|
const NoteSet = require('../note_set');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../../becca/becca.js');
|
||||||
const Expression = require('./expression');
|
const Expression = require('./expression');
|
||||||
|
|
||||||
class AttributeExistsExp extends Expression {
|
class AttributeExistsExp extends Expression {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
const Expression = require('./expression');
|
const Expression = require('./expression');
|
||||||
const NoteSet = require('../note_set');
|
const NoteSet = require('../note_set');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../../becca/becca.js');
|
||||||
|
|
||||||
class DescendantOfExp extends Expression {
|
class DescendantOfExp extends Expression {
|
||||||
constructor(subExpression) {
|
constructor(subExpression) {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
const Expression = require('./expression');
|
const Expression = require('./expression');
|
||||||
const NoteSet = require('../note_set');
|
const NoteSet = require('../note_set');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../../becca/becca.js');
|
||||||
|
|
||||||
class LabelComparisonExp extends Expression {
|
class LabelComparisonExp extends Expression {
|
||||||
constructor(attributeType, attributeName, comparator) {
|
constructor(attributeType, attributeName, comparator) {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
const Expression = require('./expression');
|
const Expression = require('./expression');
|
||||||
const NoteSet = require('../note_set');
|
const NoteSet = require('../note_set');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../../becca/becca.js');
|
||||||
|
|
||||||
class BeccaFlatTextExp extends Expression {
|
class BeccaFlatTextExp extends Expression {
|
||||||
constructor(tokens) {
|
constructor(tokens) {
|
||||||
@ -13,7 +13,7 @@ class BeccaFlatTextExp extends Expression {
|
|||||||
|
|
||||||
execute(inputNoteSet, executionContext) {
|
execute(inputNoteSet, executionContext) {
|
||||||
// has deps on SQL which breaks unit test so needs to be dynamically required
|
// 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();
|
const resultNoteSet = new NoteSet();
|
||||||
|
|
||||||
function searchDownThePath(note, tokens, path) {
|
function searchDownThePath(note, tokens, path) {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const Expression = require('./expression');
|
const Expression = require('./expression');
|
||||||
const NoteSet = require('../note_set');
|
const NoteSet = require('../note_set');
|
||||||
const log = require('../../log');
|
const log = require('../../log');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../../becca/becca.js');
|
||||||
const protectedSessionService = require('../../protected_session');
|
const protectedSessionService = require('../../protected_session');
|
||||||
const striptags = require('striptags');
|
const striptags = require('striptags');
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
const Expression = require('./expression');
|
const Expression = require('./expression');
|
||||||
const NoteSet = require('../note_set');
|
const NoteSet = require('../note_set');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../../becca/becca.js');
|
||||||
const striptags = require('striptags');
|
const striptags = require('striptags');
|
||||||
|
|
||||||
class NoteContentUnprotectedFulltextExp extends Expression {
|
class NoteContentUnprotectedFulltextExp extends Expression {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
const Expression = require('./expression');
|
const Expression = require('./expression');
|
||||||
const NoteSet = require('../note_set');
|
const NoteSet = require('../note_set');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../../becca/becca.js');
|
||||||
|
|
||||||
class RelationWhereExp extends Expression {
|
class RelationWhereExp extends Expression {
|
||||||
constructor(relationName, subExpression) {
|
constructor(relationName, subExpression) {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const beccaService = require('../becca/becca_service.js');
|
const beccaService = require('../../becca/becca_service.js');
|
||||||
|
|
||||||
class SearchResult {
|
class SearchResult {
|
||||||
constructor(notePathArray) {
|
constructor(notePathArray) {
|
||||||
|
@ -6,8 +6,8 @@ const parse = require('./parse.js');
|
|||||||
const NoteSet = require("../note_set.js");
|
const NoteSet = require("../note_set.js");
|
||||||
const SearchResult = require("../search_result.js");
|
const SearchResult = require("../search_result.js");
|
||||||
const SearchContext = require("../search_context.js");
|
const SearchContext = require("../search_context.js");
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../../becca/becca.js');
|
||||||
const beccaService = require('../../becca/becca_service.js');
|
const beccaService = require('../../../becca/becca_service.js');
|
||||||
const utils = require('../../utils.js');
|
const utils = require('../../utils.js');
|
||||||
const log = require('../../log.js');
|
const log = require('../../log.js');
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ const syncOptions = require('./sync_options');
|
|||||||
const request = require('./request');
|
const request = require('./request');
|
||||||
const appInfo = require('./app_info');
|
const appInfo = require('./app_info');
|
||||||
const utils = require('./utils');
|
const utils = require('./utils');
|
||||||
const becca = require("./becca/becca");
|
const becca = require("../becca/becca.js");
|
||||||
|
|
||||||
async function hasSyncServerSchemaAndSeed() {
|
async function hasSyncServerSchemaAndSeed() {
|
||||||
const response = await requestToSyncServer('GET', '/api/setup/status');
|
const response = await requestToSyncServer('GET', '/api/setup/status');
|
||||||
|
@ -249,7 +249,7 @@ function transactional(func) {
|
|||||||
if (entityChanges.length > 0) {
|
if (entityChanges.length > 0) {
|
||||||
log.info("Transaction rollback dirtied the becca, forcing reload.");
|
log.info("Transaction rollback dirtied the becca, forcing reload.");
|
||||||
|
|
||||||
require('./becca/becca_loader.js').load();
|
require('../becca/becca_loader.js').load();
|
||||||
}
|
}
|
||||||
|
|
||||||
throw e;
|
throw e;
|
||||||
|
@ -5,7 +5,7 @@ const sql = require('./sql');
|
|||||||
const utils = require('./utils');
|
const utils = require('./utils');
|
||||||
const optionService = require('./options');
|
const optionService = require('./options');
|
||||||
const port = require('./port');
|
const port = require('./port');
|
||||||
const Option = require('./becca/entities/option');
|
const Option = require('../becca/entities/option.js');
|
||||||
const TaskContext = require('./task_context.js');
|
const TaskContext = require('./task_context.js');
|
||||||
const migrationService = require('./migration');
|
const migrationService = require('./migration');
|
||||||
const cls = require('./cls');
|
const cls = require('./cls');
|
||||||
@ -60,10 +60,10 @@ async function createInitialDatabase(username, password, theme) {
|
|||||||
sql.transactional(() => {
|
sql.transactional(() => {
|
||||||
sql.executeScript(schema);
|
sql.executeScript(schema);
|
||||||
|
|
||||||
require("./becca/becca_loader").load();
|
require("../becca/becca_loader.js").load();
|
||||||
|
|
||||||
const Note = require("./becca/entities/note");
|
const Note = require("../becca/entities/note.js");
|
||||||
const Branch = require("./becca/entities/branch");
|
const Branch = require("../becca/entities/branch.js");
|
||||||
|
|
||||||
rootNote = new Note({
|
rootNote = new Note({
|
||||||
noteId: 'root',
|
noteId: 'root',
|
||||||
|
@ -15,7 +15,7 @@ const cls = require('./cls');
|
|||||||
const request = require('./request');
|
const request = require('./request');
|
||||||
const ws = require('./ws');
|
const ws = require('./ws');
|
||||||
const entityChangesService = require('./entity_changes.js');
|
const entityChangesService = require('./entity_changes.js');
|
||||||
const entityConstructor = require('../services/becca/entity_constructor');
|
const entityConstructor = require('../becca/entity_constructor.js');
|
||||||
|
|
||||||
let proxyToggle = true;
|
let proxyToggle = true;
|
||||||
|
|
||||||
@ -385,7 +385,7 @@ function getOutstandingPullCount() {
|
|||||||
return outstandingPullCount;
|
return outstandingPullCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
require("./becca/becca_loader").beccaLoaded.then(() => {
|
require("../becca/becca_loader.js").beccaLoaded.then(() => {
|
||||||
setInterval(cls.wrap(sync), 60000);
|
setInterval(cls.wrap(sync), 60000);
|
||||||
|
|
||||||
// kickoff initial sync immediately
|
// kickoff initial sync immediately
|
||||||
|
@ -2,7 +2,7 @@ const sql = require('./sql');
|
|||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const entityChangesService = require('./entity_changes.js');
|
const entityChangesService = require('./entity_changes.js');
|
||||||
const eventService = require('./events');
|
const eventService = require('./events');
|
||||||
const entityConstructor = require("./becca/entity_constructor.js");
|
const entityConstructor = require("../becca/entity_constructor.js");
|
||||||
|
|
||||||
function updateEntity(entityChange, entity, sourceId) {
|
function updateEntity(entityChange, entity, sourceId) {
|
||||||
// can be undefined for options with isSynced=false
|
// can be undefined for options with isSynced=false
|
||||||
|
@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
const sql = require('./sql');
|
const sql = require('./sql');
|
||||||
const log = require('./log');
|
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 entityChangesService = require('./entity_changes.js');
|
||||||
const protectedSessionService = require('./protected_session');
|
const protectedSessionService = require('./protected_session');
|
||||||
const becca = require('./becca/becca.js');
|
const becca = require('../becca/becca.js');
|
||||||
|
|
||||||
function getNotes(noteIds) {
|
function getNotes(noteIds) {
|
||||||
// we return also deleted notes which have been specifically asked for
|
// we return also deleted notes which have been specifically asked for
|
||||||
|
Loading…
x
Reference in New Issue
Block a user