release 0.54.2

2022-08-07 23:16:17 +02:00
626 changed files with 22183 additions and 32251 deletions
@@ -7,7 +7,7 @@ body:
  attributes:
    label: Trilium Version
    description: What version of Trilium are you using?
-    placeholder: 0.57.0-beta
+    placeholder: 0.48.0-beta
  validations:
    required: true
 - type: dropdown
@@ -44,9 +44,3 @@ body:
    description: A clear and concise description of the bug and any additional information.
  validations:
    required: true
- type: textarea
-  attributes:
-    label: Error logs
-    description: Please provide error logs, see [wiki page](https://github.com/zadam/trilium/wiki/Error-logs) for instructions on how to submit them.
-  validations:
-    required: false
@@ -2,7 +2,7 @@ image:
  file: .gitpod.dockerfile

 tasks:
-    - before: nvm install 16.19.0 && nvm use 16.19.0
+    - before: nvm install 16.15.0 && nvm use 16.15.0
      init: npm install
      command: npm run start-server

@@ -3,7 +3,7 @@
  <component name="JavaScriptSettings">
    <option name="languageLevel" value="ES6" />
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" default="true" project-jdk-name="openjdk-16" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="openjdk-18" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
@@ -1,13 +1,6 @@
 #!/bin/sh
-
-# Try connecting to /api/health-check using both http and https.
-# TODO: we should only be connecting with the actual protocol that is enabled
-# TODO: this assumes we use the default port 8080
-
-for proto in http https; do
-    if wget --spider -S "$proto://127.0.0.1:8080/api/health-check" 2>&1 | awk 'NR==2' | grep -w "HTTP/1.1 200 OK" ; then
-        exit 0
-    fi
-done
-
-exit 1
+if wget --spider -S "127.0.0.1:8080/api/health-check" 2>&1 | awk 'NR==2' | grep -w "HTTP/1.1 200 OK" ; then
+    exit 0
+else
+    exit 1
+fi
@@ -1,12 +1,9 @@
 # !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!!
-FROM node:16.19.0-alpine
+FROM node:16.15.0-alpine

 # Create app directory
 WORKDIR /usr/src/app

-# Bundle app source
-COPY . .
-
 COPY server-package.json package.json

 # Install app dependencies
@@ -21,17 +18,15 @@ RUN set -x \
        nasm \
        libpng-dev \
        python3 \
-    && npm install \
-    && apk del .build-dependencies \
-    && npm run webpack \
-    && npm prune --omit=dev \
-    && cp src/public/app/share.js src/public/app-dist/. \
-    && cp -r src/public/app/doc_notes src/public/app-dist/. \
-    && rm -rf src/public/app
+    && npm install --production \
+    && apk del .build-dependencies

 # Some setup tools need to be kept
 RUN apk add --no-cache su-exec shadow

+# Bundle app source
+COPY . .
+
 # Add application user and setup proper volume permissions
 RUN adduser -s /bin/false node; exit 0

@@ -1,9 +1,9 @@
-# Trilium Notes
+# Trilium笔记

 [English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md)

 [![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-Trilium Notes 是一个层次化的笔记应用程序，专注于建立大型个人知识库。请参阅[屏幕截图](https://github.com/zadam/trilium/wiki/Screenshot-tour)以快速了解：
+Trilium Notes是一个分层的笔记应用程序，专注于建立大型个人知识库。请参阅[屏幕截图](https://github.com/zadam/trilium/wiki/Screenshot-tour)以快速了解：

 ![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)

@@ -14,43 +14,36 @@ Ukraine is currently suffering from Russian aggression, please consider donating
 ## 特性

 * 笔记可以排列成任意深的树。单个笔记可以放在树中的多个位置（请参阅[克隆](https://github.com/zadam/trilium/wiki/Cloning-notes)）
-* 丰富的所见即所得笔记编辑功能，包括带有 Markdown [自动格式化功能的](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)表格，图像和[数学](https://github.com/zadam/trilium/wiki/Text-notes#math-support)
+* 丰富的所见即所得笔记编辑功能，包括带有markdown[自动格式化功能的](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)表格，图像和[数学](https://github.com/zadam/trilium/wiki/Text-notes#math-support)
 * 支持编辑[使用源代码的笔记](https://github.com/zadam/trilium/wiki/Code-notes)，包括语法高亮显示
-* 笔记之间快速[导航](https://github.com/zadam/trilium/wiki/Note-navigation)，全文搜索和[笔记聚焦](https://github.com/zadam/trilium/wiki/Note-hoisting)
+* 笔记之间快速[导航](https://github.com/zadam/trilium/wiki/Note-navigation)，全文搜索和[笔记挂起](https://github.com/zadam/trilium/wiki/Note-hoisting)
 * 无缝[笔记版本控制](https://github.com/zadam/trilium/wiki/Note-revisions)
 * 笔记[属性](https://github.com/zadam/trilium/wiki/Attributes)可用于笔记组织，查询和高级[脚本编写](https://github.com/zadam/trilium/wiki/Scripts)
 * [同步](https://github.com/zadam/trilium/wiki/Synchronization)与自托管同步服务器
-  * 有一个[第三方提供的同步服务器托管服务](https://trilium.cc/paid-hosting)
-* 公开地[分享](https://github.com/zadam/trilium/wiki/Sharing)（发布）笔记到互联网
 * 具有按笔记粒度的强大的[笔记加密](https://github.com/zadam/trilium/wiki/Protected-notes)
-* 使用自带的 Excalidraw 来绘制图表（笔记类型“画布”）
 * [关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)，用于可视化笔记及其关系
-* [脚本](https://github.com/zadam/trilium/wiki/Scripts) - 请参阅[高级功能展示](https://github.com/zadam/trilium/wiki/Advanced-showcases)
-* 在拥有超过 10 万条笔记时仍能保持良好的可用性和性能
-* 针对智能手机和平板电脑进行优化的[用于移动设备的前端](https://github.com/zadam/trilium/wiki/Mobile-frontend)
+* [脚本](https://github.com/zadam/trilium/wiki/Scripts)-请参阅[高级展示](https://github.com/zadam/trilium/wiki/Advanced-showcases)
+* 可用性和性能均能很好地扩展至超过10万个笔记
+* 针对智能手机和平板电脑进行触摸优化的[移动前端](https://github.com/zadam/trilium/wiki/Mobile-frontend)
 * [夜间主题](https://github.com/zadam/trilium/wiki/Themes)
-* [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import) 和 [Markdown 导入导出](https://github.com/zadam/trilium/wiki/Markdown)功能
-* 使用[网页剪藏](https://github.com/zadam/trilium/wiki/Web-clipper)轻松保存互联网上的内容
+* [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import)和[Markdown导入导出](https://github.com/zadam/trilium/wiki/Markdown)
+* [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper)可轻松保存Web内容

 ## 构建

-Trilium 可以用作桌面应用程序（Linux 和 Windows）或服务器（Linux）上托管的 Web 应用程序。虽然有 macOS 版本的桌面应用程序，但它[不受支持](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support)。
+Trilium是作为桌面应用程序（Linux和Windows）或服务器上托管的Web应用程序（Linux）提供的。Mac OS桌面版本可用，但[不受支持](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support)。

-* 如果要在桌面上使用 Trilium，请从[最新版本](https://github.com/zadam/trilium/releases/latest)下载适用于您平台的二进制版本，解压缩该软件包并运行`trilium`可执行文件。
-* 如果要在服务器上安装 Trilium，请参考[此页面](https://github.com/zadam/trilium/wiki/Server-installation)。
-  * 当前仅支持（测试过）最近发布的 Chrome 和 Firefox 浏览器。
-
-Trilium 也提供 Flatpak：
-
-[<img width="240" src="https://flathub.org/assets/badges/flathub-badge-en.png">](https://flathub.org/apps/details/com.github.zadam.trilium)
+* 如果要在桌面上使用Trilium，请从[最新版本](https://github.com/zadam/trilium/releases/latest)下载适用于您平台的二进制[版本](https://github.com/zadam/trilium/releases/latest)，解压缩该软件包并运行`trilium`可执行文件。
+* 如果要在服务器上安装Trilium，请遵循[此页面](https://github.com/zadam/trilium/wiki/Server-installation)。
+    * 当前仅支持（经过测试）最新的Chrome和Firefox浏览器。

 ## 文档

-[有关文档页面的完整列表，请参见 Wiki。](https://github.com/zadam/trilium/wiki/)
+[有关文档页面的完整列表，请参见Wiki。](https://github.com/zadam/trilium/wiki/)

-* [Wiki 的中文翻译版本](https://github.com/baddate/trilium/wiki/)
+[中文Wiki在这里](https://github.com/baddate/trilium/wiki/)

-您还可以阅读[个人知识库模式](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base)，以获取有关如何使用 Trilium 的灵感。
+您还可以阅读[个人知识库模式](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base)，以获取有关如何使用Trilium的灵感。

 ## 贡献

@@ -58,7 +51,7 @@ Trilium 也提供 Flatpak：

 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)

-或者克隆本仓库到本地，并运行
+或在本地克隆并运行

 ```
 npm install
@@ -67,15 +60,7 @@ npm run start-server

 ## 致谢

-* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - 市面上最好的所见即所得编辑器，拥有互动性强且聆听能力强的团队
-* [FancyTree](https://github.com/mar10/fancytree) - 一个非常丰富的关于树的库，强大到没有对手。没有它，Trilium Notes 将不会如此。
+* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - 市场上最好的所见即所得编辑器，互动性强且聆听能力强的团队
+* [FancyTree](https://github.com/mar10/fancytree) - 一个非常丰富的关于树的库，强大的没有对手。没有它，Trilium Notes将不会如此。
 * [CodeMirror](https://github.com/codemirror/CodeMirror) - 支持大量语言的代码编辑器
-* [jsPlumb](https://github.com/jsplumb/jsplumb) - 强大的可视化连接库。用于[关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)
-
-## 捐赠
-
-你可以通过 GitHub Sponsors，[PayPal](https://paypal.me/za4am) 或者比特币 (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2) 来捐赠。
-
-## 许可证
-
-本程序是自由软件：你可以再发布本软件和/或修改本软件，只要你遵循 Free Software Foundation 发布的 GNU Affero General Public License 的第三版或者任何（由你选择）更晚的版本。
+* [jsPlumb](https://github.com/jsplumb/jsplumb)强大的可视化连接库。- 用于[关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)
@@ -23,7 +23,7 @@ Ukraine is currently defending itself from Russian aggression, please consider [
  * there's a [3rd party service for hosting synchronisation server](https://trilium.cc/paid-hosting)
 * [Sharing](https://github.com/zadam/trilium/wiki/Sharing) (publishing) notes to public internet
 * Strong [note encryption](https://github.com/zadam/trilium/wiki/Protected-notes) with per-note granularity
-* Sketching diagrams with built-in Excalidraw (note type "canvas")
+* Sketching diagrams with bult-in Excalidraw (note type "canvas")
 * [Relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map) for visualizing notes and their relations
 * [Scripting](https://github.com/zadam/trilium/wiki/Scripts) - see [Advanced showcases](https://github.com/zadam/trilium/wiki/Advanced-showcases)
 * [REST API](https://github.com/zadam/trilium/wiki/ETAPI) for automation
@@ -41,10 +41,6 @@ Trilium is provided as either desktop application (Linux and Windows) or web app
 * If you want to install Trilium on server, follow [this page](https://github.com/zadam/trilium/wiki/Server-installation).
  * Currently only recent Chrome and Firefox are supported (tested) browsers.

-Trilium is also provided as a Flatpak:
-
-[<img width="240" src="https://flathub.org/assets/badges/flathub-badge-en.png">](https://flathub.org/apps/details/com.github.zadam.trilium)
-
 ## Documentation

 [See wiki for complete list of documentation pages.](https://github.com/zadam/trilium/wiki/)
@@ -30,7 +30,6 @@ rm -r $BUILD_DIR/swiftshader
 cp bin/tpl/anonymize-database.sql $BUILD_DIR/

 cp -r dump-db $BUILD_DIR/
-rm -rf $BUILD_DIR/dump-db/node_modules

 cp bin/tpl/trilium-portable.sh $BUILD_DIR/
 chmod 755 $BUILD_DIR/trilium-portable.sh
@@ -26,7 +26,6 @@ mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR
 cp bin/tpl/anonymize-database.sql $BUILD_DIR/

 cp -r dump-db $BUILD_DIR/
-rm -rf $BUILD_DIR/dump-db/node_modules

 echo "Zipping mac x64 electron distribution..."

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash

 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=16.19.0
+NODE_VERSION=16.15.0

 if [ "$1" != "DONTCOPY" ]
 then
@@ -31,7 +31,6 @@ chmod 755 $PKG_DIR/trilium.sh
 cp bin/tpl/anonymize-database.sql $PKG_DIR/

 cp -r dump-db $PKG_DIR/
-rm -rf $PKG_DIR/dump-db/node_modules

 VERSION=`jq -r ".version" package.json`

@@ -28,9 +28,8 @@ rm -r $BUILD_DIR/swiftshader
 cp bin/tpl/anonymize-database.sql $BUILD_DIR/

 cp -r dump-db $BUILD_DIR/
-rm -rf $BUILD_DIR/dump-db/node_modules

-cp bin/tpl/trilium-{portable,no-cert-check,safe-mode}.bat $BUILD_DIR/
+cp bin/tpl/trilium-{portable,no-cert-check,safe-mode}.{bat,ps1} $BUILD_DIR/

 echo "Zipping windows x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`
@@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then
    exit 1
 fi

-n exec 16.19.0 npm run webpack
+n exec 16.15.0 npm run webpack

 DIR=$1

@@ -14,6 +14,9 @@ mkdir $DIR

 echo "Copying Trilium to build directory $DIR"

+cp -r dump-db $DIR/
+rm -rf $DIR/dump-db/node_modules
+
 cp -r images $DIR/
 cp -r libraries $DIR/
 cp -r src $DIR/
@@ -27,7 +30,7 @@ cp -r electron.js $DIR/
 cp webpack-* $DIR/

 # run in subshell (so we return to original dir)
-(cd $DIR && n exec 16.19.0 npm install --only=prod)
+(cd $DIR && n exec 16.15.0 npm install --only=prod)

 # cleanup of useless files in dependencies
 rm -r $DIR/node_modules/image-q/demo
@@ -45,6 +48,10 @@ find $DIR/node_modules -name demo -exec rm -rf {} \;
 find $DIR/libraries -name "*.map" -type f -delete

 cp $DIR/src/public/app/share.js $DIR/src/public/app-dist/
-cp -r $DIR/src/public/app/doc_notes $DIR/src/public/app-dist/

 rm -rf $DIR/src/public/app
+
+sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
+sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
+sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' $DIR/src/views/setup.ejs
+sed -i -e 's/app\/share.js/app-dist\/share.js/g' $DIR/src/views/share/*.ejs
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ $# -eq 0 ]] ; then
-    echo "Missing argument of new version"
-    exit 1
-fi
-
-VERSION=$1
-
-if ! [[ ${VERSION} =~ ^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}(-.+)?$ ]] ;
-then
-    echo "Version ${VERSION} isn't in format X.Y.Z"
-    exit 1
-fi
-
-VERSION_DATE=$(git log -1 --format=%aI "v${VERSION}" | cut -c -10)
-VERSION_COMMIT=$(git rev-list -n 1 "v${VERSION}")
-
-# expecting the directory at a specific path
-cd ~/trilium-flathub || exit
-
-if ! git diff-index --quiet HEAD --; then
-    echo "There are uncommitted changes"
-    exit 1
-fi
-
-BASE_BRANCH=master
-
-if [[ "$VERSION" == *"beta"* ]]; then
-    BASE_BRANCH=beta
-fi
-
-git switch "${BASE_BRANCH}"
-git pull
-
-BRANCH=b${VERSION}
-
-git branch "${BRANCH}"
-git switch "${BRANCH}"
-
-echo "Updating files with version ${VERSION}, date ${VERSION_DATE} and commit ${VERSION_COMMIT}"
-
-flatpak-node-generator npm ../trilium/package-lock.json
-
-xmlstarlet ed --inplace --update "/component/releases/release/@version" --value "${VERSION}" --update "/component/releases/release/@date" --value "${VERSION_DATE}" ./com.github.zadam.trilium.metainfo.xml
-
-yq --inplace "(.modules[0].sources[0].tag = \"v${VERSION}\") | (.modules[0].sources[0].commit = \"${VERSION_COMMIT}\")" ./com.github.zadam.trilium.yml
-
-git add ./generated-sources.json
-git add ./com.github.zadam.trilium.metainfo.xml
-git add ./com.github.zadam.trilium.yml
-
-git commit -m "release $VERSION"
-git push --set-upstream origin "${BRANCH}"
-
-gh pr create --fill -B "${BASE_BRANCH}"
-gh pr merge --auto --merge --delete-branch
@@ -1,17 +1,17 @@

 UPDATE etapi_tokens SET tokenHash = 'API token hash value';
-UPDATE notes SET title = 'title' WHERE title NOT IN ('root', '_hidden', '_share');
+UPDATE notes SET title = 'title' WHERE title NOT IN ('root', 'hidden', 'share');
 UPDATE note_contents SET content = 'text' WHERE content IS NOT NULL;
 UPDATE note_revisions SET title = 'title';
 UPDATE note_revision_contents SET content = 'text' WHERE content IS NOT NULL;

-UPDATE attributes SET name = 'name', value = 'value' WHERE type = 'label' AND name NOT IN('inbox', 'disableVersioning', 'calendarRoot', 'archived', 'excludeFromExport', 'disableInclusion', 'appCss', 'appTheme', 'hidePromotedAttributes', 'readOnly', 'autoReadOnlyDisabled', 'cssClass', 'iconClass', 'keyboardShortcut', 'run', 'runOnInstance', 'runAtHour', 'customRequestHandler', 'customResourceProvider', 'widget', 'noteInfoWidgetDisabled', 'linkMapWidgetDisabled', 'noteRevisionsWidgetDisabled', 'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass', 'workspaceTabBackgroundColor', 'searchHome', 'workspaceInbox', 'workspaceSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId', 'bookmarkFolder', 'sorted', 'top', 'fullContentWidth', 'shareHiddenFromTree', 'shareAlias', 'shareOmitDefaultCss', 'shareRoot', 'shareDescription', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation', 'runOnNoteTitleChange', 'runOnNoteContentChange', 'runOnNoteChange', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareFavicon');
-UPDATE attributes SET name = 'name' WHERE type = 'relation' AND name NOT IN ('inbox', 'disableVersioning', 'calendarRoot', 'archived', 'excludeFromExport', 'disableInclusion', 'appCss', 'appTheme', 'hidePromotedAttributes', 'readOnly', 'autoReadOnlyDisabled', 'cssClass', 'iconClass', 'keyboardShortcut', 'run', 'runOnInstance', 'runAtHour', 'customRequestHandler', 'customResourceProvider', 'widget', 'noteInfoWidgetDisabled', 'linkMapWidgetDisabled', 'noteRevisionsWidgetDisabled', 'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass', 'workspaceTabBackgroundColor', 'searchHome', 'workspaceInbox', 'workspaceSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId', 'bookmarkFolder', 'sorted', 'top', 'fullContentWidth', 'shareHiddenFromTree', 'shareAlias', 'shareOmitDefaultCss', 'shareRoot', 'shareDescription', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation', 'runOnNoteTitleChange', 'runOnNoteContentChange', 'runOnNoteChange', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareFavicon');
+UPDATE attributes SET name = 'name', value = 'value' WHERE type = 'label' AND name NOT IN('inbox', 'disableVersioning', 'calendarRoot', 'archived', 'excludeFromExport', 'disableInclusion', 'appCss', 'appTheme', 'hidePromotedAttributes', 'readOnly', 'autoReadOnlyDisabled', 'hoistedCssClass', 'cssClass', 'iconClass', 'keyboardShortcut', 'run', 'runOnInstance', 'runAtHour', 'customRequestHandler', 'customResourceProvider', 'widget', 'noteInfoWidgetDisabled', 'linkMapWidgetDisabled', 'noteRevisionsWidgetDisabled', 'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass', 'workspaceTabBackgroundColor', 'searchHome', 'hoistedInbox', 'hoistedSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId', 'bookmarked', 'bookmarkFolder', 'sorted', 'top', 'fullContentWidth', 'shareHiddenFromTree', 'shareAlias', 'shareOmitDefaultCss', 'shareRoot', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation', 'runOnNoteTitleChange', 'runOnNoteChange', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareFavicon');
+UPDATE attributes SET name = 'name' WHERE type = 'relation' AND name NOT IN ('inbox', 'disableVersioning', 'calendarRoot', 'archived', 'excludeFromExport', 'disableInclusion', 'appCss', 'appTheme', 'hidePromotedAttributes', 'readOnly', 'autoReadOnlyDisabled', 'hoistedCssClass', 'cssClass', 'iconClass', 'keyboardShortcut', 'run', 'runOnInstance', 'runAtHour', 'customRequestHandler', 'customResourceProvider', 'widget', 'noteInfoWidgetDisabled', 'linkMapWidgetDisabled', 'noteRevisionsWidgetDisabled', 'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass', 'workspaceTabBackgroundColor', 'searchHome', 'hoistedInbox', 'hoistedSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId', 'bookmarked', 'bookmarkFolder', 'sorted', 'top', 'fullContentWidth', 'shareHiddenFromTree', 'shareAlias', 'shareOmitDefaultCss', 'shareRoot', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation', 'runOnNoteTitleChange', 'runOnNoteChange', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareFavicon');
 UPDATE branches SET prefix = 'prefix' WHERE prefix IS NOT NULL AND prefix != 'recovered';
 UPDATE options SET value = 'anonymized' WHERE name IN
-                    ('documentId', 'documentSecret', 'encryptedDataKey',
-                     'passwordVerificationHash', 'passwordVerificationSalt',
-                     'passwordDerivedKeySalt', 'username', 'syncServerHost', 'syncProxy')
+                    ('documentId', 'documentSecret', 'encryptedDataKey', 
+                     'passwordVerificationHash', 'passwordVerificationSalt', 
+                     'passwordDerivedKeySalt', 'username', 'syncServerHost', 'syncProxy') 
                      AND value != '';

 VACUUM;
@@ -1,23 +1,5 @@
-@echo off
-:: Try to get powershell to launch Trilium since it deals with UTF-8 characters in current path
-:: If there's no powershell available, fallback to unicode enabled command interpreter
-
-WHERE powershell.exe > NUL 2>&1
-IF %ERRORLEVEL% NEQ 0 GOTO BATCH ELSE GOTO POWERSHELL
-
-:POWERSHELL
-powershell -ExecutionPolicy Bypass -NonInteractive -NoLogo "Set-Item -Path Env:NODE_TLS_REJECT_UNAUTHORIZED -Value 0; ./trilium.exe"
-GOTO END
-
-:BATCH
-:: Make sure we support UTF-8 characters
-chcp 65001
-
-:: Get Current Trilium executable directory and compute data directory
 SET DIR=%~dp0
 set NODE_TLS_REJECT_UNAUTHORIZED=0
 cd %DIR%
-start trilium.exe
-GOTO END
-
-:END
+WHERE powershell.exe
+IF %ERRORLEVEL% NEQ 0 (start trilium.exe) ELSE (powershell.exe ./trilium-no-cert-check.ps1)
@@ -0,0 +1,2 @@
+Set-Item -Path Env:NODE_TLS_REJECT_UNAUTHORIZED -Value 0
+./trilium.exe
@@ -1,23 +1,5 @@
-@echo off
-:: Try to get powershell to launch Trilium since it deals with UTF-8 characters in current path
-:: If there's no powershell available, fallback to unicode enabled command interpreter
-
-WHERE powershell.exe > NUL 2>&1
-IF %ERRORLEVEL% NEQ 0 GOTO BATCH ELSE GOTO POWERSHELL
-
-:POWERSHELL
-powershell -ExecutionPolicy Bypass -NonInteractive -NoLogo "Set-Item -Path Env:TRILIUM_DATA_DIR -Value './trilium-data'; ./trilium.exe"
-GOTO END
-
-:BATCH
-:: Make sure we support UTF-8 characters
-chcp 65001
-
-:: Get Current Trilium executable directory and compute data directory
 SET DIR=%~dp0
 SET TRILIUM_DATA_DIR=%DIR%\trilium-data
 cd %DIR%
-start trilium.exe
-GOTO END
-
-:END
+WHERE powershell.exe
+IF %ERRORLEVEL% NEQ 0 (start trilium.exe) ELSE (powershell.exe ./trilium-portable.ps1)
@@ -0,0 +1,2 @@
+Set-Item -Path Env:TRILIUM_DATA_DIR -Value './trilium-data'
+./trilium.exe
@@ -1,23 +1,5 @@
-@echo off
-:: Try to get powershell to launch Trilium since it deals with UTF-8 characters in current path
-:: If there's no powershell available, fallback to unicode enabled command interpreter
-
-WHERE powershell.exe > NUL 2>&1
-IF %ERRORLEVEL% NEQ 0 GOTO BATCH ELSE GOTO POWERSHELL
-
-:POWERSHELL
-powershell -ExecutionPolicy Bypass -NonInteractive -NoLogo "Set-Item -Path Env:TRILIUM_SAFE_MODE -Value 1; ./trilium.exe --disable-gpu"
-GOTO END
-
-:BATCH
-:: Make sure we support UTF-8 characters
-chcp 65001
-
-:: Get Current Trilium executable directory and compute data directory
 SET DIR=%~dp0
 SET TRILIUM_SAFE_MODE=1
 cd %DIR%
-start trilium.exe --disable-gpu
-GOTO END
-
-:END
+WHERE powershell.exe
+IF %ERRORLEVEL% NEQ 0 (start trilium.exe) ELSE (powershell.exe ./trilium-safe-mode.ps1)
@@ -0,0 +1,2 @@
+Set-Item -Path Env:TRILIUM_SAFE_MODE -Value 1
+./trilium.exe
@@ -3,5 +3,5 @@
 DIR=`dirname "$0"`
 export TRILIUM_SAFE_MODE=1

-"$DIR/trilium" --disable-gpu
+"$DIR/trilium"

@@ -21,9 +21,3 @@ https=false
 # path to certificate (run "bash bin/generate-cert.sh" to generate self-signed certificate). Relevant only if https=true
 certPath=
 keyPath=
-# setting to give trust to reverse proxies, a comma-separated list of trusted rev. proxy IPs can be specified (CIDR notation is permitted),
-# alternatively 'true' will make use of the leftmost IP in X-Forwarded-For, ultimately an integer can be used to tell about the number of hops between
-# Trilium (which is hop 0) and the first trusted rev. proxy. 
-# once set, expressjs will use the X-Forwarded-For header set by the rev. proxy to determinate the real IPs of clients.
-# expressjs shortcuts are supported: loopback(127.0.0.1/8, ::1/128), linklocal(169.254.0.0/16, fe80::/10), uniquelocal(10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, fc00::/7)
-trustedReverseProxy=false
@@ -1,6 +1,11 @@
+- drop branches.utcDateCreated - not used for anything
+- drop options.utcDateCreated - not used for anything
 - isDeleted = 0 by default
 - rename openTabs to openNoteContexts
+- migrate black theme to dark theme
 - unify readOnly handling to a single attribute:
  * readOnly - like now
  * readOnly=auto - like without readOnly (used to override inherited readOnly)
  * readOnly=never - like autoReadOnlyDisabled
+- remove focusOnAttributesKeyboardShortcut
+- rename white theme to "light" theme (it's not completely white and matches well to dark theme)
@@ -1,7 +1,4 @@
-DROP TABLE entity_changes;
-- not preserving the data because of https://github.com/zadam/trilium/issues/3447
-
-CREATE TABLE IF NOT EXISTS "entity_changes" (
+CREATE TABLE IF NOT EXISTS "mig_entity_changes" (
                                                    `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
                                                    `entityName`	TEXT NOT NULL,
                                                    `entityId`	TEXT NOT NULL,
@@ -14,6 +11,13 @@ CREATE TABLE IF NOT EXISTS "entity_changes" (
                                                    `utcDateChanged` TEXT NOT NULL
 );

+INSERT INTO mig_entity_changes (id, entityName, entityId, hash, isErased, changeId, componentId, instanceId, isSynced, utcDateChanged)
+SELECT id, entityName, entityId, hash, isErased, changeId, '', '', isSynced, utcDateChanged FROM entity_changes;
+
+DROP TABLE  entity_changes;
+
+ALTER TABLE mig_entity_changes RENAME TO entity_changes;
+
 CREATE UNIQUE INDEX `IDX_entityChanges_entityName_entityId` ON "entity_changes" (
                                                                                 `entityName`,
                                                                                 `entityId`
@@ -1,7 +0,0 @@
-- "randomize" branchIds so it's clear user should not rely on them
-UPDATE branches SET branchId = '7LSsI2FnZPW2' WHERE parentNoteId = 'hidden' AND noteId = 'search';
-UPDATE branches SET branchId = 'wEcmxk4CNC7G' WHERE parentNoteId = 'singles' AND noteId = 'globalnotemap';
-UPDATE branches SET branchId = '191uVR6Cu6fA' WHERE parentNoteId = 'hidden' AND noteId = 'sqlconsole';
-UPDATE branches SET branchId = 'OjX5Phxp6A4N' WHERE parentNoteId = 'root' AND noteId = 'hidden';
-UPDATE branches SET branchId = 'glNBYFYZRH8P' WHERE parentNoteId = 'hidden' AND noteId = 'bulkaction';
-UPDATE branches SET branchId = 'cAT25wvGMg3K' WHERE parentNoteId = 'root' AND noteId = 'share';
@@ -1,53 +0,0 @@
-UPDATE notes SET noteId = '_globalNoteMap', title = 'Note Map' WHERE noteId = 'globalnotemap';
-UPDATE note_contents SET noteId = '_globalNoteMap' WHERE noteId = 'globalnotemap';
-UPDATE note_revisions SET noteId = '_globalNoteMap' WHERE noteId = 'globalnotemap';
-UPDATE branches SET noteId = '_globalNoteMap' WHERE noteId = 'globalnotemap';
-UPDATE branches SET parentNoteId = '_globalNoteMap' WHERE parentNoteId = 'globalnotemap';
-UPDATE attributes SET noteId = '_globalNoteMap' WHERE noteId = 'globalnotemap';
-UPDATE attributes SET value = '_globalNoteMap' WHERE type = 'relation' AND value = 'globalnotemap';
-UPDATE entity_changes SET entityId = '_globalNoteMap' WHERE entityId = 'globalnotemap';
-
-UPDATE notes SET noteId = '_bulkAction', title = 'Bulk Action' WHERE noteId = 'bulkaction';
-UPDATE note_contents SET noteId = '_bulkAction' WHERE noteId = 'bulkaction';
-UPDATE note_revisions SET noteId = '_bulkAction' WHERE noteId = 'bulkaction';
-UPDATE branches SET parentNoteId = '_bulkAction' WHERE parentNoteId = 'bulkaction';
-UPDATE branches SET noteId = '_bulkAction' WHERE noteId = 'bulkaction';
-UPDATE attributes SET noteId = '_bulkAction' WHERE noteId = 'bulkaction';
-UPDATE attributes SET value = '_bulkAction' WHERE type = 'relation' AND value = 'bulkaction';
-UPDATE entity_changes SET entityId = '_bulkAction' WHERE entityId = 'bulkaction';
-
-UPDATE notes SET noteId = '_sqlConsole', title = 'SQL Console History' WHERE noteId = 'sqlconsole';
-UPDATE note_contents SET noteId = '_sqlConsole' WHERE noteId = 'sqlconsole';
-UPDATE note_revisions SET noteId = '_sqlConsole' WHERE noteId = 'sqlconsole';
-UPDATE branches SET noteId = '_sqlConsole' WHERE noteId = 'sqlconsole';
-UPDATE branches SET parentNoteId = '_sqlConsole' WHERE parentNoteId = 'sqlconsole';
-UPDATE attributes SET noteId = '_sqlConsole' WHERE noteId = 'sqlconsole';
-UPDATE attributes SET value = '_sqlConsole' WHERE type = 'relation' AND value = 'sqlconsole';
-UPDATE entity_changes SET entityId = '_sqlConsole' WHERE entityId = 'sqlconsole';
-
-UPDATE notes SET noteId = '_hidden', title = 'Hidden Notes' WHERE noteId = 'hidden';
-UPDATE note_contents SET noteId = '_hidden' WHERE noteId = 'hidden';
-UPDATE note_revisions SET noteId = '_hidden' WHERE noteId = 'hidden';
-UPDATE branches SET noteId = '_hidden', prefix = NULL WHERE noteId = 'hidden';
-UPDATE branches SET parentNoteId = '_hidden' WHERE parentNoteId = 'hidden';
-UPDATE attributes SET noteId = '_hidden' WHERE noteId = 'hidden';
-UPDATE attributes SET value = '_hidden' WHERE type = 'relation' AND value = 'hidden';
-UPDATE entity_changes SET entityId = '_hidden' WHERE entityId = 'hidden';
-
-UPDATE notes SET noteId = '_search', title = 'Search History' WHERE noteId = 'search';
-UPDATE note_contents SET noteId = '_search' WHERE noteId = 'search';
-UPDATE note_revisions SET noteId = '_search' WHERE noteId = 'search';
-UPDATE branches SET noteId = '_search' WHERE noteId = 'search';
-UPDATE branches SET parentNoteId = '_search' WHERE parentNoteId = 'search';
-UPDATE attributes SET noteId = '_search' WHERE noteId = 'search';
-UPDATE attributes SET value = '_search' WHERE type = 'relation' AND value = 'search';
-UPDATE entity_changes SET entityId = '_search' WHERE entityId = 'search';
-
-UPDATE notes SET noteId = '_share', title = 'Shared Notes' WHERE noteId = 'share';
-UPDATE note_contents SET noteId = '_share' WHERE noteId = 'share';
-UPDATE note_revisions SET noteId = '_share' WHERE noteId = 'share';
-UPDATE branches SET noteId = '_share' WHERE noteId = 'share';
-UPDATE branches SET parentNoteId = '_share' WHERE parentNoteId = 'share';
-UPDATE attributes SET noteId = '_share' WHERE noteId = 'share';
-UPDATE attributes SET value = '_share' WHERE type = 'relation' AND value = 'share';
-UPDATE entity_changes SET entityId = '_share' WHERE entityId = 'share';
@@ -1,12 +0,0 @@
-module.exports = () => {
-    const hiddenSubtreeService = require('../../src/services/hidden_subtree');
-    const cls = require("../../src/services/cls");
-    const beccaLoader = require("../../src/becca/becca_loader");
-
-    cls.init(() => {
-        beccaLoader.load();
-        // make sure the hidden subtree exists since the subsequent migrations we will move some existing notes into it (share...)
-        // in previous releases hidden subtree was created lazily
-        hiddenSubtreeService.checkHiddenSubtree();
-    });
-};
@@ -1,2 +0,0 @@
-DELETE FROM branches WHERE noteId = '_share' AND parentNoteId != 'root' AND parentNoteId != '_hidden'; -- delete all other branches of _share if any
-UPDATE branches SET parentNoteId = '_hidden' WHERE noteId = '_share';
@@ -1,2 +0,0 @@
-DELETE FROM branches WHERE noteId = '_globalNoteMap' AND parentNoteId != 'singles'; -- make sure there are no clones which would fail at the next line
-UPDATE branches SET parentNoteId = '_hidden' WHERE noteId = '_globalNoteMap';
@@ -1,6 +0,0 @@
-DELETE FROM branches WHERE noteId = 'singles';
-DELETE FROM notes WHERE noteId = 'singles';
-DELETE FROM note_contents WHERE noteId = 'singles';
-DELETE FROM note_revisions WHERE noteId = 'singles';
-DELETE FROM attributes WHERE noteId = 'singles';
-DELETE FROM entity_changes WHERE entityId = 'singles';
@@ -1,16 +0,0 @@
-module.exports = () => {
-    const cls = require("../../src/services/cls");
-    const cloningService = require("../../src/services/cloning");
-    const beccaLoader = require("../../src/becca/becca_loader");
-    const becca = require("../../src/becca/becca");
-
-    cls.init(() => {
-        beccaLoader.load();
-
-        for (const attr of becca.findAttributes('label','bookmarked')) {
-            cloningService.toggleNoteInParent(true, attr.noteId, '_lbBookmarks');
-
-            attr.markAsDeleted("0204__migrate_bookmarks_to_clones");
-        }
-    });
-};
@@ -1,3 +0,0 @@
-UPDATE notes SET type = 'relationMap' WHERE type = 'relation-map';
-UPDATE notes SET type = 'noteMap' WHERE type = 'note-map';
-UPDATE notes SET type = 'webView' WHERE type = 'web-view';
@@ -1,33 +0,0 @@
-// the history was previously not exposed and the fact they were not cleaned up is rather a side-effect than an intention
-
-module.exports = () => {
-    const cls = require("../../src/services/cls");
-    const beccaLoader = require("../../src/becca/becca_loader");
-    const becca = require("../../src/becca/becca");
-
-    cls.init(() => {
-        beccaLoader.load();
-
-        // deleting just branches because they might be cloned (and therefore saved) also outside of the hidden subtree
-
-        const searchRoot = becca.getNote('_search');
-
-        for (const searchBranch of searchRoot.getChildBranches()) {
-            const searchNote = searchBranch.getNote();
-
-            if (searchNote.type === 'search') {
-                searchBranch.deleteBranch('0206__delete_search_and_sql_console_history');
-            }
-        }
-
-        const sqlConsoleRoot = becca.getNote('_sqlConsole');
-
-        for (const sqlConsoleBranch of sqlConsoleRoot.getChildBranches()) {
-            const sqlConsoleNote = sqlConsoleBranch.getNote();
-
-            if (sqlConsoleNote.type === 'code' && sqlConsoleNote.mime === 'text/x-sqlite;schema=trilium') {
-                sqlConsoleBranch.deleteBranch('0206__delete_search_and_sql_console_history');
-            }
-        }
-    });
-};
@@ -1,2 +0,0 @@
-UPDATE notes SET title = 'SQL Console History' WHERE noteId = '_sqlConsole';
-UPDATE notes SET title = 'Search History' WHERE noteId = '_search';
@@ -1,13 +0,0 @@
-module.exports = () => {
-    const cls = require("../../src/services/cls");
-    const beccaLoader = require("../../src/becca/becca_loader");
-    const becca = require("../../src/becca/becca");
-
-    cls.init(() => {
-        beccaLoader.load();
-
-        for (const label of becca.getNote('_hidden').getLabels('archived')) {
-            label.markAsDeleted('0208__remove_archived_from_hidden');
-        }
-    });
-};
@@ -1,5 +0,0 @@
-UPDATE attributes SET name = 'workspaceInbox' WHERE type = 'label' AND name = 'hoistedInbox';
-UPDATE entity_changes SET entityId = 'workspaceInbox' WHERE entityName = 'attributes' AND entityId = 'hoistedInbox';
-
-UPDATE attributes SET name = 'workspaceSearchHome' WHERE type = 'label' AND name = 'hoistedSearchHome';
-UPDATE entity_changes SET entityId = 'workspaceSearchHome' WHERE entityName = 'attributes' AND entityId = 'hoistedSearchHome';
@@ -1,14 +1,17 @@
 version: '2.1'
 services:
  trilium:
+    build:
+      context: .
    image: zadam/trilium
    restart: always
    environment:
-      - TRILIUM_DATA_DIR=/home/node/trilium-data
+      - TRILIUM_DATA_DIR=/data
    ports:
      - "8080:8080"
    volumes:
-      - trilium:/home/node/trilium-data
+      - trilium:/data

 volumes:
  trilium:
+
@@ -991,7 +991,7 @@ This is a low level method, for notes and branches use `note.deleteNote()` and '
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -94,7 +94,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line16">line 16</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line15">line 15</a>
    </li></ul></dd>
    

@@ -205,7 +205,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line47">line 47</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line46">line 46</a>
    </li></ul></dd>
    

@@ -336,7 +336,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line59">line 59</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line58">line 58</a>
    </li></ul></dd>
    

@@ -404,7 +404,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line53">line 53</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line52">line 52</a>
    </li></ul></dd>
    

@@ -472,7 +472,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line49">line 49</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line48">line 48</a>
    </li></ul></dd>
    

@@ -540,7 +540,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line55">line 55</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line54">line 54</a>
    </li></ul></dd>
    

@@ -608,7 +608,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line51">line 51</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line50">line 50</a>
    </li></ul></dd>
    

@@ -676,7 +676,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line61">line 61</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line60">line 60</a>
    </li></ul></dd>
    

@@ -744,7 +744,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line57">line 57</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line56">line 56</a>
    </li></ul></dd>
    

@@ -1176,7 +1176,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line129">line 129</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line115">line 115</a>
    </li></ul></dd>
    

@@ -1370,7 +1370,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line142">line 142</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line122">line 122</a>
    </li></ul></dd>
    

@@ -1564,7 +1564,7 @@ and relation (representing named relationship between source and target note)</d
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line157">line 157</a>
+        <a href="becca_entities_attribute.js.html">becca/entities/attribute.js</a>, <a href="becca_entities_attribute.js.html#line137">line 137</a>
    </li></ul></dd>
    

@@ -1904,7 +1904,7 @@ This is a low level method, for notes and branches use `note.deleteNote()` and '
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -31,10 +31,7 @@
        <h2><span class="attribs"><span class="type-signature"></span></span>Branch<span class="signature">()</span><span class="type-signature"></span></h2>
        
            <div class="class-description">Branch represents a relationship between a child note and its parent note. Trilium allows a note to have multiple
-parents.
-
-Note that you should not rely on the branch's identity, since it can change easily with a note's move.
-Always check noteId instead.</div>
+parents.</div>
        
    
 </header>
@@ -97,7 +94,7 @@ Always check noteId instead.</div>
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line20">line 20</a>
+        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line18">line 18</a>
    </li></ul></dd>
    

@@ -271,7 +268,7 @@ Always check noteId instead.</div>
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line51">line 51</a>
+        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line49">line 49</a>
    </li></ul></dd>
    

@@ -329,7 +326,7 @@ Always check noteId instead.</div>
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line97">line 97</a>
+        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line94">line 94</a>
    </li></ul></dd>
    

@@ -397,73 +394,7 @@ Always check noteId instead.</div>
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line61">line 61</a>
-    </li></ul></dd>
-    
-
-    
-
-    
-
-    
-</dl>
-
-
-
-
-
-
-        
-            
-<h4 class="name" id="isWeak"><span class="type-signature"></span>isWeak<span class="type-signature"></span></h4>
-
-
-
-
-<div class="description">
-    Branch is weak when its existence should not hinder deletion of its note.
-As a result, note with only weak branches should be immediately deleted.
-An example is shared or bookmarked clones - they are created automatically and exist for technical reasons,
-not as user-intended actions. From user perspective, they don't count as real clones and for the purpose
-of deletion should not act as a clone.
-</div>
-
-
-
-
-
-
-
-<dl class="details">
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-    <dt class="tag-source">Source:</dt>
-    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line133">line 133</a>
+        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line59">line 59</a>
    </li></ul></dd>
    

@@ -531,7 +462,7 @@ of deletion should not act as a clone.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line53">line 53</a>
+        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line51">line 51</a>
    </li></ul></dd>
    

@@ -599,7 +530,7 @@ of deletion should not act as a clone.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line59">line 59</a>
+        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line57">line 57</a>
    </li></ul></dd>
    

@@ -657,7 +588,7 @@ of deletion should not act as a clone.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line111">line 111</a>
+        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line108">line 108</a>
    </li></ul></dd>
    

@@ -725,7 +656,7 @@ of deletion should not act as a clone.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line55">line 55</a>
+        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line53">line 53</a>
    </li></ul></dd>
    

@@ -793,7 +724,7 @@ of deletion should not act as a clone.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line57">line 57</a>
+        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line55">line 55</a>
    </li></ul></dd>
    

@@ -861,7 +792,7 @@ of deletion should not act as a clone.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line63">line 63</a>
+        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line61">line 61</a>
    </li></ul></dd>
    

@@ -1213,7 +1144,7 @@ of deletion should not act as a clone.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line145">line 145</a>
+        <a href="becca_entities_branch.js.html">becca/entities/branch.js</a>, <a href="becca_entities_branch.js.html#line129">line 129</a>
    </li></ul></dd>
    

@@ -1913,7 +1844,7 @@ This is a low level method, for notes and branches use `note.deleteNote()` and '
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -1461,7 +1461,7 @@ This is a low level method, for notes and branches use `note.deleteNote()` and '
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -2174,7 +2174,7 @@ This is a low level method, for notes and branches use `note.deleteNote()` and '
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -1319,7 +1319,7 @@ This is a low level method, for notes and branches use `note.deleteNote()` and '
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -1251,7 +1251,7 @@ This is a low level method, for notes and branches use `note.deleteNote()` and '
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -59,7 +59,7 @@ class AbstractEntity {
        let contentToHash = "";

        for (const propertyName of this.constructor.hashedProperties) {
-            contentToHash += `|${this[propertyName]}`;
+            contentToHash += "|" + this[propertyName];
        }

        if (isDeleted) {
@@ -209,7 +209,7 @@ module.exports = AbstractEntity;
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -33,7 +33,6 @@ const AbstractEntity = require("./abstract_entity");
 const sql = require("../../services/sql");
 const dateUtils = require("../../services/date_utils");
 const promotedAttributeDefinitionParser = require("../../services/promoted_attribute_definition_parser");
-const {sanitizeAttributeName} = require("../../services/sanitize_attribute_name");

 /**
 * Attribute is an abstract concept which has two real uses - label (key - value pair)
@@ -91,6 +90,7 @@ class Attribute extends AbstractEntity {
        return this;
    }

+
    init() {
        if (this.attributeId) {
            this.becca.attributes[this.attributeId] = this;
@@ -114,20 +114,6 @@ class Attribute extends AbstractEntity {
        }
    }

-    validate() {
-        if (!["label", "relation"].includes(this.type)) {
-            throw new Error(`Invalid attribute type '${this.type}' in attribute '${this.attributeId}' of note '${this.noteId}'`);
-        }
-
-        if (!this.name?.trim()) {
-            throw new Error(`Invalid empty name in attribute '${this.attributeId}' of note '${this.noteId}'`);
-        }
-
-        if (this.type === 'relation' &amp;&amp; !(this.value in this.becca.notes)) {
-            throw new Error(`Cannot save relation '${this.name}' of note '${this.noteId}' since it target not existing note '${this.value}'.`);
-        }
-    }
-
    get isAffectingSubtree() {
        return this.isInheritable
            || (this.type === 'relation' &amp;&amp; this.name === 'template');
@@ -155,13 +141,7 @@ class Attribute extends AbstractEntity {
     * @returns {Note|null}
     */
    getNote() {
-        const note = this.becca.getNote(this.noteId);
-
-        if (!note) {
-            throw new Error(`Note '${this.noteId}' of attribute '${this.attributeId}', type '${this.type}', name '${this.name}' does not exist.`);
-        }
-
-        return note;
+        return this.becca.getNote(this.noteId);
    }

    /**
@@ -205,11 +185,11 @@ class Attribute extends AbstractEntity {
    }

    beforeSaving() {
-        this.validate();
-
-        this.name = sanitizeAttributeName(this.name);
-
        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 = "";
        }
@@ -274,7 +254,7 @@ module.exports = Attribute;
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -30,8 +30,9 @@

 const Note = require('./note');
 const AbstractEntity = require("./abstract_entity");
+const sql = require("../../services/sql");
 const dateUtils = require("../../services/date_utils");
-const utils = require("../../services/utils");
+const utils = require("../../services/utils.js");
 const TaskContext = require("../../services/task_context");
 const cls = require("../../services/cls");
 const log = require("../../services/log");
@@ -40,9 +41,6 @@ const log = require("../../services/log");
 * Branch represents a relationship between a child note and its parent note. Trilium allows a note to have multiple
 * parents.
 *
- * Note that you should not rely on the branch's identity, since it can change easily with a note's move.
- * Always check noteId instead.
- *
 * @extends AbstractEntity
 */
 class Branch extends AbstractEntity {
@@ -100,22 +98,21 @@ class Branch extends AbstractEntity {

        this.becca.childParentToBranch[`${this.noteId}-${this.parentNoteId}`] = this;

-        const childNote = this.childNote;
-
-        if (!childNote.parentBranches.includes(this)) {
-            childNote.parentBranches.push(this);
-        }
-
        if (this.branchId === 'root') {
            return;
        }

+        const childNote = this.childNote;
        const parentNote = this.parentNote;

        if (!childNote.parents.includes(parentNote)) {
            childNote.parents.push(parentNote);
        }

+        if (!childNote.parentBranches.includes(this)) {
+            childNote.parentBranches.push(this);
+        }
+
        if (!parentNote.children.includes(childNote)) {
            parentNote.children.push(childNote);
        }
@@ -135,9 +132,9 @@ class Branch extends AbstractEntity {
        return this.childNote;
    }

-    /** @returns {Note|undefined} - root branch will have undefined parent, all other branches have to have a parent note */
+    /** @returns {Note} */
    get parentNote() {
-        if (!(this.parentNoteId in this.becca.notes) &amp;&amp; this.parentNoteId !== 'none') {
+        if (!(this.parentNoteId in this.becca.notes)) {
            // entities can come out of order in sync/import, create skeleton which will be filled later
            this.becca.addNote(this.parentNoteId, new Note({noteId: this.parentNoteId}));
        }
@@ -149,19 +146,6 @@ class Branch extends AbstractEntity {
        return !(this.branchId in this.becca.branches);
    }

-    /**
-     * Branch is weak when its existence should not hinder deletion of its note.
-     * As a result, note with only weak branches should be immediately deleted.
-     * An example is shared or bookmarked clones - they are created automatically and exist for technical reasons,
-     * not as user-intended actions. From user perspective, they don't count as real clones and for the purpose
-     * of deletion should not act as a clone.
-     *
-     * @returns {boolean}
-     */
-    get isWeak() {
-        return ['_share', '_lbBookmarks'].includes(this.parentNoteId);
-    }
-
    /**
     * Delete a branch. If this is a last note's branch, delete the note as well.
     *
@@ -202,22 +186,16 @@ class Branch extends AbstractEntity {

        this.markAsDeleted(deleteId);

-        const notDeletedBranches = note.getStrongParentBranches();
+        const notDeletedBranches = note.getParentBranches();

        if (notDeletedBranches.length === 0) {
-            for (const weakBranch of note.getParentBranches()) {
-                weakBranch.markAsDeleted(deleteId);
-            }
-
            for (const childBranch of note.getChildBranches()) {
                childBranch.deleteBranch(deleteId, taskContext);
            }

            // first delete children and then parent - this will show up better in recent changes

-            log.info(`Deleting note ${note.noteId}`);
-
-            this.becca.notes[note.noteId].isBeingDeleted = true;
+            log.info("Deleting note " + note.noteId);

            for (const attribute of note.getOwnedAttributes()) {
                attribute.markAsDeleted(deleteId);
@@ -238,15 +216,9 @@ class Branch extends AbstractEntity {

    beforeSaving() {
        if (this.notePosition === undefined || this.notePosition === null) {
-            let maxNotePos = 0;
-
-            for (const childBranch of this.parentNote.getChildBranches()) {
-                if (maxNotePos &lt; childBranch.notePosition &amp;&amp; childBranch.noteId !== '_hidden') {
-                    maxNotePos = childBranch.notePosition;
-                }
-            }
-
-            this.notePosition = maxNotePos + 10;
+            // TODO finding new position can be refactored into becca
+            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) {
@@ -301,7 +273,7 @@ module.exports = Branch;
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -120,7 +120,7 @@ module.exports = EtapiToken;
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -38,7 +38,7 @@ const AbstractEntity = require("./abstract_entity");
 const NoteRevision = require("./note_revision");
 const TaskContext = require("../../services/task_context");
 const dayjs = require("dayjs");
-const utc = require('dayjs/plugin/utc');
+const utc = require('dayjs/plugin/utc')
 dayjs.extend(utc)

 const LABEL = 'label';
@@ -100,8 +100,6 @@ class Note extends AbstractEntity {
        this.utcDateCreated = utcDateCreated || dateUtils.utcNowDateTime();
        /** @type {string} */
        this.utcDateModified = utcDateModified;
-        /** @type {boolean} - set during the deletion operation, before it is completed (removed from becca completely) */
-        this.isBeingDeleted = false;

        // ------ Derived attributes ------

@@ -184,15 +182,6 @@ class Note extends AbstractEntity {
        return this.parentBranches;
    }

-    /**
-     * Returns &lt;i>strong&lt;/i> (as opposed to &lt;i>weak&lt;/i>) parent branches. See isWeak for details.
-     *
-     * @returns {Branch[]}
-     */
-    getStrongParentBranches() {
-        return this.getParentBranches().filter(branch => !branch.isWeak);
-    }
-
    /**
     * @returns {Branch[]}
     * @deprecated use getParentBranches() instead
@@ -239,7 +228,7 @@ class Note extends AbstractEntity {
                return undefined;
            }
            else {
-                throw new Error(`Cannot find note content for noteId=${this.noteId}`);
+                throw new Error("Cannot find note content for noteId=" + this.noteId);
            }
        }

@@ -332,7 +321,7 @@ class Note extends AbstractEntity {

        sql.upsert("note_contents", "noteId", pojo);

-        const hash = utils.hash(`${this.noteId}|${pojo.content.toString()}`);
+        const hash = utils.hash(this.noteId + "|" + pojo.content.toString());

        entityChangesService.addEntityChange({
            entityName: 'note_contents',
@@ -360,7 +349,7 @@ class Note extends AbstractEntity {

    /** @returns {boolean} true if this note is JavaScript (code or attachment) */
    isJavaScript() {
-        return (this.type === "code" || this.type === "file" || this.type === 'launcher')
+        return (this.type === "code" || this.type === "file")
            &amp;&amp; (this.mime.startsWith("application/javascript")
                || this.mime === "application/x-javascript"
                || this.mime === "text/javascript");
@@ -400,8 +389,6 @@ class Note extends AbstractEntity {
     * @returns {Attribute[]} all note's attributes, including inherited ones
     */
    getAttributes(type, name) {
-        this.__validateTypeName(type, name);
-
        this.__getAttributes([]);

        if (type &amp;&amp; name) {
@@ -414,8 +401,7 @@ class Note extends AbstractEntity {
            return this.__attributeCache.filter(attr => attr.name === name);
        }
        else {
-            // a bit unsafe to return the original array, but defensive copy would be costly
-            return this.__attributeCache;
+            return this.__attributeCache.slice();
        }
    }

@@ -445,7 +431,7 @@ class Note extends AbstractEntity {
                        templateAttributes.push(
                            ...templateNote.__getAttributes(newPath)
                                // template attr is used as a marker for templates, but it's not meant to be inherited
-                                .filter(attr => !(attr.type === 'label' &amp;&amp; (attr.name === 'template' || attr.name === 'workspacetemplate')))
+                                .filter(attr => !(attr.type === 'label' &amp;&amp; attr.name === 'template'))
                        );
                    }
                }
@@ -491,26 +477,13 @@ class Note extends AbstractEntity {
        return this.inheritableAttributeCache;
    }

-    __validateTypeName(type, name) {
-        if (type &amp;&amp; type !== 'label' &amp;&amp; type !== 'relation') {
-            throw new Error(`Unrecognized attribute type '${type}'. Only 'label' and 'relation' are possible values.`);
-        }
-
-        if (name) {
-            const firstLetter = name.charAt(0);
-            if (firstLetter === '#' || firstLetter === '~') {
-                throw new Error(`Detect '#' or '~' in the attribute's name. In the API, attribute names should be set without these characters.`);
-            }
-        }
-    }
-
    /**
     * @param type
     * @param name
     * @param [value]
     * @returns {boolean}
     */
-    hasAttribute(type, name, value = null) {
+    hasAttribute(type, name, value) {
        return !!this.getAttributes().find(attr =>
            attr.type === type
            &amp;&amp; attr.name === name
@@ -702,13 +675,16 @@ class Note extends AbstractEntity {
    }

    /**
-     * @param {string|null} [type] - (optional) attribute type to filter
-     * @param {string|null} [name] - (optional) attribute name to filter
-     * @param {string|null} [value] - (optional) attribute value to filter
+     * @param {string} [type] - (optional) attribute type to filter
+     * @param {string} [name] - (optional) attribute name to filter
+     * @param {string} [value] - (optional) attribute value to filter
     * @returns {Attribute[]} note's "owned" attributes - excluding inherited ones
     */
-    getOwnedAttributes(type = null, name = null, value = null) {
-        this.__validateTypeName(type, name);
+    getOwnedAttributes(type, name, value) {
+        // it's a common mistake to include # or ~ into attribute name
+        if (name &amp;&amp; ["#", "~"].includes(name[0])) {
+            name = name.substr(1);
+        }

        if (type &amp;&amp; name &amp;&amp; value !== undefined &amp;&amp; value !== null) {
            return this.ownedAttributes.filter(attr => attr.type === type &amp;&amp; attr.name === name &amp;&amp; attr.value === value);
@@ -732,7 +708,7 @@ class Note extends AbstractEntity {
     *
     * This method can be significantly faster than the getAttribute()
     */
-    getOwnedAttribute(type, name, value = null) {
+    getOwnedAttribute(type, name, value) {
        const attrs = this.getOwnedAttributes(type, name, value);

        return attrs.length > 0 ? attrs[0] : null;
@@ -750,12 +726,10 @@ class Note extends AbstractEntity {
    // this is done so that non-search &amp; non-archived paths are always explored as first when looking for note path
    sortParents() {
        this.parentBranches.sort((a, b) =>
-            a.branchId.startsWith('virt-') // FIXME: search virtual notes appear only in froca so this is probably not necessary
-            || a.parentNote?.hasInheritableOwnedArchivedLabel() ? 1 : -1);
+            a.branchId.startsWith('virt-')
+            || a.parentNote.hasInheritableOwnedArchivedLabel() ? 1 : -1);

-        this.parents = this.parentBranches
-            .map(branch => branch.parentNote)
-            .filter(note => !!note);
+        this.parents = this.parentBranches.map(branch => branch.parentNote);
    }

    /**
@@ -767,22 +741,22 @@ class Note extends AbstractEntity {
     */
    getFlatText() {
        if (!this.flatTextCache) {
-            this.flatTextCache = `${this.noteId} ${this.type} ${this.mime} `;
+            this.flatTextCache = this.noteId + ' ' + this.type + ' ' + this.mime + ' ';

            for (const branch of this.parentBranches) {
                if (branch.prefix) {
-                    this.flatTextCache += `${branch.prefix} `;
+                    this.flatTextCache += branch.prefix + ' ';
                }
            }

-            this.flatTextCache += `${this.title} `;
+            this.flatTextCache += this.title + ' ';

            for (const attr of this.getAttributes()) {
                // it's best to use space as separator since spaces are filtered from the search string by the tokenization into words
-                this.flatTextCache += `${attr.type === 'label' ? '#' : '~'}${attr.name}`;
+                this.flatTextCache += (attr.type === 'label' ? '#' : '~') + attr.name;

                if (attr.value) {
-                    this.flatTextCache += `=${attr.value}`;
+                    this.flatTextCache += '=' + attr.value;
                }

                this.flatTextCache += ' ';
@@ -891,93 +865,30 @@ class Note extends AbstractEntity {
        return Array.from(set);
    }

-    /** @return {Note[]} */
-    getSearchResultNotes() {
-        if (this.type !== 'search') {
-            return [];
-        }
-
-        try {
-            const searchService = require("../../services/search/services/search");
-            const {searchResultNoteIds} = searchService.searchFromNote(this);
-
-            const becca = this.becca;
-            return searchResultNoteIds
-                .map(resultNoteId => becca.notes[resultNoteId])
-                .filter(note => !!note);
-        }
-        catch (e) {
-            log.error(`Could not resolve search note ${this.noteId}: ${e.message}`);
-            return [];
-        }
-    }
-
-    /**
-     * @returns {{notes: Note[], relationships: Array.&lt;{parentNoteId: string, childNoteId: string}>}}
-     */
-    getSubtree({includeArchived = true, includeHidden = false, resolveSearch = false} = {}) {
+    /** @returns {Note[]} */
+    getSubtreeNotes(includeArchived = true) {
        const noteSet = new Set();
-        const relationships = []; // list of tuples parentNoteId -> childNoteId
-
-        function resolveSearchNote(searchNote) {
-            try {
-                for (const resultNote of searchNote.getSearchResultNotes()) {
-                    addSubtreeNotesInner(resultNote, searchNote);
-                }
-            }
-            catch (e) {
-                log.error(`Could not resolve search note ${searchNote?.noteId}: ${e.message}`);
-            }
-        }
-
-        function addSubtreeNotesInner(note, parentNote = null) {
-            if (note.noteId === '_hidden' &amp;&amp; !includeHidden) {
-                return;
-            }
-
-            if (parentNote) {
-                // this needs to happen first before noteSet check to include all clone relationships
-                relationships.push({
-                    parentNoteId: parentNote.noteId,
-                    childNoteId: note.noteId
-                });
-            }
-
-            if (noteSet.has(note)) {
-                return;
-            }

+        function addSubtreeNotesInner(note) {
            if (!includeArchived &amp;&amp; note.isArchived) {
                return;
            }

            noteSet.add(note);

-            if (note.type === 'search') {
-                if (resolveSearch) {
-                    resolveSearchNote(note);
-                }
-            }
-            else {
-                for (const childNote of note.children) {
-                    addSubtreeNotesInner(childNote, note);
-                }
+            for (const childNote of note.children) {
+                addSubtreeNotesInner(childNote);
            }
        }

        addSubtreeNotesInner(this);

-        return {
-            notes: Array.from(noteSet),
-            relationships
-        };
+        return Array.from(noteSet);
    }

    /** @returns {String[]} */
-    getSubtreeNoteIds({includeArchived = true, resolveSearch = false} = {}) {
-        return this.getSubtree({includeArchived, resolveSearch})
-            .notes
-            .map(note => note.noteId);
+    getSubtreeNoteIds(includeArchived = true) {
+        return this.getSubtreeNotes(includeArchived).map(note => note.noteId);
    }

    getDescendantNoteIds() {
@@ -1069,10 +980,6 @@ class Note extends AbstractEntity {
        return false;
    }

-    isInHiddenSubtree() {
-        return this.noteId === '_hidden' || this.hasAncestor('_hidden');
-    }
-
    getTargetRelations() {
        return this.targetRelations;
    }
@@ -1155,7 +1062,7 @@ class Note extends AbstractEntity {
        const attributes = this.getOwnedAttributes();
        const attr = attributes.find(attr => attr.type === type &amp;&amp; attr.name === name);

-        value = value?.toString() || "";
+        value = value !== null &amp;&amp; value !== undefined ? value.toString() : "";

        if (attr) {
            if (attr.value !== value) {
@@ -1193,13 +1100,6 @@ class Note extends AbstractEntity {
    }

    /**
-     * Adds a new attribute to this note. The attribute is saved and returned.
-     * See addLabel, addRelation for more specific methods.
-     *
-     * @param {string} type - attribute type (label / relation)
-     * @param {string} name - name of the attribute, not including the leading ~/#
-     * @param {string} [value] - value of the attribute - text for labels, target note ID for relations; optional.
-     *
     * @return {Attribute}
     */
    addAttribute(type, name, value = "", isInheritable = false, position = 1000) {
@@ -1215,27 +1115,10 @@ class Note extends AbstractEntity {
        }).save();
    }

-    /**
-     * Adds a new label to this note. The label attribute is saved and returned.
-     *
-     * @param {string} name - name of the label, not including the leading #
-     * @param {string} [value] - text value of the label; optional
-     *
-     * @return {Attribute}
-     */
    addLabel(name, value = "", isInheritable = false) {
        return this.addAttribute(LABEL, name, value, isInheritable);
    }

-    /**
-     * Adds a new relation to this note. The relation attribute is saved and
-     * returned.
-     *
-     * @param {string} name - name of the relation, not including the leading ~
-     * @param {string} value - ID of the target note of the relation
-     *
-     * @return {Attribute}
-     */
    addRelation(name, targetNoteId, isInheritable = false) {
        return this.addAttribute(RELATION, name, targetNoteId, isInheritable);
    }
@@ -1372,16 +1255,8 @@ class Note extends AbstractEntity {
        }
    }

-    isLaunchBarConfig() {
-        return this.type === 'launcher' || ['_lbRoot', '_lbAvailableLaunchers', '_lbVisibleLaunchers'].includes(this.noteId);
-    }
-
-    isOptions() {
-        return this.noteId.startsWith("options");
-    }
-
    get isDeleted() {
-        return !(this.noteId in this.becca.notes) || this.isBeingDeleted;
+        return !(this.noteId in this.becca.notes);
    }

    /**
@@ -1477,7 +1352,7 @@ module.exports = Note;
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -109,7 +109,7 @@ class NoteRevision extends AbstractEntity {
                return undefined;
            }
            else {
-                throw new Error(`Cannot find note revision content for noteRevisionId=${this.noteRevisionId}`);
+                throw new Error("Cannot find note revision content for noteRevisionId=" + this.noteRevisionId);
            }
        }

@@ -152,7 +152,7 @@ class NoteRevision extends AbstractEntity {

        sql.upsert("note_revision_contents", "noteRevisionId", pojo);

-        const hash = utils.hash(`${this.noteRevisionId}|${pojo.content.toString()}`);
+        const hash = utils.hash(this.noteRevisionId + "|" + pojo.content.toString());

        entityChangesService.addEntityChange({
            entityName: 'note_revision_contents',
@@ -235,7 +235,7 @@ module.exports = NoteRevision;
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -89,7 +89,7 @@ module.exports = Option;
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -77,7 +77,7 @@ module.exports = RecentNote;
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -237,7 +237,7 @@

            

-            <td class="description last">text, code, file, image, search, book, relationMap, canvas - MANDATORY</td>
+            <td class="description last">text, code, file, image, search, book, relation-map, canvas - MANDATORY</td>
        </tr>

    
@@ -391,7 +391,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line212">line 212</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line208">line 208</a>
    </li></ul></dd>
    

@@ -579,7 +579,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line173">line 173</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line169">line 169</a>
    </li></ul></dd>
    

@@ -767,7 +767,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line233">line 233</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line229">line 229</a>
    </li></ul></dd>
    

@@ -1053,635 +1053,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line240">line 240</a>
-    </li></ul></dd>
-    
-
-    
-
-    
-
-    
-</dl>
-
-
-
-
-
-
-            
-                
-<h4 class="name" id="CreateOrUpdateLauncher">CreateOrUpdateLauncher</h4>
-
-
-
-
-
-
-    <h5>Type:</h5>
-    <ul>
-        <li>
-            
-<span class="param-type">Object</span>
-
-
-        </li>
-    </ul>
-
-
-
-
-
-    <h5 class="subsection-title">Properties:</h5>
-
-    
-
-<table class="props">
-    <thead>
-    <tr>
-        
-        <th>Name</th>
-        
-
-        <th>Type</th>
-
-        
-        <th>Attributes</th>
-        
-
-        
-        <th>Default</th>
-        
-
-        <th class="last">Description</th>
-    </tr>
-    </thead>
-
-    <tbody>
-    
-
-        <tr>
-            
-                <td class="name"><code>id</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                </td>
-            
-
-            <td class="description last">id of the launcher, only alphanumeric at least 6 characters long</td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>type</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                </td>
-            
-
-            <td class="description last">one of
-                         * "note" - activating the launcher will navigate to the target note (specified in targetNoteId param)
-                         * "script" -  activating the launcher will execute the script (specified in scriptNoteId param)
-                         * "customWidget" - the launcher will be rendered with a custom widget (specified in widgetNoteId param)</td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>title</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                </td>
-            
-
-            <td class="description last"></td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>isVisible</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">boolean</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                    false
-                
-                </td>
-            
-
-            <td class="description last">if true, will be created in the "Visible launchers", otherwise in "Available launchers"</td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>icon</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                </td>
-            
-
-            <td class="description last">name of the boxicon to be used (e.g. "bx-time")</td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>keyboardShortcut</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                </td>
-            
-
-            <td class="description last">will activate the target note/script upon pressing, e.g. "ctrl+e"</td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>targetNoteId</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                </td>
-            
-
-            <td class="description last">for type "note"</td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>scriptNoteId</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                </td>
-            
-
-            <td class="description last">for type "script"</td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>widgetNoteId</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                </td>
-            
-
-            <td class="description last">for type "customWidget"</td>
-        </tr>
-
-    
-    </tbody>
-</table>
-
-
-
-
-<dl class="details">
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-    <dt class="tag-source">Source:</dt>
-    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line487">line 487</a>
-    </li></ul></dd>
-    
-
-    
-
-    
-
-    
-</dl>
-
-
-
-
-
-
-            
-                
-<h4 class="name" id="SortConfig">SortConfig</h4>
-
-
-
-
-
-
-    <h5>Type:</h5>
-    <ul>
-        <li>
-            
-<span class="param-type">Object</span>
-
-
-        </li>
-    </ul>
-
-
-
-
-
-    <h5 class="subsection-title">Properties:</h5>
-
-    
-
-<table class="props">
-    <thead>
-    <tr>
-        
-        <th>Name</th>
-        
-
-        <th>Type</th>
-
-        
-        <th>Attributes</th>
-        
-
-        
-        <th>Default</th>
-        
-
-        <th class="last">Description</th>
-    </tr>
-    </thead>
-
-    <tbody>
-    
-
-        <tr>
-            
-                <td class="name"><code>sortBy</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                    title
-                
-                </td>
-            
-
-            <td class="description last">'title', 'dateCreated', 'dateModified' or a label name
-                              see https://github.com/zadam/trilium/wiki/Sorting for details.</td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>reverse</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">boolean</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                    false
-                
-                </td>
-            
-
-            <td class="description last"></td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>foldersFirst</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">boolean</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                    false
-                
-                </td>
-            
-
-            <td class="description last"></td>
-        </tr>
-
-    
-    </tbody>
-</table>
-
-
-
-
-<dl class="details">
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-    <dt class="tag-source">Source:</dt>
-    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line400">line 400</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line236">line 236</a>
    </li></ul></dd>
    

@@ -1717,7 +1089,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -56,7 +56,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -28,6 +28,8 @@

 <header>
    
+        
+    
 </header>

 <article>
@@ -36,50 +38,6 @@
        

        
-
-
-<dl class="details">
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-    <dt class="tag-source">Source:</dt>
-    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line3">line 3</a>
-    </li></ul></dd>
-    
-
-    
-
-    
-
-    
-</dl>
-
-
-        
    
    </div>

@@ -250,7 +208,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line361">line 361</a>
+        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line355">line 355</a>
    </li></ul></dd>
    

@@ -430,7 +388,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line352">line 352</a>
+        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line346">line 346</a>
    </li></ul></dd>
    

@@ -632,7 +590,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line342">line 342</a>
+        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line336">line 336</a>
    </li></ul></dd>
    

@@ -834,7 +792,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line318">line 318</a>
+        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line312">line 312</a>
    </li></ul></dd>
    

@@ -1036,7 +994,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line329">line 329</a>
+        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line323">line 323</a>
    </li></ul></dd>
    

@@ -1238,7 +1196,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line308">line 308</a>
+        <a href="services_sql.js.html">services/sql.js</a>, <a href="services_sql.js.html#line302">line 302</a>
    </li></ul></dd>
    

@@ -1300,7 +1258,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -42,10 +42,6 @@ const appInfo = require('./app_info');
 const searchService = require('./search/services/search');
 const SearchContext = require("./search/search_context");
 const becca = require("../becca/becca");
-const ws = require("./ws");
-const SpacedUpdate = require("./spaced_update");
-const specialNotesService = require("./special_notes");
-const branchService = require("./branches.js");

 /**
 * This is the main backend API interface for scripts. It's published in the local "api" object.
@@ -242,7 +238,7 @@ function BackendScriptApi(currentNote, apiParams) {
     * @property {string} parentNoteId - MANDATORY
     * @property {string} title - MANDATORY
     * @property {string|buffer} content - MANDATORY
-     * @property {string} type - text, code, file, image, search, book, relationMap, canvas - MANDATORY
+     * @property {string} type - text, code, file, image, search, book, relation-map, canvas - MANDATORY
     * @property {string} mime - value is derived from default mimes for type
     * @property {boolean} isProtected - default is false
     * @property {boolean} isExpanded - default is false
@@ -320,34 +316,12 @@ function BackendScriptApi(currentNote, apiParams) {
        });
    };

-    this.logMessages = {};
-    this.logSpacedUpdates = {};
-
    /**
-     * Log given message to trilium logs and log pane in UI
+     * Log given message to trilium logs.
     *
     * @param message
     */
-    this.log = message => {
-        log.info(message);
-
-        const {noteId} = this.startNote;
-
-        this.logMessages[noteId] = this.logMessages[noteId] || [];
-        this.logSpacedUpdates[noteId] = this.logSpacedUpdates[noteId] || new SpacedUpdate(() => {
-            const messages = this.logMessages[noteId];
-            this.logMessages[noteId] = [];
-
-            ws.sendMessageToAllClients({
-                type: 'api-log-messages',
-                noteId,
-                messages
-            });
-        }, 100);
-
-        this.logMessages[noteId].push(message);
-        this.logSpacedUpdates[noteId].scheduleUpdate();
-    };
+    this.log = message => log.info(message);

    /**
     * Returns root note of the calendar.
@@ -362,7 +336,6 @@ function BackendScriptApi(currentNote, apiParams) {
     *
     * @method
     * @param {string} date in YYYY-MM-DD format
-     * @param {Note} [rootNote] - specify calendar root note, normally leave empty to use default calendar
     * @returns {Note|null}
     * @deprecated use getDayNote instead
     */
@@ -373,7 +346,6 @@ function BackendScriptApi(currentNote, apiParams) {
     *
     * @method
     * @param {string} date in YYYY-MM-DD format
-     * @param {Note} [rootNote] - specify calendar root note, normally leave empty to use default calendar
     * @returns {Note|null}
     */
    this.getDayNote = dateNoteService.getDayNote;
@@ -382,7 +354,6 @@ function BackendScriptApi(currentNote, apiParams) {
     * Returns today's day note. If such note doesn't exist, it is created.
     *
     * @method
-     * @param {Note} [rootNote] - specify calendar root note, normally leave empty to use default calendar
     * @returns {Note|null}
     */
    this.getTodayNote = dateNoteService.getTodayNote;
@@ -392,8 +363,7 @@ function BackendScriptApi(currentNote, apiParams) {
     *
     * @method
     * @param {string} date in YYYY-MM-DD format
-     * @param {object} [options] - "startOfTheWeek" - either "monday" (default) or "sunday"
-     * @param {Note} [rootNote] - specify calendar root note, normally leave empty to use default calendar
+     * @param {object} options - "startOfTheWeek" - either "monday" (default) or "sunday"
     * @returns {Note|null}
     */
    this.getWeekNote = dateNoteService.getWeekNote;
@@ -403,7 +373,6 @@ function BackendScriptApi(currentNote, apiParams) {
     *
     * @method
     * @param {string} date in YYYY-MM format
-     * @param {Note} [rootNote] - specify calendar root note, normally leave empty to use default calendar
     * @returns {Note|null}
     */
    this.getMonthNote = dateNoteService.getMonthNote;
@@ -413,40 +382,16 @@ function BackendScriptApi(currentNote, apiParams) {
     *
     * @method
     * @param {string} year in YYYY format
-     * @param {Note} [rootNote] - specify calendar root note, normally leave empty to use default calendar
     * @returns {Note|null}
     */
    this.getYearNote = dateNoteService.getYearNote;

    /**
     * @method
-     * @deprecated - use sortNotes instead
     * @param {string} parentNoteId - this note's child notes will be sorted
     */
    this.sortNotesByTitle = parentNoteId => treeService.sortNotes(parentNoteId);

-    /**
-     * @typedef {Object} SortConfig
-     * @property {string} [sortBy=title] - 'title', 'dateCreated', 'dateModified' or a label name
-     *                               see https://github.com/zadam/trilium/wiki/Sorting for details.
-     * @property {boolean} [reverse=false]
-     * @property {boolean} [foldersFirst=false]
-     */
-
-    /**
-     * Sort child notes of a given note.
-     *
-     * @method
-     * @param {string} parentNoteId - this note's child notes will be sorted
-     * @param {SortConfig} [sortConfig]
-     */
-    this.sortNotes = (parentNoteId, sortConfig = {}) => treeService.sortNotes(
-        parentNoteId,
-        sortConfig.sortBy || "title",
-        !!sortConfig.reverse,
-        !!sortConfig.foldersFirst
-    );
-
    /**
     * This method finds note by its noteId and prefix and either sets it to the given parentNoteId
     * or removes the branch (if parentNoteId is not given).
@@ -503,93 +448,13 @@ function BackendScriptApi(currentNote, apiParams) {
     * @method
     * @deprecated - this is now no-op since all the changes should be gracefully handled per widget
     */
-    this.refreshTree = () => {
-        console.warn("api.refreshTree() is a NO-OP and can be removed from your script.")
-    };
+    this.refreshTree = () => {};

    /**
     * @return {{syncVersion, appVersion, buildRevision, dbVersion, dataDirectory, buildDate}|*} - object representing basic info about running Trilium version
     */
    this.getAppInfo = () => appInfo

-    /**
-     * @typedef {Object} CreateOrUpdateLauncher
-     * @property {string} id - id of the launcher, only alphanumeric at least 6 characters long
-     * @property {string} type - one of
-     *                          * "note" - activating the launcher will navigate to the target note (specified in targetNoteId param)
-     *                          * "script" -  activating the launcher will execute the script (specified in scriptNoteId param)
-     *                          * "customWidget" - the launcher will be rendered with a custom widget (specified in widgetNoteId param)
-     * @property {string} title
-     * @property {boolean} [isVisible=false] - if true, will be created in the "Visible launchers", otherwise in "Available launchers"
-     * @property {string} [icon] - name of the boxicon to be used (e.g. "bx-time")
-     * @property {string} [keyboardShortcut] - will activate the target note/script upon pressing, e.g. "ctrl+e"
-     * @property {string} [targetNoteId] - for type "note"
-     * @property {string} [scriptNoteId] - for type "script"
-     * @property {string} [widgetNoteId] - for type "customWidget"
-     */
-
-    /**
-     * Creates a new launcher to the launchbar. If the launcher (id) already exists, it will be updated.
-     *
-     * @param {CreateOrUpdateLauncher} opts
-     */
-    this.createOrUpdateLauncher = opts => {
-        if (!opts.id) { throw new Error("ID is a mandatory parameter for api.createOrUpdateLauncher(opts)"); }
-        if (!opts.id.match(/[a-z0-9]{6,1000}/i)) { throw new Error(`ID must be an alphanumeric string at least 6 characters long.`); }
-        if (!opts.type) { throw new Error("Launcher Type is a mandatory parameter for api.createOrUpdateLauncher(opts)"); }
-        if (!["note", "script", "customWidget"].includes(opts.type)) { throw new Error(`Given launcher type '${opts.type}'`); }
-        if (!opts.title?.trim()) { throw new Error("Title is a mandatory parameter for api.createOrUpdateLauncher(opts)"); }
-        if (opts.type === 'note' &amp;&amp; !opts.targetNoteId) { throw new Error("targetNoteId is mandatory for launchers of type 'note'"); }
-        if (opts.type === 'script' &amp;&amp; !opts.scriptNoteId) { throw new Error("scriptNoteId is mandatory for launchers of type 'script'"); }
-        if (opts.type === 'customWidget' &amp;&amp; !opts.widgetNoteId) { throw new Error("widgetNoteId is mandatory for launchers of type 'customWidget'"); }
-
-        const parentNoteId = !!opts.isVisible ? '_lbVisibleLaunchers' : '_lbAvailableLaunchers';
-        const noteId = 'al_' + opts.id;
-
-        const launcherNote =
-            becca.getNote(opts.id) ||
-            specialNotesService.createLauncher({
-                noteId: noteId,
-                parentNoteId: parentNoteId,
-                launcherType: opts.type,
-            }).note;
-
-        if (launcherNote.title !== opts.title) {
-            launcherNote.title = opts.title;
-            launcherNote.save();
-        }
-
-        if (launcherNote.getParentBranches().length === 1) {
-            const branch = launcherNote.getParentBranches()[0];
-
-            if (branch.parentNoteId !== parentNoteId) {
-                branchService.moveBranchToNote(branch, parentNoteId);
-            }
-        }
-
-        if (opts.type === 'note') {
-            launcherNote.setRelation('target', opts.targetNoteId);
-        } else if (opts.type === 'script') {
-            launcherNote.setRelation('script', opts.scriptNoteId);
-        } else if (opts.type === 'customWidget') {
-            launcherNote.setRelation('widget', opts.widgetNoteId);
-        } else {
-            throw new Error(`Unrecognized launcher type '${opts.type}'`);
-        }
-
-        if (opts.keyboardShortcut) {
-            launcherNote.setLabel('keyboardShortcut', opts.keyboardShortcut);
-        } else {
-            launcherNote.removeLabel('keyboardShortcut');
-        }
-
-        if (opts.icon) {
-            launcherNote.setLabel('iconClass', `bx ${opts.icon}`);
-        } else {
-            launcherNote.removeLabel('keyboardShortcut');
-        }
-    };
-
    /**
     * This object contains "at your risk" and "no BC guarantees" objects for advanced use cases.
     *
@@ -617,7 +482,7 @@ module.exports = BackendScriptApi;
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -56,20 +56,14 @@ const LOG_ALL_QUERIES = false;
 function insert(tableName, rec, replace = false) {
    const keys = Object.keys(rec);
    if (keys.length === 0) {
-        log.error(`Can't insert empty object into table ${tableName}`);
+        log.error("Can't insert empty object into table " + tableName);
        return;
    }

    const columns = keys.join(", ");
    const questionMarks = keys.map(p => "?").join(", ");

-    const query = `INSERT
-    ${replace ? "OR REPLACE" : ""} INTO
-    ${tableName}
-    (
-    ${columns}
-    )
-    VALUES (${questionMarks})`;
+    const query = "INSERT " + (replace ? "OR REPLACE" : "") + " INTO " + tableName + "(" + columns + ") VALUES (" + questionMarks + ")";

    const res = execute(query, Object.values(rec));

@@ -83,13 +77,13 @@ function replace(tableName, rec) {
 function upsert(tableName, primaryKey, rec) {
    const keys = Object.keys(rec);
    if (keys.length === 0) {
-        log.error(`Can't upsert empty object into table ${tableName}`);
+        log.error("Can't upsert empty object into table " + tableName);
        return;
    }

    const columns = keys.join(", ");

-    const questionMarks = keys.map(colName => `@${colName}`).join(", ");
+    const questionMarks = keys.map(colName => "@" + colName).join(", ");

    const updateMarks = keys.map(colName => `${colName} = @${colName}`).join(", ");

@@ -306,7 +300,7 @@ function fillParamList(paramIds, truncate = true) {
    }

    // doing it manually to avoid this showing up on the sloq query list
-    const s = stmt(`INSERT INTO param_list VALUES ${paramIds.map(paramId => `(?)`).join(',')}`, paramIds);
+    const s = stmt(`INSERT INTO param_list VALUES ` + paramIds.map(paramId => `(?)`).join(','), paramIds);

    s.run(paramIds);
 }
@@ -410,7 +404,7 @@ module.exports = {
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -844,13 +844,13 @@ and relation (representing named relationship between source and target note)</d
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -1056,13 +1056,13 @@ parents.</div>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -775,13 +775,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -115,13 +115,13 @@ export default Attribute;
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -80,12 +80,6 @@ class Branch {
    get toString() {
        return `Branch(branchId=${this.branchId})`;
    }
-
-    get pojo() {
-        const pojo = {...this};
-        delete pojo.froca;
-        return pojo;
-    }
 }

 export default Branch;
@@ -99,13 +93,13 @@ export default Branch;
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -76,13 +76,13 @@ export default NoteComplement;
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -31,8 +31,6 @@ import noteAttributeCache from "../services/note_attribute_cache.js";
 import ws from "../services/ws.js";
 import options from "../services/options.js";
 import froca from "../services/froca.js";
-import protectedSessionHolder from "../services/protected_session_holder.js";
-import cssClassManager from "../services/css_class_manager.js";

 const LABEL = 'label';
 const RELATION = 'relation';
@@ -43,15 +41,12 @@ const NOTE_TYPE_ICONS = {
    "code": "bx bx-code",
    "render": "bx bx-extension",
    "search": "bx bx-file-find",
-    "relationMap": "bx bx-map-alt",
+    "relation-map": "bx bx-map-alt",
    "book": "bx bx-book",
-    "noteMap": "bx bx-map-alt",
+    "note-map": "bx bx-map-alt",
    "mermaid": "bx bx-selection",
    "canvas": "bx bx-pen",
-    "webView": "bx bx-globe-alt",
-    "launcher": "bx bx-link",
-    "doc": "bx bxs-file-doc",
-    "contentWidget": "bx bxs-widget"
+    "web-view": "bx bx-globe-alt"
 };

 /**
@@ -147,7 +142,7 @@ class NoteShort {

    async getContent() {
        // we're not caching content since these objects are in froca and as such pretty long lived
-        const note = await server.get(`notes/${this.noteId}`);
+        const note = await server.get("notes/" + this.noteId);

        return note.content;
    }
@@ -299,7 +294,7 @@ class NoteShort {
                    attrArrs.push(
                        templateNote.__getCachedAttributes(newPath)
                            // template attr is used as a marker for templates, but it's not meant to be inherited
-                            .filter(attr => !(attr.type === 'label' &amp;&amp; (attr.name === 'template' || attr.name === 'workspacetemplate')))
+                            .filter(attr => !(attr.type === 'label' &amp;&amp; attr.name === 'template'))
                    );
                }
            }
@@ -320,7 +315,7 @@ class NoteShort {
    }

    isRoot() {
-        return this.noteId === 'root';
+        return this.noted
    }

    getAllNotePaths(encounteredNoteIds = null) {
@@ -372,7 +367,7 @@ class NoteShort {
            isInHoistedSubTree: path.includes(hoistedNotePath),
            isArchived: path.find(noteId => froca.notes[noteId].hasLabel('archived')),
            isSearch: path.find(noteId => froca.notes[noteId].type === 'search'),
-            isHidden: path.includes('_hidden')
+            isHidden: path.includes("hidden")
        }));

        notePaths.sort((a, b) => {
@@ -382,8 +377,6 @@ class NoteShort {
                return a.isSearch ? 1 : -1;
            } else if (a.isArchived !== b.isArchived) {
                return a.isArchived ? 1 : -1;
-            } else if (a.isHidden !== b.isHidden) {
-                return a.isHidden ? 1 : -1;
            } else {
                return a.notePath.length - b.notePath.length;
            }
@@ -393,8 +386,6 @@ class NoteShort {
    }

    __filterAttrs(attributes, type, name) {
-        this.__validateTypeName(type, name);
-
        if (!type &amp;&amp; !name) {
            return attributes;
        } else if (type &amp;&amp; name) {
@@ -412,19 +403,6 @@ class NoteShort {
        return attrs.filter(attr => attr.isInheritable);
    }

-    __validateTypeName(type, name) {
-        if (type &amp;&amp; type !== 'label' &amp;&amp; type !== 'relation') {
-            throw new Error(`Unrecognized attribute type '${type}'. Only 'label' and 'relation' are possible values.`);
-        }
-
-        if (name) {
-            const firstLetter = name.charAt(0);
-            if (firstLetter === '#' || firstLetter === '~') {
-                throw new Error(`Detect '#' or '~' in the attribute's name. In the API, attribute names should be set without these characters.`);
-            }
-        }
-    }
-
    /**
     * @param {string} [name] - label name to filter
     * @returns {Attribute[]} all note's labels (attributes with type label), including inherited ones
@@ -454,7 +432,7 @@ class NoteShort {
        else if (this.noteId === 'root') {
            return "bx bx-chevrons-right";
        }
-        if (this.noteId === '_share') {
+        if (this.noteId === 'share') {
            return "bx bx-share-alt";
        }
        else if (this.type === 'text') {
@@ -473,11 +451,6 @@ class NoteShort {
        }
    }

-    getColorClass() {
-        const color = this.getLabelValue("color");
-        return cssClassManager.createClassForColor(color);
-    }
-
    isFolder() {
        return this.type === 'search'
            || this.getFilteredChildBranches().length > 0;
@@ -738,10 +711,6 @@ class NoteShort {
        return false;
    }

-    isInHiddenSubtree() {
-        return this.noteId === '_hidden' || this.hasAncestor('_hidden');
-    }
-
    /**
     * @deprecated NOOP
     */
@@ -805,7 +774,7 @@ class NoteShort {

    /** @returns {boolean} true if this note is JavaScript (code or attachment) */
    isJavaScript() {
-        return (this.type === "code" || this.type === "file" || this.type === 'launcher')
+        return (this.type === "code" || this.type === "file")
            &amp;&amp; (this.mime.startsWith("application/javascript")
                || this.mime === "application/x-javascript"
                || this.mime === "text/javascript");
@@ -842,10 +811,10 @@ class NoteShort {

        if (env === "frontend") {
            const bundleService = (await import("../services/bundle.js")).default;
-            return await bundleService.getAndExecuteBundle(this.noteId);
+            await bundleService.getAndExecuteBundle(this.noteId);
        }
        else if (env === "backend") {
-            const resp = await server.post(`script/run/${this.noteId}`);
+            await server.post('script/run/' + this.noteId);
        }
        else {
            throw new Error(`Unrecognized env type ${env} for note ${this.noteId}`);
@@ -864,25 +833,13 @@ class NoteShort {
                continue;
            }

-            if (parentNote.noteId === '_share' || parentNote.isShared()) {
+            if (parentNote.noteId === 'share' || parentNote.isShared()) {
                return true;
            }
        }

        return false;
    }
-
-    isContentAvailable() {
-        return !this.isProtected || protectedSessionHolder.isProtectedSessionAvailable()
-    }
-
-    isLaunchBarConfig() {
-        return this.type === 'launcher' || ['_lbRoot', '_lbAvailableLaunchers', '_lbVisibleLaunchers'].includes(this.noteId);
-    }
-
-    isOptions() {
-        return this.noteId.startsWith("options");
-    }
 }

 export default NoteShort;
@@ -896,13 +853,13 @@ export default NoteShort;
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -194,7 +194,7 @@

        
                
-<h4 class="name" id="AddButtonToToolbarOptions">AddButtonToToolbarOptions</h4>
+<h4 class="name" id="ToolbarButtonOptions">ToolbarButtonOptions</h4>



@@ -241,38 +241,6 @@
    <tbody>
    

-        <tr>
-            
-                <td class="name"><code>id</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-                </td>
-            
-
-            
-
-            <td class="description last">id of the button, used to identify the old instances of this button to be replaced
-                         ID is optional because of BC, but not specifying it is deprecated. ID can be alphanumeric only.</td>
-        </tr>
-
-    
-
        <tr>
            
                <td class="name"><code>title</code></td>
@@ -427,7 +395,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line108">line 108</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line124">line 124</a>
    </li></ul></dd>
    

@@ -457,13 +425,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -50,13 +50,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -155,13 +155,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -37,11 +37,10 @@ import dateNotesService from './date_notes.js';
 import searchService from './search.js';
 import CollapsibleWidget from '../widgets/collapsible_widget.js';
 import ws from "./ws.js";
-import appContext from "../components/app_context.js";
+import appContext from "./app_context.js";
 import NoteContextAwareWidget from "../widgets/note_context_aware_widget.js";
+import NoteContextCachingWidget from "../widgets/note_context_caching_widget.js";
 import BasicWidget from "../widgets/basic_widget.js";
-import SpacedUpdate from "./spaced_update.js";
-import shortcutService from "./shortcuts.js";

 /**
 * This is the main frontend API interface for scripts. It's published in the local "api" object.
@@ -50,6 +49,8 @@ import shortcutService from "./shortcuts.js";
 * @hideconstructor
 */
 function FrontendScriptApi(startNote, currentNote, originEntity = null, $container = null) {
+    const $pluginButtons = $("#plugin-buttons");
+
    /** @property {jQuery} container of all the rendered script content */
    this.$container = $container;

@@ -66,9 +67,24 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
    /** @property {CollapsibleWidget} */
    this.CollapsibleWidget = CollapsibleWidget;

+    /**
+     * @property {NoteContextAwareWidget}
+     * @deprecated use NoteContextAwareWidget instead
+     */
+    this.TabAwareWidget = NoteContextAwareWidget;
+
    /** @property {NoteContextAwareWidget} */
    this.NoteContextAwareWidget = NoteContextAwareWidget;

+    /**
+     * @property {NoteContextCachingWidget}
+     * @deprecated use NoteContextCachingWidget instead
+     */
+    this.TabCachingWidget = NoteContextCachingWidget;
+
+    /** @property {NoteContextAwareWidget} */
+    this.NoteContextCachingWidget = NoteContextCachingWidget;
+
    /** @property {BasicWidget} */
    this.BasicWidget = BasicWidget;

@@ -134,9 +150,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
    };

    /**
-     * @typedef {Object} AddButtonToToolbarOptions
-     * @property {string} [id] - id of the button, used to identify the old instances of this button to be replaced
-     *                          ID is optional because of BC, but not specifying it is deprecated. ID can be alphanumeric only.
+     * @typedef {Object} ToolbarButtonOptions
     * @property {string} title
     * @property {string} [icon] - name of the boxicon to be used (e.g. "time" for "bx-time" icon)
     * @property {function} action - callback handling the click on the button
@@ -144,19 +158,48 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
     */

    /**
-     * Adds a new launcher to the launchbar. If the launcher (id) already exists, it will be updated.
+     * Adds new button the the plugin area.
     *
-     * @deprecated you can now create/modify launchers in the top-left Menu -> Configure Launchbar
-     *             for special needs there's also backend API's createOrUpdateLauncher()
-     * @param {AddButtonToToolbarOptions} opts
+     * @param {ToolbarButtonOptions} opts
     */
-    this.addButtonToToolbar = async opts => {
-        console.warn("api.addButtonToToolbar() has been deprecated since v0.58 and may be removed in the future. Use  Menu -> Configure Launchbar to create/update launchers instead.");
+    this.addButtonToToolbar = opts => {
+        const buttonId = "toolbar-button-" + opts.title.replace(/\s/g, "-");

-        const {action, ...reqBody} = opts;
-        reqBody.action = action.toString();
+        let button;
+        if (utils.isMobile()) {
+            $('#plugin-buttons-placeholder').remove();
+            button = $('&lt;a class="dropdown-item" href="#">')
+                .on('click', () => {
+                    setTimeout(() => $pluginButtons.dropdown('hide'), 0);
+                });

-        await server.put('special-notes/api-script-launcher', reqBody);
+            if (opts.icon) {
+                button.append($("&lt;span>").addClass("bx bx-" + opts.icon))
+                    .append("&amp;nbsp;");
+            }
+
+            button.append($("&lt;span>").text(opts.title));
+        } else {
+            button = $('&lt;span class="button-widget icon-action bx" data-toggle="tooltip" title="" data-placement="right">&lt;/span>')
+                .addClass("bx bx-" + (opts.icon || "question-mark"));
+
+            button.attr("title", opts.title);
+            button.tooltip({html: true});
+        }
+
+        button = button.on('click', opts.action);
+
+        button.attr('id', buttonId);
+
+        if ($("#" + buttonId).replaceWith(button).length === 0) {
+            $pluginButtons.append(button);
+        }
+
+        if (opts.shortcut) {
+            utils.bindGlobalShortcut(opts.shortcut, opts.action);
+
+            button.attr("title", "Shortcut " + opts.shortcut);
+        }
    };

    function prepareParams(params) {
@@ -166,7 +209,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain

        return params.map(p => {
            if (typeof p === "function") {
-                return `!@#Function: ${p.toString()}`;
+                return "!@#Function: " + p.toString();
            }
            else {
                return p;
@@ -202,7 +245,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
            return ret.executionResult;
        }
        else {
-            throw new Error(`server error: ${ret.error}`);
+            throw new Error("server error: " + ret.error);
        }
    };

@@ -337,7 +380,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
     * @param {boolean} [params.showTooltip=true] - enable/disable tooltip on the link
     * @param {boolean} [params.showNotePath=false] - show also whole note's path as part of the link
     * @param {boolean} [params.showNoteIcon=false] - show also note icon before the title
-     * @param {string} [params.title=] - custom link tile with note's title as default
+     * @param {string} [title=] - custom link tile with note's title as default
     */
    this.createNoteLink = linkService.createNoteLink;

@@ -550,10 +593,8 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
     * @method
     * @param {string} keyboardShortcut - e.g. "ctrl+shift+a"
     * @param {function} handler
-     * @param {string} [namespace] - specify namespace of the handler for the cases where call for bind may be repeated.
-     *                               If a handler with this ID exists, it's replaced by the new handler.
     */
-    this.bindGlobalShortcut = shortcutService.bindGlobalShortcut;
+    this.bindGlobalShortcut = utils.bindGlobalShortcut;

    /**
     * Trilium runs in backend and frontend process, when something is changed on the backend from script,
@@ -581,33 +622,6 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
     * @returns {string} random string
     */
    this.randomString = utils.randomString;
-
-    this.logMessages = {};
-    this.logSpacedUpdates = {};
-
-    /**
-     * Log given message to the log pane in UI
-     *
-     * @param message
-     */
-    this.log = message => {
-        const {noteId} = this.startNote;
-
-        message = `${utils.now()}: ${message}`;
-
-        console.log(`Script ${noteId}: ${message}`);
-
-        this.logMessages[noteId] = this.logMessages[noteId] || [];
-        this.logSpacedUpdates[noteId] = this.logSpacedUpdates[noteId] || new SpacedUpdate(() => {
-            const messages = this.logMessages[noteId];
-            this.logMessages[noteId] = [];
-
-            appContext.triggerEvent("apiLogMessages", {noteId, messages});
-        }, 100);
-
-        this.logMessages[noteId].push(message);
-        this.logSpacedUpdates[noteId].scheduleUpdate();
-    };
 }

 export default FrontendScriptApi;
@@ -621,13 +635,13 @@ export default FrontendScriptApi;
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -48,7 +48,7 @@ export default class CollapsibleWidget extends NoteContextAwareWidget {
    doRender() {
        this.$widget = $(WIDGET_TPL);
        this.contentSized();
-        this.$widget.find('[data-target]').attr('data-target', `#${this.componentId}`);
+        this.$widget.find('[data-target]').attr('data-target', "#" + this.componentId);

        this.$bodyWrapper = this.$widget.find('.body-wrapper');
        this.$bodyWrapper.attr('id', this.componentId); // for toggle to work we need id
@@ -74,13 +74,13 @@ export default class CollapsibleWidget extends NoteContextAwareWidget {
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li><li><a href="module.exports.html">exports</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Attribute.html">Attribute</a></li><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="module.exports.html">exports</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#doRenderBody">doRenderBody</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.10</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -6,7 +6,7 @@ It is meant as a last resort solution when the standard mean to access your data

 ## Installation

-This tool requires node.js, testing has been done on 16.18.0, but it will probably work on other versions as well.
+This tool requires node.js, testing has been done on 16.15.0, but it will probably work on other versions as well.

 ```
 npm install
@@ -2,7 +2,7 @@

 const yargs = require('yargs/yargs')
 const { hideBin } = require('yargs/helpers')
-const dumpService = require("./inc/dump");
+const dumpService = require("./inc/dump.js");

 yargs(hideBin(process.argv))
    .command('$0 <path_to_document> <target_directory>', 'dump the contents of document.db into the target directory', (yargs) => {
@@ -1,6 +1,6 @@
 const crypto = require("crypto");
-const sql = require("./sql");
-const decryptService = require("./decrypt");
+const sql = require("./sql.js");
+const decryptService = require("./decrypt.js");

 function getDataKey(password) {
    if (!password) {
@@ -1,9 +1,9 @@
 const fs = require("fs");
 const sanitize = require("sanitize-filename");
-const sql = require("./sql");
-const decryptService = require("./decrypt");
-const dataKeyService = require("./data_key");
-const extensionService = require("./extension");
+const sql = require("./sql.js");
+const decryptService = require("./decrypt.js");
+const dataKeyService = require("./data_key.js");
+const extensionService = require("./extension.js");

 function dumpDocument(documentPath, targetPath, options) {
    const stats = {
@@ -1,6 +1,6 @@
 'use strict';

-const {app, globalShortcut, BrowserWindow} = require('electron');
+const {app, globalShortcut} = require('electron');
 const sqlInit = require('./src/services/sql_init');
 const appIconService = require('./src/services/app_icon');
 const windowService = require('./src/services/window');
@@ -13,12 +13,12 @@ appIconService.installLocalAppIcon();

 require('electron-dl')({ saveAs: true });

-// Quit when all windows are closed, except on macOS. There, it's common
-// for applications and their menu bar to stay active until the user quits
-// explicitly with Cmd + Q.
 app.on('window-all-closed', () => {
    if (process.platform !== 'darwin') {
-        app.quit()
+        app.quit();
+    }
+    else if (process.platform === 'win32') {
+        app.exit(0); // attempt to fix the issue when app.quite() won't terminate processes on windows
    }
 });

@@ -27,18 +27,10 @@ app.on('ready', async () => {

    // if db is not initialized -> setup process
    // if db is initialized, then we need to wait until the migration process is finished
-    if (sqlInit.isDbInitialized()) {
+    if (await sqlInit.isDbInitialized()) {
        await sqlInit.dbReady;

-        await windowService.createMainWindow(app);
-
-        if (process.platform === 'darwin') {
-            app.on('activate', async () => {
-                if (BrowserWindow.getAllWindows().length === 0) {
-                    await windowService.createMainWindow(app);
-                }
-            });
-        }
+        await windowService.createMainWindow();

        tray.createTray();
    }
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015-2021 Aniket Suvarna
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
@@ -520,174 +520,7 @@
    border-radius: 50%;
 }

-  .bxs-balloon:before {
-    content: "\eb60";
-  }
-  .bxs-castle:before {
-    content: "\eb79";
-  }
-  .bxs-coffee-bean:before {
-    content: "\eb92";
-  }
-  .bxs-objects-horizontal-center:before {
-    content: "\ebab";
-  }
-  .bxs-objects-horizontal-left:before {
-    content: "\ebc4";
-  }
-  .bxs-objects-horizontal-right:before {
-    content: "\ebdd";
-  }
-  .bxs-objects-vertical-bottom:before {
-    content: "\ebf6";
-  }
-  .bxs-objects-vertical-center:before {
-    content: "\ef40";
-  }
-  .bxs-objects-vertical-top:before {
-    content: "\ef41";
-  }
-  .bxs-pear:before {
-    content: "\ef42";
-  }
-  .bxs-shield-minus:before {
-    content: "\ef43";
-  }
-  .bxs-shield-plus:before {
-    content: "\ef44";
-  }
-  .bxs-shower:before {
-    content: "\ef45";
-  }
-  .bxs-sushi:before {
-    content: "\ef46";
-  }
-  .bxs-universal-access:before {
-    content: "\ef47";
-  }
-  .bx-child:before {
-    content: "\ef48";
-  }
-  .bx-horizontal-left:before {
-    content: "\ef49";
-  }
-  .bx-horizontal-right:before {
-    content: "\ef4a";
-  }
-  .bx-objects-horizontal-center:before {
-    content: "\ef4b";
-  }
-  .bx-objects-horizontal-left:before {
-    content: "\ef4c";
-  }
-  .bx-objects-horizontal-right:before {
-    content: "\ef4d";
-  }
-  .bx-objects-vertical-bottom:before {
-    content: "\ef4e";
-  }
-  .bx-objects-vertical-center:before {
-    content: "\ef4f";
-  }
-  .bx-objects-vertical-top:before {
-    content: "\ef50";
-  }
-  .bx-rfid:before {
-    content: "\ef51";
-  }
-  .bx-shield-minus:before {
-    content: "\ef52";
-  }
-  .bx-shield-plus:before {
-    content: "\ef53";
-  }
-  .bx-shower:before {
-    content: "\ef54";
-  }
-  .bx-sushi:before {
-    content: "\ef55";
-  }
-  .bx-universal-access:before {
-    content: "\ef56";
-  }
-  .bx-vertical-bottom:before {
-    content: "\ef57";
-  }
-  .bx-vertical-top:before {
-    content: "\ef58";
-  }
-  .bxl-graphql:before {
-    content: "\ef59";
-  }
-  .bxl-typescript:before {
-    content: "\ef5a";
-  }
-  .bxs-color:before {
-    content: "\ef39";
-  }
-  .bx-reflect-horizontal:before {
-    content: "\ef3a";
-  }
-  .bx-reflect-vertical:before {
-    content: "\ef3b";
-  }
-  .bx-color:before {
-    content: "\ef3c";
-  }
-  .bxl-mongodb:before {
-    content: "\ef3d";
-  }
-  .bxl-postgresql:before {
-    content: "\ef3e";
-  }
-  .bxl-deezer:before {
-    content: "\ef3f";
-  }
-  .bxs-hard-hat:before {
-    content: "\ef2a";
-  }
-  .bxs-home-alt-2:before {
-    content: "\ef2b";
-  }
-  .bxs-cheese:before {
-    content: "\ef2c";
-  }
-  .bx-home-alt-2:before {
-    content: "\ef2d";
-  }
-  .bx-hard-hat:before {
-    content: "\ef2e";
-  }
-  .bx-cheese:before {
-    content: "\ef2f";
-  }
-  .bx-cart-add:before {
-    content: "\ef30";
-  }
-  .bx-cart-download:before {
-    content: "\ef31";
-  }
-  .bx-no-signal:before {
-    content: "\ef32";
-  }
-  .bx-signal-1:before {
-    content: "\ef33";
-  }
-  .bx-signal-2:before {
-    content: "\ef34";
-  }
-  .bx-signal-3:before {
-    content: "\ef35";
-  }
-  .bx-signal-4:before {
-    content: "\ef36";
-  }
-  .bx-signal-5:before {
-    content: "\ef37";
-  }
-  .bxl-xing:before {
-    content: "\ef38";
-  }
+  
  .bxl-meta:before {
    content: "\ef27";
  }
@@ -2603,7 +2436,7 @@
    content: "\eb5f";
  }
  .bx-menu-alt-left:before {
-    content: "\ef5b";
+    content: "\eb60";
  }
  .bx-menu-alt-right:before {
    content: "\eb61";
@@ -2678,7 +2511,7 @@
    content: "\eb78";
  }
  .bx-message-rounded-edit:before {
-    content: "\ef5c";
+    content: "\eb79";
  }
  .bx-message-rounded-error:before {
    content: "\eb7a";
@@ -2753,7 +2586,7 @@
    content: "\eb91";
  }
  .bx-mobile-vibration:before {
-    content: "\ef5d";
+    content: "\eb92";
  }
  .bx-money:before {
    content: "\eb93";
@@ -2828,7 +2661,7 @@
    content: "\ebaa";
  }
  .bx-paper-plane:before {
-    content: "\ef61";
+    content: "\ebab";
  }
  .bx-paragraph:before {
    content: "\ebac";
@@ -2903,7 +2736,7 @@
    content: "\ebc3";
  }
  .bx-pointer:before {
-    content: "\ef5e";
+    content: "\ebc4";
  }
  .bx-poll:before {
    content: "\ebc5";
@@ -2978,7 +2811,7 @@
    content: "\ebdc";
  }
  .bx-reply:before {
-    content: "\ef5f";
+    content: "\ebdd";
  }
  .bx-reply-all:before {
    content: "\ebde";
@@ -3053,7 +2886,7 @@
    content: "\ebf5";
  }
  .bx-screenshot:before {
-    content: "\ef60";
+    content: "\ebf6";
  }
  .bx-search:before {
    content: "\ebf7";
@@ -5,9 +5,9 @@
 }

 /*
- * CKEditor 5 (v35.4.0) content styles.
- * Generated on Wed, 14 Dec 2022 12:53:04 GMT.
- * For more information, check out https://ckeditor.com/docs/ckeditor5/latest/installation/advanced/content-styles.html
+ * CKEditor 5 (v33.0.0) content styles.
+ * Generated on Fri, 11 Mar 2022 14:34:26 GMT.
+ * For more information, check out https://ckeditor.com/docs/ckeditor5/latest/builds/guides/integration/content-styles.html
 */

 :root {
@@ -139,20 +139,6 @@
    font-size: .75em;
    outline-offset: -1px;
 }
-/* ckeditor5-image/theme/imageresize.css */
-.ck-content .image.image_resized {
-    max-width: 100%;
-    display: block;
-    box-sizing: border-box;
-}
-/* ckeditor5-image/theme/imageresize.css */
-.ck-content .image.image_resized img {
-    width: 100%;
-}
-/* ckeditor5-image/theme/imageresize.css */
-.ck-content .image.image_resized > figcaption {
-    display: block;
-}
 /* ckeditor5-image/theme/imagestyle.css */
 .ck-content .image-style-block-align-left,
 .ck-content .image-style-block-align-right {
@@ -214,6 +200,20 @@
 .ck-content .image-inline.image-style-align-right {
    margin-left: var(--ck-inline-image-style-spacing);
 }
+/* ckeditor5-image/theme/imageresize.css */
+.ck-content .image.image_resized {
+    max-width: 100%;
+    display: block;
+    box-sizing: border-box;
+}
+/* ckeditor5-image/theme/imageresize.css */
+.ck-content .image.image_resized img {
+    width: 100%;
+}
+/* ckeditor5-image/theme/imageresize.css */
+.ck-content .image.image_resized > figcaption {
+    display: block;
+}
 /* ckeditor5-language/theme/language.css */
 .ck-content span[lang] {
    font-style: italic;
@@ -361,19 +361,6 @@
 .ck-content[dir="ltr"] .table th {
    text-align: left;
 }
-/* ckeditor5-table/theme/tablecolumnresize.css */
-.ck-content .table .ck-table-resized {
-    table-layout: fixed;
-}
-/* ckeditor5-table/theme/tablecolumnresize.css */
-.ck-content .table table {
-    overflow: hidden;
-}
-/* ckeditor5-table/theme/tablecolumnresize.css */
-.ck-content .table td,
-.ck-content .table th {
-    position: relative;
-}
 /* ckeditor5-table/theme/tablecaption.css */
 .ck-content .table > figcaption {
    display: table-caption;
@@ -413,42 +400,6 @@
    background: hsl(0, 0%, 87%);
    border: 0;
 }
-/* ckeditor5-list/theme/liststyles.css */
-.ck-content ol {
-    list-style-type: decimal;
-}
-/* ckeditor5-list/theme/liststyles.css */
-.ck-content ol ol {
-    list-style-type: lower-latin;
-}
-/* ckeditor5-list/theme/liststyles.css */
-.ck-content ol ol ol {
-    list-style-type: lower-roman;
-}
-/* ckeditor5-list/theme/liststyles.css */
-.ck-content ol ol ol ol {
-    list-style-type: upper-latin;
-}
-/* ckeditor5-list/theme/liststyles.css */
-.ck-content ol ol ol ol ol {
-    list-style-type: upper-roman;
-}
-/* ckeditor5-list/theme/liststyles.css */
-.ck-content ul {
-    list-style-type: circle;
-}
-/* ckeditor5-list/theme/liststyles.css */
-.ck-content ul ul {
-    list-style-type: disc;
-}
-/* ckeditor5-list/theme/liststyles.css */
-.ck-content ul ul ul {
-    list-style-type: square;
-}
-/* ckeditor5-list/theme/liststyles.css */
-.ck-content ul ul ul ul {
-    list-style-type: square;
-}
 /* ckeditor5-mention/theme/mention.css */
 .ck-content .mention {
    background: var(--ck-color-mention-background);
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE

 (function(mod) {
  if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE

 (function(mod) {
  if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE

 (function(mod) {
  if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE

 (function(mod) {
  if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -69,11 +69,3 @@
  background-position: right bottom;
  width: 100%; height: 100%;
 }
-
-.CodeMirror-lint-line-error {
-  background-color: rgba(183, 76, 81, 0.08);
-}
-
-.CodeMirror-lint-line-warning {
-  background-color: rgba(255, 211, 0, 0.1);
-}
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE

 (function(mod) {
  if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -11,7 +11,6 @@
 })(function(CodeMirror) {
  "use strict";
  var GUTTER_ID = "CodeMirror-lint-markers";
-  var LINT_LINE_ID = "CodeMirror-lint-line-";

  function showTooltip(cm, e, content) {
    var tt = document.createElement("div");
@@ -59,54 +58,29 @@
    CodeMirror.on(node, "mouseout", hide);
  }

-  function LintState(cm, conf, hasGutter) {
+  function LintState(cm, options, hasGutter) {
    this.marked = [];
-    if (conf instanceof Function) conf = {getAnnotations: conf};
-    if (!conf || conf === true) conf = {};
-    this.options = {};
-    this.linterOptions = conf.options || {};
-    for (var prop in defaults) this.options[prop] = defaults[prop];
-    for (var prop in conf) {
-      if (defaults.hasOwnProperty(prop)) {
-        if (conf[prop] != null) this.options[prop] = conf[prop];
-      } else if (!conf.options) {
-        this.linterOptions[prop] = conf[prop];
-      }
-    }
+    this.options = options;
    this.timeout = null;
    this.hasGutter = hasGutter;
    this.onMouseOver = function(e) { onMouseOver(cm, e); };
    this.waitingFor = 0
  }

-  var defaults = {
-    highlightLines: false,
-    tooltips: true,
-    delay: 500,
-    lintOnChange: true,
-    getAnnotations: null,
-    async: false,
-    selfContain: null,
-    formatAnnotation: null,
-    onUpdateLinting: null
+  function parseOptions(_cm, options) {
+    if (options instanceof Function) return {getAnnotations: options};
+    if (!options || options === true) options = {};
+    return options;
  }

  function clearMarks(cm) {
    var state = cm.state.lint;
    if (state.hasGutter) cm.clearGutter(GUTTER_ID);
-    if (state.options.highlightLines) clearErrorLines(cm);
    for (var i = 0; i < state.marked.length; ++i)
      state.marked[i].clear();
    state.marked.length = 0;
  }

-  function clearErrorLines(cm) {
-    cm.eachLine(function(line) {
-      var has = line.wrapClass && /\bCodeMirror-lint-line-\w+\b/.exec(line.wrapClass);
-      if (has) cm.removeLineClass(line, "wrap", has[0]);
-    })
-  }
-
  function makeMarker(cm, labels, severity, multiple, tooltips) {
    var marker = document.createElement("div"), inner = marker;
    marker.className = "CodeMirror-lint-marker CodeMirror-lint-marker-" + severity;
@@ -149,7 +123,7 @@
    return tip;
  }

-  function lintAsync(cm, getAnnotations) {
+  function lintAsync(cm, getAnnotations, passOptions) {
    var state = cm.state.lint
    var id = ++state.waitingFor
    function abort() {
@@ -162,23 +136,22 @@
      if (state.waitingFor != id) return
      if (arg2 && annotations instanceof CodeMirror) annotations = arg2
      cm.operation(function() {updateLinting(cm, annotations)})
-    }, state.linterOptions, cm);
+    }, passOptions, cm);
  }

  function startLinting(cm) {
-    var state = cm.state.lint;
-    if (!state) return;
-    var options = state.options;
+    var state = cm.state.lint, options = state.options;
    /*
     * Passing rules in `options` property prevents JSHint (and other linters) from complaining
     * about unrecognized rules like `onUpdateLinting`, `delay`, `lintOnChange`, etc.
     */
+    var passOptions = options.options || options;
    var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
    if (!getAnnotations) return;
    if (options.async || getAnnotations.async) {
-      lintAsync(cm, getAnnotations)
+      lintAsync(cm, getAnnotations, passOptions)
    } else {
-      var annotations = getAnnotations(cm.getValue(), state.linterOptions, cm);
+      var annotations = getAnnotations(cm.getValue(), passOptions, cm);
      if (!annotations) return;
      if (annotations.then) annotations.then(function(issues) {
        cm.operation(function() {updateLinting(cm, issues)})
@@ -188,10 +161,8 @@
  }

  function updateLinting(cm, annotationsNotSorted) {
-    var state = cm.state.lint;
-    if (!state) return;
-    var options = state.options;
    clearMarks(cm);
+    var state = cm.state.lint, options = state.options;

    var annotations = groupByLine(annotationsNotSorted);

@@ -223,10 +194,7 @@
      // use original annotations[line] to show multiple messages
      if (state.hasGutter)
        cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, annotations[line].length > 1,
-                                                       options.tooltips));
-
-      if (options.highlightLines)
-        cm.addLineClass(line, "wrap", LINT_LINE_ID + maxSeverity);
+                                                       state.options.tooltips));
    }
    if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
  }
@@ -235,7 +203,7 @@
    var state = cm.state.lint;
    if (!state) return;
    clearTimeout(state.timeout);
-    state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay);
+    state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
  }

  function popupTooltips(cm, annotations, e) {
@@ -275,8 +243,8 @@
    if (val) {
      var gutters = cm.getOption("gutters"), hasLintGutter = false;
      for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
-      var state = cm.state.lint = new LintState(cm, val, hasLintGutter);
-      if (state.options.lintOnChange)
+      var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
+      if (state.options.lintOnChange !== false)
        cm.on("change", onChange);
      if (state.options.tooltips != false && state.options.tooltips != "gutter")
        CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
@@ -286,6 +254,6 @@
  });

  CodeMirror.defineExtension("performLint", function() {
-    startLinting(this);
+    if (this.state.lint) startLinting(this);
  });
 });
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE

 (function(mod) {
  if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE

 (function(mod) {
  if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -68,7 +68,6 @@
    var flags = "";
    if (val instanceof RegExp) {
      if (val.ignoreCase) flags = "i";
-      if (val.unicode) flags += "u"
      val = val.source;
    } else {
      val = String(val);
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE

 // Highlighting text that matches the selection
 //
--- a/Show More
+++ b/Show More