renamed also cache files/modules

docs/frontend_api/entities_note_short.js.html

@@ -30,7 +30,7 @@
 import noteAttributeCache from "../services/note_attribute_cache.js";
 import ws from "../services/ws.js";
 import options from "../services/options.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 
 const LABEL = 'label';
 const RELATION = 'relation';

docs/frontend_api/services_frontend_script_api.js.html

@@ -30,7 +30,7 @@
 import utils from './utils.js';
 import toastService from './toast.js';
 import linkService from './link.js';
-import froca from './tree_cache.js';
+import froca from './froca.js';
 import noteTooltipService from './note_tooltip.js';
 import protectedSessionService from './protected_session.js';
 import dateNotesService from './date_notes.js';

spec/search/note_cache_mocking.js

@@ -1,7 +1,7 @@
-const Note = require('../../src/services/note_cache/entities/note.js');
+const Note = require('../../src/services/becca/entities/note.js');
-const Branch = require('../../src/services/note_cache/entities/branch.js');
+const Branch = require('../../src/services/becca/entities/branch.js');
-const Attribute = require('../../src/services/note_cache/entities/attribute.js');
+const Attribute = require('../../src/services/becca/entities/attribute.js');
-const becca = require('../../src/services/note_cache/note_cache.js');
+const becca = require('../../src/services/becca/becca.js');
 const randtoken = require('rand-token').generator({source: 'crypto'});
 
 /** @return {Note} */

spec/search/search.spec.js

@@ -1,9 +1,9 @@
 const searchService = require('../../src/services/search/services/search.js');
-const Note = require('../../src/services/note_cache/entities/note.js');
+const Note = require('../../src/services/becca/entities/note.js');
-const Branch = require('../../src/services/note_cache/entities/branch.js');
+const Branch = require('../../src/services/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/note_cache/note_cache.js');
+const becca = require('../../src/services/becca/becca.js');
 const {NoteBuilder, findNoteByTitle, note} = require('./note_cache_mocking.js');
 
 describe("Search", () => {

spec/search/value_extractor.spec.js

@@ -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/note_cache/note_cache.js');
+const becca = require('../../src/services/becca/becca.js');
 const SearchContext = require("../../src/services/search/search_context.js");
 
 const dsc = new SearchContext();

src/app.js

@@ -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/note_cache/note_cache_loader');
+require('./services/becca/becca_loader.js');
 
 const app = express();
 

src/public/app/dialogs/branch_prefix.js

@@ -1,6 +1,6 @@
 import treeService from '../services/tree.js';
 import server from '../services/server.js';
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import toastService from "../services/toast.js";
 import utils from "../services/utils.js";
 

src/public/app/dialogs/clone_to.js

@@ -2,7 +2,7 @@ import noteAutocompleteService from "../services/note_autocomplete.js";
 import utils from "../services/utils.js";
 import treeService from "../services/tree.js";
 import toastService from "../services/toast.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import branchService from "../services/branches.js";
 
 const $dialog = $("#clone-to-dialog");

src/public/app/dialogs/delete_notes.js

@@ -1,5 +1,5 @@
 import server from "../services/server.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import linkService from "../services/link.js";
 import utils from "../services/utils.js";
 

src/public/app/dialogs/export.js

@@ -2,7 +2,7 @@ import treeService from "../services/tree.js";
 import utils from "../services/utils.js";
 import ws from "../services/ws.js";
 import toastService from "../services/toast.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import openService from "../services/open.js";
 
 const $dialog = $("#export-dialog");

src/public/app/dialogs/include_note.js

@@ -1,7 +1,7 @@
 import treeService from '../services/tree.js';
 import noteAutocompleteService from '../services/note_autocomplete.js';
 import utils from "../services/utils.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 
 const $dialog = $("#include-note-dialog");
 const $form = $("#include-note-form");

src/public/app/dialogs/move_to.js

@@ -1,7 +1,7 @@
 import noteAutocompleteService from "../services/note_autocomplete.js";
 import utils from "../services/utils.js";
 import toastService from "../services/toast.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import branchService from "../services/branches.js";
 import treeService from "../services/tree.js";
 

src/public/app/dialogs/recent_changes.js

@@ -2,7 +2,7 @@ import linkService from '../services/link.js';
 import utils from '../services/utils.js';
 import server from '../services/server.js';
 import treeService from "../services/tree.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import appContext from "../services/app_context.js";
 import hoistedNoteService from "../services/hoisted_note.js";
 

src/public/app/entities/note_short.js

@@ -2,7 +2,7 @@ import server from '../services/server.js';
 import noteAttributeCache from "../services/note_attribute_cache.js";
 import ws from "../services/ws.js";
 import options from "../services/options.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 
 const LABEL = 'label';
 const RELATION = 'relation';

src/public/app/services/app_context.js

@@ -1,4 +1,4 @@
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import bundleService from "./bundle.js";
 import DialogCommandExecutor from "./dialog_command_executor.js";
 import Entrypoints from "./entrypoints.js";

src/public/app/services/attribute_renderer.js

@@ -1,5 +1,5 @@
 import ws from "./ws.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 async function renderAttribute(attribute, renderIsInheritable) {
     const isInheritable = renderIsInheritable && attribute.isInheritable ? `(inheritable)` : '';

src/public/app/services/branches.js

@@ -1,7 +1,7 @@
 import utils from './utils.js';
 import server from './server.js';
 import toastService from "./toast.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import hoistedNoteService from "./hoisted_note.js";
 import ws from "./ws.js";
 

src/public/app/services/bundle.js

@@ -1,7 +1,7 @@
 import ScriptContext from "./script_context.js";
 import server from "./server.js";
 import toastService from "./toast.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import utils from "./utils.js";
 
 async function getAndExecuteBundle(noteId, originEntity = null) {

src/public/app/services/clipboard.js

@@ -1,7 +1,7 @@
 import branchService from "./branches.js";
 import toastService from "./toast.js";
 import hoistedNoteService from "./hoisted_note.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 let clipboardBranchIds = [];
 let clipboardMode = null;

src/public/app/services/date_notes.js

@@ -1,4 +1,4 @@
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import server from "./server.js";
 import ws from "./ws.js";
 

src/public/app/services/frontend_script_api.js

@@ -2,7 +2,7 @@ import server from './server.js';
 import utils from './utils.js';
 import toastService from './toast.js';
 import linkService from './link.js';
-import froca from './tree_cache.js';
+import froca from './froca.js';
 import noteTooltipService from './note_tooltip.js';
 import protectedSessionService from './protected_session.js';
 import dateNotesService from './date_notes.js';

src/public/app/services/glob.js

@@ -4,7 +4,7 @@ import server from "./server.js";
 import libraryLoader from "./library_loader.js";
 import ws from "./ws.js";
 import protectedSessionHolder from "./protected_session_holder.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 function setupGlobs() {
     window.glob.PROFILING_LOG = false;

src/public/app/services/link.js

@@ -1,7 +1,7 @@
 import treeService from './tree.js';
 import contextMenu from "./context_menu.js";
 import appContext from "./app_context.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import utils from "./utils.js";
 
 function getNotePathFromUrl(url) {

src/public/app/services/link_map.js

@@ -1,6 +1,6 @@
 import libraryLoader from "./library_loader.js";
 import server from "./server.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import linkService from "./link.js";
 
 const linkOverlays = [

src/public/app/services/note_autocomplete.js

@@ -3,7 +3,7 @@ import appContext from "./app_context.js";
 import utils from './utils.js';
 import noteCreateService from './note_create.js';
 import treeService from './tree.js';
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 // this key needs to have this value so it's hit by the tooltip
 const SELECTED_NOTE_PATH_KEY = "data-note-path";

src/public/app/services/note_content_renderer.js

@@ -4,7 +4,7 @@ import protectedSessionService from "./protected_session.js";
 import protectedSessionHolder from "./protected_session_holder.js";
 import libraryLoader from "./library_loader.js";
 import openService from "./open.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 async function getRenderedContent(note, options = {}) {
     options = Object.assign({

src/public/app/services/note_create.js

@@ -3,7 +3,7 @@ import utils from "./utils.js";
 import protectedSessionHolder from "./protected_session_holder.js";
 import server from "./server.js";
 import ws from "./ws.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import treeService from "./tree.js";
 import toastService from "./toast.js";
 

src/public/app/services/note_list_renderer.js

@@ -1,6 +1,6 @@
 import linkService from "./link.js";
 import noteContentRenderer from "./note_content_renderer.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import attributeService from "./attributes.js";
 import attributeRenderer from "./attribute_renderer.js";
 

src/public/app/services/note_tooltip.js

@@ -1,6 +1,6 @@
 import treeService from "./tree.js";
 import linkService from "./link.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import utils from "./utils.js";
 import attributeRenderer from "./attribute_renderer.js";
 import noteContentRenderer from "./note_content_renderer.js";

src/public/app/services/protected_session.js

@@ -4,7 +4,7 @@ import protectedSessionHolder from './protected_session_holder.js';
 import toastService from "./toast.js";
 import ws from "./ws.js";
 import appContext from "./app_context.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 let protectedSessionDeferred = null;
 

src/public/app/services/script_context.js

@@ -1,6 +1,6 @@
 import FrontendScriptApi from './frontend_script_api.js';
 import utils from './utils.js';
-import froca from './tree_cache.js';
+import froca from './froca.js';
 
 async function ScriptContext(startNoteId, allNoteIds, originEntity = null, $container = null) {
     const modules = {};

src/public/app/services/search.js

@@ -1,5 +1,5 @@
 import server from "./server.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 async function searchForNoteIds(searchString) {
     return await server.get('search/' + encodeURIComponent(searchString));

src/public/app/services/tab_context.js

@@ -4,7 +4,7 @@ import utils from "./utils.js";
 import appContext from "./app_context.js";
 import treeService from "./tree.js";
 import Component from "../widgets/component.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import hoistedNoteService from "./hoisted_note.js";
 
 class TabContext extends Component {

src/public/app/services/tab_manager.js

@@ -2,7 +2,7 @@ import Component from "../widgets/component.js";
 import SpacedUpdate from "./spaced_update.js";
 import server from "./server.js";
 import options from "./options.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import treeService from "./tree.js";
 import utils from "./utils.js";
 import TabContext from "./tab_context.js";

src/public/app/services/tree.js

@@ -1,7 +1,7 @@
 import ws from './ws.js';
 import utils from './utils.js';
 import server from './server.js';
-import froca from './tree_cache.js';
+import froca from './froca.js';
 import hoistedNoteService from '../services/hoisted_note.js';
 import appContext from "./app_context.js";
 

src/public/app/services/tree_context_menu.js

@@ -1,5 +1,5 @@
 import treeService from './tree.js';
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import clipboard from './clipboard.js';
 import noteCreateService from "./note_create.js";
 import contextMenu from "./context_menu.js";

src/public/app/services/ws.js

@@ -5,7 +5,7 @@ import LoadResults from "./load_results.js";
 import Branch from "../entities/branch.js";
 import Attribute from "../entities/attribute.js";
 import options from "./options.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import noteAttributeCache from "./note_attribute_cache.js";
 
 const messageHandlers = [];

src/public/app/widgets/attribute_widgets/attribute_detail.js

@@ -1,5 +1,5 @@
 import server from "../../services/server.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import treeService from "../../services/tree.js";
 import linkService from "../../services/link.js";
 import attributeAutocompleteService from "../../services/attribute_autocomplete.js";

src/public/app/widgets/attribute_widgets/attribute_editor.js

@@ -4,7 +4,7 @@ import server from "../../services/server.js";
 import contextMenuService from "../../services/context_menu.js";
 import attributesParser from "../../services/attribute_parser.js";
 import libraryLoader from "../../services/library_loader.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import attributeRenderer from "../../services/attribute_renderer.js";
 import noteCreateService from "../../services/note_create.js";
 import treeService from "../../services/tree.js";

src/public/app/widgets/collapsible_widgets/edited_notes.js

@@ -1,7 +1,7 @@
 import CollapsibleWidget from "../collapsible_widget.js";
 import linkService from "../../services/link.js";
 import server from "../../services/server.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 
 const TPL = `
 <div class="edited-notes-widget">

src/public/app/widgets/collapsible_widgets/link_map.js

@@ -1,5 +1,5 @@
 import CollapsibleWidget from "../collapsible_widget.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 
 let linkMapContainerIdCtr = 1;
 

src/public/app/widgets/note_tree.js

@@ -2,7 +2,7 @@ import hoistedNoteService from "../services/hoisted_note.js";
 import treeService from "../services/tree.js";
 import utils from "../services/utils.js";
 import contextMenu from "../services/context_menu.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import branchService from "../services/branches.js";
 import ws from "../services/ws.js";
 import TabAwareWidget from "./tab_aware_widget.js";

src/public/app/widgets/quick_search.js

@@ -2,7 +2,7 @@ import BasicWidget from "./basic_widget.js";
 import server from "../services/server.js";
 import linkService from "../services/link.js";
 import dateNotesService from "../services/date_notes.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import utils from "../services/utils.js";
 import appContext from "../services/app_context.js";
 

src/public/app/widgets/similar_notes.js

@@ -1,6 +1,6 @@
 import linkService from "../services/link.js";
 import server from "../services/server.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import TabAwareWidget from "./tab_aware_widget.js";
 import options from "../services/options.js";
 

src/public/app/widgets/tab_row.js

@@ -3,7 +3,7 @@ import contextMenu from "../services/context_menu.js";
 import utils from "../services/utils.js";
 import keyboardActionService from "../services/keyboard_actions.js";
 import appContext from "../services/app_context.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 
 /*!
  * Draggabilly v2.3.0

src/public/app/widgets/type_property_widgets/search_definition.js

@@ -1,6 +1,6 @@
 import server from "../../services/server.js";
 import TabAwareWidget from "../tab_aware_widget.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import ws from "../../services/ws.js";
 import toastService from "../../services/toast.js";
 

src/public/app/widgets/type_widgets/abstract_text_type_widget.js

@@ -1,6 +1,6 @@
 import TypeWidget from "./type_widget.js";
 import appContext from "../../services/app_context.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import linkService from "../../services/link.js";
 import noteContentRenderer from "../../services/note_content_renderer.js";
 

src/public/app/widgets/type_widgets/editable_text.js

@@ -3,7 +3,7 @@ import noteAutocompleteService from '../../services/note_autocomplete.js';
 import mimeTypesService from '../../services/mime_types.js';
 import utils from "../../services/utils.js";
 import keyboardActionService from "../../services/keyboard_actions.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import treeService from "../../services/tree.js";
 import noteCreateService from "../../services/note_create.js";
 import AbstractTextTypeWidget from "./abstract_text_type_widget.js";

src/public/app/widgets/type_widgets/read_only_text.js

@@ -1,4 +1,4 @@
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import AbstractTextTypeWidget from "./abstract_text_type_widget.js";
 import treeService from "../../services/tree.js";
 import libraryLoader from "../../services/library_loader.js";

src/public/app/widgets/type_widgets/relation_map.js

@@ -7,7 +7,7 @@ import attributeAutocompleteService from "../../services/attribute_autocomplete.
 import TypeWidget from "./type_widget.js";
 import appContext from "../../services/app_context.js";
 import utils from "../../services/utils.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 
 const uniDirectionalOverlays = [
     [ "Arrow", {

src/routes/api/autocomplete.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const beccaService = require('../../services/note_cache/note_cache_service');
+const beccaService = require('../../services/becca/becca_service.js');
 const searchService = require('../../services/search/services/search.js');
 const repository = require('../../services/repository');
 const log = require('../../services/log');

src/routes/api/branches.js

@@ -5,7 +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/note_cache/note_cache');
+const becca = require('../../services/becca/becca.js');
 const repository = require('../../services/repository');
 const TaskContext = require('../../services/task_context');
 

src/routes/api/import.js

@@ -7,7 +7,7 @@ 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/note_cache/note_cache_loader.js');
+const beccaLoader = require('../../services/becca/becca_loader.js');
 const log = require('../../services/log');
 const TaskContext = require('../../services/task_context.js');
 

src/routes/api/note_revisions.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const repository = require('../../services/repository');
-const beccaService = require('../../services/note_cache/note_cache_service');
+const beccaService = require('../../services/becca/becca_service.js');
 const protectedSessionService = require('../../services/protected_session');
 const noteRevisionService = require('../../services/note_revisions');
 const utils = require('../../services/utils');

src/routes/api/recent_changes.js

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

src/routes/api/similar_notes.js

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

src/routes/api/stats.js

@@ -1,5 +1,5 @@
 const sql = require('../../services/sql');
-const becca = require('../../services/note_cache/note_cache');
+const becca = require('../../services/becca/becca.js');
 
 function getNoteSize(req) {
     const {noteId} = req.params;

src/routes/api/tree.js

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

src/services/attributes.js

@@ -2,7 +2,7 @@
 
 const repository = require('./repository');
 const sql = require('./sql');
-const becca = require('./note_cache/note_cache');
+const becca = require('./becca/becca.js');
 const Attribute = require('../entities/attribute');
 
 const ATTRIBUTE_TYPES = [ 'label', 'relation' ];

src/services/becca/becca_loader.js

@@ -2,7 +2,7 @@
 
 const sql = require('../sql.js');
 const eventService = require('../events.js');
-const becca = require('./note_cache');
+const becca = require('./becca.js');
 const sqlInit = require('../sql_init');
 const log = require('../log');
 const Note = require('./entities/note');

src/services/becca/becca_service.js

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

src/services/becca/similarity.js

@@ -1,6 +1,6 @@
-const becca = require('./note_cache');
+const becca = require('./becca.js');
 const log = require('../log');
-const beccaService = require('./note_cache_service.js');
+const beccaService = require('./becca_service.js');
 const dateUtils = require('../date_utils');
 const repository = require('../repository');
 const { JSDOM } = require("jsdom");

src/services/handlers.js

@@ -3,7 +3,7 @@ const scriptService = require('./script');
 const treeService = require('./tree');
 const noteService = require('./notes');
 const repository = require('./repository');
-const becca = require('./note_cache/note_cache');
+const becca = require('./becca/becca.js');
 const Attribute = require('../entities/attribute');
 
 function runAttachedRelations(note, relationName, originEntity) {

src/services/search/expressions/ancestor.js

@@ -3,7 +3,7 @@
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const log = require('../../log');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 
 class AncestorExp extends Expression {
     constructor(ancestorNoteId, ancestorDepth) {

src/services/search/expressions/attribute_exists.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const NoteSet = require('../note_set');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 const Expression = require('./expression');
 
 class AttributeExistsExp extends Expression {

src/services/search/expressions/descendant_of.js

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

src/services/search/expressions/label_comparison.js

@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 
 class LabelComparisonExp extends Expression {
     constructor(attributeType, attributeName, comparator) {

src/services/search/expressions/note_cache_flat_text.js

@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../note_cache/note_cache');
+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('../../note_cache/note_cache_service');
+        const beccaService = require('../../becca/becca_service.js');
         const resultNoteSet = new NoteSet();
 
         function searchDownThePath(note, tokens, path) {

src/services/search/expressions/note_content_protected_fulltext.js

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

src/services/search/expressions/note_content_unprotected_fulltext.js

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

src/services/search/expressions/relation_where.js

@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 
 class RelationWhereExp extends Expression {
     constructor(relationName, subExpression) {

src/services/search/search_result.js

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

src/services/search/services/search.js

@@ -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('../../note_cache/note_cache.js');
+const becca = require('../../becca/becca.js');
-const beccaService = require('../../note_cache/note_cache_service.js');
+const beccaService = require('../../becca/becca_service.js');
 const utils = require('../../utils.js');
 const log = require('../../log.js');
 

src/services/sql.js

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

src/services/tree.js

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