release 0.41.3-beta

# Conflicts:
#	src/public/javascripts/mobile.js
#	src/public/stylesheets/mobile.css

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [zadam]

.gitignore

@@ -1,9 +1,11 @@
 .DS_Store
 node_modules/
 dist/
+src/public/app-dist/
 npm-debug.log
 yarn-error.log
 *.db
 config.ini
 cert.key
 cert.crt
+server-package.json

.gitpod.dockerfile

@@ -0,0 +1,15 @@
+FROM gitpod/workspace-full
+
+RUN sudo apt-get update \
+    && sudo apt-get install -yq --no-install-recommends \
+        libpng16-16 \
+        libpng-dev \
+        pkg-config \
+        autoconf \
+        libtool \
+        build-essential \
+        nasm \
+        libx11-dev \
+        libxkbfile-dev \
+    && sudo rm -rf /var/lib/apt/lists/*
+

.gitpod.yml

@@ -1,7 +1,11 @@
+image:
+  file: .gitpod.dockerfile
+
 tasks:
     - before: nvm install 10 && nvm use 10
       init: npm install
-      command: npm run start
+      command: npm run start-server
+
 ports:
     - port: 8080
       onOpen: open-preview

.idea/.gitignore

@@ -0,0 +1,6 @@
+# Default ignored files
+/workspace.xml
+
+# Datasource local storage ignored files
+/dataSources.local.xml
+/dataSources/

.idea/codeStyles/Project.xml

@@ -6,5 +6,8 @@
         <option name="TAB_SIZE" value="2" />
       </value>
     </option>
+    <JSCodeStyleSettings version="0">
+      <option name="USE_EXPLICIT_JS_EXTENSION" value="TRUE" />
+    </JSCodeStyleSettings>
   </code_scheme>
 </component>

.idea/dataSources.xml

@@ -6,9 +6,6 @@
       <synchronize>true</synchronize>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
       <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url>
-      <driver-properties>
-        <property name="enable_load_extension" value="true" />
-      </driver-properties>
     </data-source>
   </component>
 </project>

.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="document.db">
-  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.15">
+  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.17">
     <root id="1">
       <ServerVersion>3.25.1</ServerVersion>
     </root>
     <schema id="2" parent="1" name="main">
       <Current>1</Current>
-      <Visible>1</Visible>
     </schema>
     <collation id="3" parent="1" name="BINARY"/>
     <collation id="4" parent="1" name="NOCASE"/>
@@ -14,113 +13,117 @@
     <table id="6" parent="2" name="api_tokens"/>
     <table id="7" parent="2" name="attributes"/>
     <table id="8" parent="2" name="branches"/>
-    <table id="9" parent="2" name="event_log"/>
-    <table id="10" parent="2" name="links"/>
-    <table id="11" parent="2" name="note_contents"/>
-    <table id="12" parent="2" name="note_revisions"/>
-    <table id="13" parent="2" name="notes"/>
-    <table id="14" parent="2" name="options"/>
-    <table id="15" parent="2" name="recent_notes"/>
-    <table id="16" parent="2" name="source_ids"/>
-    <table id="17" parent="2" name="sqlite_master">
+    <table id="9" parent="2" name="note_contents"/>
+    <table id="10" parent="2" name="note_revision_contents"/>
+    <table id="11" parent="2" name="note_revisions"/>
+    <table id="12" parent="2" name="notes"/>
+    <table id="13" parent="2" name="options"/>
+    <table id="14" parent="2" name="recent_notes"/>
+    <table id="15" parent="2" name="source_ids"/>
+    <table id="16" parent="2" name="sqlite_master">
       <System>1</System>
     </table>
-    <table id="18" parent="2" name="sqlite_sequence">
+    <table id="17" parent="2" name="sqlite_sequence">
       <System>1</System>
     </table>
-    <table id="19" parent="2" name="sync"/>
-    <column id="20" parent="6" name="apiTokenId">
+    <table id="18" parent="2" name="sync"/>
+    <column id="19" parent="6" name="apiTokenId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="21" parent="6" name="token">
+    <column id="20" parent="6" name="token">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="22" parent="6" name="utcDateCreated">
+    <column id="21" parent="6" name="utcDateCreated">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="23" parent="6" name="isDeleted">
+    <column id="22" parent="6" name="isDeleted">
       <Position>4</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="24" parent="6" name="hash">
+    <column id="23" parent="6" name="hash">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <index id="25" parent="6" name="sqlite_autoindex_api_tokens_1">
+    <index id="24" parent="6" name="sqlite_autoindex_api_tokens_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>apiTokenId</ColNames>
       <Unique>1</Unique>
     </index>
-    <key id="26" parent="6">
+    <key id="25" parent="6">
       <ColNames>apiTokenId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_api_tokens_1</UnderlyingIndexName>
     </key>
-    <column id="27" parent="7" name="attributeId">
+    <column id="26" parent="7" name="attributeId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="28" parent="7" name="noteId">
+    <column id="27" parent="7" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="29" parent="7" name="type">
+    <column id="28" parent="7" name="type">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="30" parent="7" name="name">
+    <column id="29" parent="7" name="name">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="31" parent="7" name="value">
+    <column id="30" parent="7" name="value">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
     </column>
-    <column id="32" parent="7" name="position">
+    <column id="31" parent="7" name="position">
       <Position>6</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="33" parent="7" name="utcDateCreated">
+    <column id="32" parent="7" name="utcDateCreated">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="34" parent="7" name="utcDateModified">
+    <column id="33" parent="7" name="utcDateModified">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="35" parent="7" name="isDeleted">
+    <column id="34" parent="7" name="isDeleted">
       <Position>9</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="36" parent="7" name="hash">
+    <column id="35" parent="7" name="deleteId">
       <Position>10</Position>
       <DataType>TEXT|0s</DataType>
+      <DefaultExpression>NULL</DefaultExpression>
+    </column>
+    <column id="36" parent="7" name="hash">
+      <Position>11</Position>
+      <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
     <column id="37" parent="7" name="isInheritable">
-      <Position>11</Position>
+      <Position>12</Position>
       <DataType>int|0s</DataType>
       <DefaultExpression>0</DefaultExpression>
     </column>
@@ -136,65 +139,69 @@
       <ColNames>name
 value</ColNames>
     </index>
-    <index id="41" parent="7" name="IDX_attributes_name_index">
-      <ColNames>name</ColNames>
-    </index>
-    <index id="42" parent="7" name="IDX_attributes_value_index">
+    <index id="41" parent="7" name="IDX_attributes_value_index">
       <ColNames>value</ColNames>
     </index>
-    <key id="43" parent="7">
+    <key id="42" parent="7">
       <ColNames>attributeId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_attributes_1</UnderlyingIndexName>
     </key>
-    <column id="44" parent="8" name="branchId">
+    <column id="43" parent="8" name="branchId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="45" parent="8" name="noteId">
+    <column id="44" parent="8" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="46" parent="8" name="parentNoteId">
+    <column id="45" parent="8" name="parentNoteId">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="47" parent="8" name="notePosition">
+    <column id="46" parent="8" name="notePosition">
       <Position>4</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="48" parent="8" name="prefix">
+    <column id="47" parent="8" name="prefix">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="49" parent="8" name="isExpanded">
+    <column id="48" parent="8" name="isExpanded">
       <Position>6</Position>
-      <DataType>BOOLEAN|0s</DataType>
+      <DataType>INTEGER|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="50" parent="8" name="isDeleted">
+    <column id="49" parent="8" name="isDeleted">
       <Position>7</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="51" parent="8" name="utcDateModified">
+    <column id="50" parent="8" name="deleteId">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
+      <DefaultExpression>NULL</DefaultExpression>
     </column>
-    <column id="52" parent="8" name="utcDateCreated">
+    <column id="51" parent="8" name="utcDateModified">
       <Position>9</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="53" parent="8" name="hash">
+    <column id="52" parent="8" name="utcDateCreated">
       <Position>10</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
+    </column>
+    <column id="53" parent="8" name="hash">
+      <Position>11</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
     <index id="54" parent="8" name="sqlite_autoindex_branches_1">
@@ -206,443 +213,448 @@ value</ColNames>
       <ColNames>noteId
 parentNoteId</ColNames>
     </index>
-    <index id="56" parent="8" name="IDX_branches_noteId">
-      <ColNames>noteId</ColNames>
-    </index>
-    <index id="57" parent="8" name="IDX_branches_parentNoteId">
+    <index id="56" parent="8" name="IDX_branches_parentNoteId">
       <ColNames>parentNoteId</ColNames>
     </index>
-    <key id="58" parent="8">
+    <key id="57" parent="8">
       <ColNames>branchId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_branches_1</UnderlyingIndexName>
     </key>
-    <column id="59" parent="9" name="eventId">
+    <column id="58" parent="9" name="noteId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="60" parent="9" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="61" parent="9" name="comment">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="62" parent="9" name="utcDateCreated">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="63" parent="9" name="sqlite_autoindex_event_log_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>eventId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="64" parent="9">
-      <ColNames>eventId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_event_log_1</UnderlyingIndexName>
-    </key>
-    <column id="65" parent="10" name="linkId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="66" parent="10" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="67" parent="10" name="targetNoteId">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="68" parent="10" name="type">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="69" parent="10" name="hash">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="70" parent="10" name="isDeleted">
-      <Position>6</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="71" parent="10" name="utcDateCreated">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="72" parent="10" name="utcDateModified">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="73" parent="10" name="sqlite_autoindex_links_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>linkId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="74" parent="10" name="IDX_links_noteId_index">
-      <ColNames>noteId</ColNames>
-    </index>
-    <index id="75" parent="10" name="IDX_links_targetNoteId_index">
-      <ColNames>targetNoteId</ColNames>
-    </index>
-    <key id="76" parent="10">
-      <ColNames>linkId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_links_1</UnderlyingIndexName>
-    </key>
-    <column id="77" parent="11" name="noteId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="78" parent="11" name="content">
+    <column id="59" parent="9" name="content">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <DefaultExpression>NULL</DefaultExpression>
     </column>
-    <column id="79" parent="11" name="hash">
+    <column id="60" parent="9" name="hash">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="80" parent="11" name="utcDateModified">
+    <column id="61" parent="9" name="utcDateModified">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="81" parent="11" name="sqlite_autoindex_note_contents_1">
+    <index id="62" parent="9" name="sqlite_autoindex_note_contents_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteId</ColNames>
       <Unique>1</Unique>
     </index>
-    <key id="82" parent="11">
+    <key id="63" parent="9">
       <ColNames>noteId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_note_contents_1</UnderlyingIndexName>
     </key>
-    <column id="83" parent="12" name="noteRevisionId">
+    <column id="64" parent="10" name="noteRevisionId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="84" parent="12" name="noteId">
+    <column id="65" parent="10" name="content">
+      <Position>2</Position>
+      <DataType>TEXT|0s</DataType>
+    </column>
+    <column id="66" parent="10" name="hash">
+      <Position>3</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&apos;&apos;</DefaultExpression>
+    </column>
+    <column id="67" parent="10" name="utcDateModified">
+      <Position>4</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <index id="68" parent="10" name="sqlite_autoindex_note_revision_contents_1">
+      <NameSurrogate>1</NameSurrogate>
+      <ColNames>noteRevisionId</ColNames>
+      <Unique>1</Unique>
+    </index>
+    <key id="69" parent="10">
+      <ColNames>noteRevisionId</ColNames>
+      <Primary>1</Primary>
+      <UnderlyingIndexName>sqlite_autoindex_note_revision_contents_1</UnderlyingIndexName>
+    </key>
+    <column id="70" parent="11" name="noteRevisionId">
+      <Position>1</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="71" parent="11" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="85" parent="12" name="title">
+    <column id="72" parent="11" name="title">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="86" parent="12" name="content">
+    <column id="73" parent="11" name="contentLength">
       <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
+      <DataType>INT|0s</DataType>
+      <NotNull>1</NotNull>
     </column>
-    <column id="87" parent="12" name="isProtected">
+    <column id="74" parent="11" name="isErased">
       <Position>5</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="88" parent="12" name="utcDateModifiedFrom">
+    <column id="75" parent="11" name="isProtected">
       <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
+      <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
+      <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="89" parent="12" name="utcDateModifiedTo">
+    <column id="76" parent="11" name="utcDateLastEdited">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="90" parent="12" name="dateModifiedFrom">
+    <column id="77" parent="11" name="utcDateCreated">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="91" parent="12" name="dateModifiedTo">
+    <column id="78" parent="11" name="utcDateModified">
       <Position>9</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="92" parent="12" name="type">
+    <column id="79" parent="11" name="dateLastEdited">
       <Position>10</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
     </column>
-    <column id="93" parent="12" name="mime">
+    <column id="80" parent="11" name="dateCreated">
       <Position>11</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
     </column>
-    <column id="94" parent="12" name="hash">
+    <column id="81" parent="11" name="type">
       <Position>12</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
+      <DefaultExpression>&apos;&apos;</DefaultExpression>
     </column>
-    <index id="95" parent="12" name="sqlite_autoindex_note_revisions_1">
+    <column id="82" parent="11" name="mime">
+      <Position>13</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&apos;&apos;</DefaultExpression>
+    </column>
+    <column id="83" parent="11" name="hash">
+      <Position>14</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&apos;&apos;</DefaultExpression>
+    </column>
+    <index id="84" parent="11" name="sqlite_autoindex_note_revisions_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteRevisionId</ColNames>
       <Unique>1</Unique>
     </index>
-    <index id="96" parent="12" name="IDX_note_revisions_noteId">
+    <index id="85" parent="11" name="IDX_note_revisions_noteId">
       <ColNames>noteId</ColNames>
     </index>
-    <index id="97" parent="12" name="IDX_note_revisions_dateModifiedFrom">
-      <ColNames>utcDateModifiedFrom</ColNames>
+    <index id="86" parent="11" name="IDX_note_revisions_utcDateLastEdited">
+      <ColNames>utcDateLastEdited</ColNames>
     </index>
-    <index id="98" parent="12" name="IDX_note_revisions_dateModifiedTo">
-      <ColNames>utcDateModifiedTo</ColNames>
+    <index id="87" parent="11" name="IDX_note_revisions_utcDateCreated">
+      <ColNames>utcDateCreated</ColNames>
     </index>
-    <key id="99" parent="12">
+    <index id="88" parent="11" name="IDX_note_revisions_dateLastEdited">
+      <ColNames>dateLastEdited</ColNames>
+    </index>
+    <index id="89" parent="11" name="IDX_note_revisions_dateCreated">
+      <ColNames>dateCreated</ColNames>
+    </index>
+    <key id="90" parent="11">
       <ColNames>noteRevisionId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName>
     </key>
-    <column id="100" parent="13" name="noteId">
+    <column id="91" parent="12" name="noteId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="101" parent="13" name="title">
+    <column id="92" parent="12" name="title">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;note&quot;</DefaultExpression>
     </column>
-    <column id="102" parent="13" name="isProtected">
+    <column id="93" parent="12" name="contentLength">
       <Position>3</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
+    </column>
+    <column id="94" parent="12" name="isProtected">
+      <Position>4</Position>
+      <DataType>INT|0s</DataType>
+      <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="103" parent="13" name="type">
-      <Position>4</Position>
+    <column id="95" parent="12" name="type">
+      <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;text&apos;</DefaultExpression>
     </column>
-    <column id="104" parent="13" name="mime">
-      <Position>5</Position>
+    <column id="96" parent="12" name="mime">
+      <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;text/html&apos;</DefaultExpression>
     </column>
-    <column id="105" parent="13" name="hash">
-      <Position>6</Position>
+    <column id="97" parent="12" name="hash">
+      <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="106" parent="13" name="isDeleted">
-      <Position>7</Position>
+    <column id="98" parent="12" name="isDeleted">
+      <Position>8</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="107" parent="13" name="dateCreated">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="108" parent="13" name="dateModified">
+    <column id="99" parent="12" name="deleteId">
       <Position>9</Position>
       <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
+      <DefaultExpression>NULL</DefaultExpression>
     </column>
-    <column id="109" parent="13" name="utcDateCreated">
+    <column id="100" parent="12" name="isErased">
       <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
+      <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
+      <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="110" parent="13" name="utcDateModified">
+    <column id="101" parent="12" name="dateCreated">
       <Position>11</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="111" parent="13" name="sqlite_autoindex_notes_1">
+    <column id="102" parent="12" name="dateModified">
+      <Position>12</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="103" parent="12" name="utcDateCreated">
+      <Position>13</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="104" parent="12" name="utcDateModified">
+      <Position>14</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <index id="105" parent="12" name="sqlite_autoindex_notes_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteId</ColNames>
       <Unique>1</Unique>
     </index>
-    <key id="112" parent="13">
+    <index id="106" parent="12" name="IDX_notes_title">
+      <ColNames>title</ColNames>
+    </index>
+    <index id="107" parent="12" name="IDX_notes_type">
+      <ColNames>type</ColNames>
+    </index>
+    <index id="108" parent="12" name="IDX_notes_isDeleted">
+      <ColNames>isDeleted</ColNames>
+    </index>
+    <index id="109" parent="12" name="IDX_notes_dateCreated">
+      <ColNames>dateCreated</ColNames>
+    </index>
+    <index id="110" parent="12" name="IDX_notes_dateModified">
+      <ColNames>dateModified</ColNames>
+    </index>
+    <index id="111" parent="12" name="IDX_notes_utcDateCreated">
+      <ColNames>utcDateCreated</ColNames>
+    </index>
+    <index id="112" parent="12" name="IDX_notes_utcDateModified">
+      <ColNames>utcDateModified</ColNames>
+    </index>
+    <key id="113" parent="12">
       <ColNames>noteId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_notes_1</UnderlyingIndexName>
     </key>
-    <column id="113" parent="14" name="name">
+    <column id="114" parent="13" name="name">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="114" parent="14" name="value">
+    <column id="115" parent="13" name="value">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="115" parent="14" name="isSynced">
+    <column id="116" parent="13" name="isSynced">
       <Position>3</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="116" parent="14" name="hash">
+    <column id="117" parent="13" name="hash">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="117" parent="14" name="utcDateCreated">
+    <column id="118" parent="13" name="utcDateCreated">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="118" parent="14" name="utcDateModified">
+    <column id="119" parent="13" name="utcDateModified">
       <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="119" parent="14" name="sqlite_autoindex_options_1">
+    <index id="120" parent="13" name="sqlite_autoindex_options_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>name</ColNames>
       <Unique>1</Unique>
     </index>
-    <key id="120" parent="14">
+    <key id="121" parent="13">
       <ColNames>name</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_options_1</UnderlyingIndexName>
     </key>
-    <column id="121" parent="15" name="branchId">
+    <column id="122" parent="14" name="noteId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="122" parent="15" name="notePath">
+    <column id="123" parent="14" name="notePath">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="123" parent="15" name="hash">
+    <column id="124" parent="14" name="hash">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="124" parent="15" name="utcDateCreated">
+    <column id="125" parent="14" name="utcDateCreated">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="125" parent="15" name="isDeleted">
+    <column id="126" parent="14" name="isDeleted">
       <Position>5</Position>
       <DataType>INT|0s</DataType>
     </column>
-    <index id="126" parent="15" name="sqlite_autoindex_recent_notes_1">
+    <index id="127" parent="14" name="sqlite_autoindex_recent_notes_1">
       <NameSurrogate>1</NameSurrogate>
-      <ColNames>branchId</ColNames>
+      <ColNames>noteId</ColNames>
       <Unique>1</Unique>
     </index>
-    <key id="127" parent="15">
-      <ColNames>branchId</ColNames>
+    <key id="128" parent="14">
+      <ColNames>noteId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_recent_notes_1</UnderlyingIndexName>
     </key>
-    <column id="128" parent="16" name="sourceId">
+    <column id="129" parent="15" name="sourceId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="129" parent="16" name="utcDateCreated">
+    <column id="130" parent="15" name="utcDateCreated">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="130" parent="16" name="sqlite_autoindex_source_ids_1">
+    <index id="131" parent="15" name="sqlite_autoindex_source_ids_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>sourceId</ColNames>
       <Unique>1</Unique>
     </index>
-    <key id="131" parent="16">
+    <index id="132" parent="15" name="IDX_source_ids_utcDateCreated">
+      <ColNames>utcDateCreated</ColNames>
+    </index>
+    <key id="133" parent="15">
       <ColNames>sourceId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_source_ids_1</UnderlyingIndexName>
     </key>
-    <column id="132" parent="17" name="type">
+    <column id="134" parent="16" name="type">
       <Position>1</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="133" parent="17" name="name">
+    <column id="135" parent="16" name="name">
       <Position>2</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="134" parent="17" name="tbl_name">
+    <column id="136" parent="16" name="tbl_name">
       <Position>3</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="135" parent="17" name="rootpage">
+    <column id="137" parent="16" name="rootpage">
       <Position>4</Position>
       <DataType>int|0s</DataType>
     </column>
-    <column id="136" parent="17" name="sql">
+    <column id="138" parent="16" name="sql">
       <Position>5</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="137" parent="18" name="name">
+    <column id="139" parent="17" name="name">
       <Position>1</Position>
     </column>
-    <column id="138" parent="18" name="seq">
+    <column id="140" parent="17" name="seq">
       <Position>2</Position>
     </column>
-    <column id="139" parent="19" name="id">
+    <column id="141" parent="18" name="id">
       <Position>1</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
       <SequenceIdentity>1</SequenceIdentity>
     </column>
-    <column id="140" parent="19" name="entityName">
+    <column id="142" parent="18" name="entityName">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="141" parent="19" name="entityId">
+    <column id="143" parent="18" name="entityId">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="142" parent="19" name="sourceId">
+    <column id="144" parent="18" name="sourceId">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="143" parent="19" name="utcSyncDate">
+    <column id="145" parent="18" name="isSynced">
       <Position>5</Position>
+      <DataType>INTEGER|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>0</DefaultExpression>
+    </column>
+    <column id="146" parent="18" name="utcSyncDate">
+      <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="144" parent="19" name="IDX_sync_entityName_entityId">
+    <index id="147" parent="18" name="IDX_sync_entityName_entityId">
       <ColNames>entityName
 entityId</ColNames>
       <Unique>1</Unique>
     </index>
-    <index id="145" parent="19" name="IDX_sync_utcSyncDate">
+    <index id="148" parent="18" name="IDX_sync_utcSyncDate">
       <ColNames>utcSyncDate</ColNames>
     </index>
-    <key id="146" parent="19">
+    <key id="149" parent="18">
       <ColNames>id</ColNames>
       <Primary>1</Primary>
     </key>

.idea/jsLibraryMappings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <file url="PROJECT" libraries="{@types/jquery}" />
+  </component>
+</project>

Dockerfile

@@ -1,11 +1,9 @@
-FROM node:12.4.0-alpine
+FROM node:12.16.2-alpine
 
 # Create app directory
 WORKDIR /usr/src/app
 
-# Copy both package.json and package-lock.json
-# where available (npm@5+)
-COPY package.json package-lock.json ./
+COPY server-package.json package.json
 
 # Install app dependencies
 RUN set -x \

README.md

@@ -21,6 +21,7 @@ Trilium Notes is a hierarchical note taking application with focus on building l
 * Touch optimized [mobile frontend](https://github.com/zadam/trilium/wiki/Mobile-frontend) for smartphones and tablets
 * [Night theme](https://github.com/zadam/trilium/wiki/Themes)
 * [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import) and [Markdown import & export](https://github.com/zadam/trilium/wiki/Markdown)
+* [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper) for easy saving of web content
 
 ## Builds
 
@@ -45,5 +46,12 @@ Use a browser based dev environment
 Or clone locally and run
 ```
 npm install
-npm run start
-```
+npm run start-server
+```
+
+## Shoutouts
+
+* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - best WYSIWYG editor on the market, very interactive and listening team
+* [FancyTree](https://github.com/mar10/fancytree) - very feature rich tree library without real competition. Trilium Notes would not be the same without it.
+* [CodeMirror](https://github.com/codemirror/CodeMirror) - code editor with support for huge amount of languages
+* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map)

bin/build-docker.sh

@@ -3,6 +3,8 @@
 VERSION=`jq -r ".version" package.json`
 SERIES=${VERSION:0:4}-latest
 
+cat package.json | grep -v electron > server-package.json
+
 sudo docker build -t zadam/trilium:$VERSION -t zadam/trilium:$SERIES .
 
 if [[ $VERSION != *"beta"* ]]; then

bin/build-linux-x64.sh

@@ -1,17 +1,27 @@
 #!/usr/bin/env bash
 
+SRC_DIR=./dist/trilium-linux-x64-src
+
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $SRC_DIR
+fi
+
+echo "Copying required linux-x64 binaries"
+
+rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
+rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
+
+rm -r $SRC_DIR/src/public/dist/*.mobile.*
+
+cp -r bin/deps/linux-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/linux-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
+
+./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
+
 BUILD_DIR=./dist/trilium-linux-x64
 rm -rf $BUILD_DIR
 
-rm -r node_modules/sqlite3/lib/binding/*
-
-cp -r bin/deps/linux-x64/sqlite/* node_modules/sqlite3/lib/binding/
-
-# rebuild binaries for image operations (pngquant ...)
-npm rebuild
-
-./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
-
 mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR
 
 cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png
@@ -25,3 +35,7 @@ VERSION=`jq -r ".version" package.json`
 cd dist
 
 tar cJf trilium-linux-x64-${VERSION}.tar.xz trilium-linux-x64
+
+cd ..
+
+bin/build-debian.sh

bin/build-mac-x64.sh

@@ -1,27 +1,34 @@
 #!/usr/bin/env bash
 
+SRC_DIR=./dist/trilium-mac-x64-src
+
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $SRC_DIR
+fi
+
+echo "Copying required mac binaries"
+
+rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
+rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
+rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
+rm -r $SRC_DIR/node_modules/giflossy/vendor/*
+
+cp -r bin/deps/mac-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/
+cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
+cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/
+
+rm -r $SRC_DIR/src/public/dist/*.mobile.*
+
+./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
+
 BUILD_DIR=./dist/trilium-mac-x64
 rm -rf $BUILD_DIR
 
-echo "Copying required mac binaries"
-
-rm -r node_modules/sqlite3/lib/binding/*
-rm -r node_modules/mozjpeg/vendor/*
-rm -r node_modules/pngquant-bin/vendor/*
-rm -r node_modules/giflossy/vendor/*
-
-cp -r bin/deps/mac-x64/sqlite/* node_modules/sqlite3/lib/binding/
-cp bin/deps/mac-x64/image/cjpeg node_modules/mozjpeg/vendor/
-cp bin/deps/mac-x64/image/pngquant node_modules/pngquant-bin/vendor/
-cp bin/deps/mac-x64/image/gifsicle node_modules/giflossy/vendor/
-
-./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
-
 # Mac build has by default useless directory level
 mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR
 
-./bin/reset-local.sh
-
 echo "Zipping mac x64 electron distribution..."
 
 VERSION=`jq -r ".version" package.json`

bin/build-server.sh

@@ -1,40 +1,32 @@
 #!/usr/bin/env bash
 
 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=12.4.0
+NODE_VERSION=12.16.2
 
-rm -r $PKG_DIR
-mkdir $PKG_DIR
-cd $PKG_DIR
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $PKG_DIR
+fi
 
+cd dist
 wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz
 tar xvfJ node-v${NODE_VERSION}-linux-x64.tar.xz
 rm node-v${NODE_VERSION}-linux-x64.tar.xz
-
-mv node-v${NODE_VERSION}-linux-x64 node
-
-cp -r ../../node_modules/ ./
-cp -r ../../images/ ./
-cp -r ../../libraries/ ./
-cp -r ../../src/ ./
-cp -r ../../db/ ./
-cp -r ../../package.json ./
-cp -r ../../package-lock.json ./
-cp -r ../../README.md ./
-cp -r ../../LICENSE ./
-cp -r ../../config-sample.ini ./
-
-rm -r ./node_modules/electron*
-
-rm -r ./node_modules/sqlite3/lib/binding/*
-
-cp -r ../../bin/deps/linux-x64/sqlite/node* ./node_modules/sqlite3/lib/binding/
-
-printf "#/bin/sh\n./node/bin/node src/www" > trilium.sh
-chmod 755 trilium.sh
-
 cd ..
 
-VERSION=`jq -r ".version" ../package.json`
+mv dist/node-v${NODE_VERSION}-linux-x64 $PKG_DIR/node
 
-tar cJf trilium-linux-x64-server-${VERSION}.tar.xz trilium-linux-x64-server
+rm -r $PKG_DIR/node_modules/electron*
+
+rm -r $PKG_DIR/node_modules/sqlite3/lib/binding/*
+
+cp -r ./bin/deps/linux-x64/sqlite/node* $PKG_DIR/node_modules/sqlite3/lib/binding/
+
+printf "#!/bin/sh\n./node/bin/node src/www" > $PKG_DIR/trilium.sh
+chmod 755 $PKG_DIR/trilium.sh
+
+VERSION=`jq -r ".version" package.json`
+
+cd dist
+
+tar cJf trilium-linux-x64-server-${VERSION}.tar.xz trilium-linux-x64-server

bin/build-win-x64.sh

@@ -1,29 +1,36 @@
 #!/usr/bin/env bash
 
-BUILD_DIR=./dist/trilium-windows-x64
-rm -rf $BUILD_DIR
+SRC_DIR=./dist/trilium-windows-x64-src
+
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $SRC_DIR
+fi
 
 echo "Copying required windows binaries"
 
-rm -r node_modules/sqlite3/lib/binding/*
-rm -r node_modules/mozjpeg/vendor/*
-rm -r node_modules/pngquant-bin/vendor/*
-rm -r node_modules/giflossy/vendor/*
+rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
+rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
+rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
+rm -r $SRC_DIR/node_modules/giflossy/vendor/*
 
-cp -r bin/deps/win-x64/sqlite/* node_modules/sqlite3/lib/binding/
-cp bin/deps/win-x64/image/cjpeg.exe node_modules/mozjpeg/vendor/
-cp bin/deps/win-x64/image/pngquant.exe node_modules/pngquant-bin/vendor/
-cp bin/deps/win-x64/image/gifsicle.exe node_modules/giflossy/vendor/
+cp -r bin/deps/win-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/win-x64/image/cjpeg.exe $SRC_DIR/node_modules/mozjpeg/vendor/
+cp bin/deps/win-x64/image/pngquant.exe $SRC_DIR/node_modules/pngquant-bin/vendor/
+cp bin/deps/win-x64/image/gifsicle.exe $SRC_DIR/node_modules/giflossy/vendor/
 
-./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico
+rm -r $SRC_DIR/src/public/dist/*.mobile.*
+
+./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico
+
+BUILD_DIR=./dist/trilium-windows-x64
+rm -rf $BUILD_DIR
 
 mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR
 
 # removing software WebGL binaries because they are pretty huge and not necessary
 rm -r $BUILD_DIR/swiftshader
 
-./bin/reset-local.sh
-
 echo "Zipping windows x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`
 

bin/build.sh

@@ -1,21 +1,23 @@
 #!/usr/bin/env bash
 
-rm -r node_modules
-
-npm install
-
 echo "Deleting existing builds"
 
-rm -r dist/*
+rm -rf dist/*
 
-bin/build-win-x64.sh
+SRC_DIR=dist/trilium-src
 
-bin/build-mac-x64.sh
+bin/copy-trilium.sh $SRC_DIR
 
-# building X64 linux as the last so electron-rebuild will prepare X64 binaries for local development
-bin/build-linux-x64.sh
+# we'll just copy the same SRC dir to all the builds so we don't have to do npm install in each separately
+cp -r $SRC_DIR ./dist/trilium-linux-x64-src
+cp -r $SRC_DIR ./dist/trilium-linux-x64-server
+cp -r $SRC_DIR ./dist/trilium-windows-x64-src
+cp -r $SRC_DIR ./dist/trilium-mac-x64-src
 
-# this needs to be run after linux build
-bin/build-debian.sh
+bin/build-win-x64.sh DONTCOPY
 
-bin/build-server.sh
+bin/build-mac-x64.sh DONTCOPY
+
+bin/build-linux-x64.sh DONTCOPY
+
+bin/build-server.sh DONTCOPY

bin/copy-trilium.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+if [[ $# -eq 0 ]] ; then
+    echo "Missing argument of target directory"
+    exit 1
+fi
+
+DIR=$1
+
+rm -rf $DIR
+mkdir $DIR
+
+echo "Copying Trilium to build directory $DIR"
+
+cp -r images $DIR/
+cp -r libraries $DIR/
+cp -r src $DIR/
+cp -r db $DIR/
+cp -r package.json $DIR/
+cp -r package-lock.json $DIR/
+cp -r README.md $DIR/
+cp -r LICENSE $DIR/
+cp -r config-sample.ini $DIR/
+cp -r electron.js $DIR/
+cp webpack-* $DIR/
+
+# run in subshell (so we return to original dir)
+(cd $DIR && npm install --only=prod && npm run webpack)
+
+find $DIR/libraries -name "*.map" -type f -delete
+
+rm -r $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

bin/generate-cert.sh

@@ -12,5 +12,4 @@ fi
 mkdir -p "$DIR"
 cd "$DIR"
 
-openssl req -x509 -newkey rsa:2048 -keyout key.pem -out cert.pem -days 2000 -nodes
-
+openssl req -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes -out cert.crt -keyout key.key

bin/release.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+export GITHUB_REPO=trilium
+
 if [[ $# -eq 0 ]] ; then
     echo "Missing argument of new version"
     exit 1

bin/reset-local.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-./node_modules/.bin/electron-rebuild --arch=x64

config-sample.ini

@@ -2,8 +2,13 @@
 # Instance name can be used to distinguish between different instances
 instanceName=
 
+# Disable automatically generating desktop icon
+# noDesktopIcon=true
+
 [Network]
-# port setting is relevant only for web deployments, desktop builds run on random free port
+# host setting is relevant only for web deployments - set the host on which the server will listen
+# host=0.0.0.0
+# port setting is relevant only for web deployments, desktop builds run on a fixed port (changeable with TRILIUM_PORT environment variable)
 port=8080
 # true for TLS/SSL/HTTPS (secure), false for HTTP (unsecure).
 https=false

db/migrations/0137__links_to_attributes.sql

@@ -0,0 +1,10 @@
+UPDATE links SET type = 'internal-link' WHERE type = 'hyper';
+UPDATE links SET type = 'image-link' WHERE type = 'image';
+UPDATE links SET type = 'relation-map-link' WHERE type = 'relation-map';
+
+INSERT INTO attributes (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable)
+SELECT linkId, noteId, 'relation', type, targetNoteId, 0, utcDateCreated, utcDateModified, isDeleted, hash, 0 FROM links;
+
+UPDATE sync SET entityName = 'attributes' WHERE entityName = 'links';
+
+DROP TABLE links;

db/migrations/0138__sidebar_sizing.sql

@@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('sidebarMinWidth', '350', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('sidebarWidthPercent', '25', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);

db/migrations/0139__show_sidebar_in_new_tab.sql

@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('showSidebarInNewTab', 'true', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);

db/migrations/0140__widget_config.sql

@@ -0,0 +1,14 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('noteInfoWidget', '{"enabled":true,"expanded":true,"position":100}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('attributesWidget', '{"enabled":true,"expanded":true,"position":200}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('linkMapWidget', '{"enabled":true,"expanded":true,"position":300}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('noteRevisionsWidget', '{"enabled":true,"expanded":true,"position":400}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('whatLinksHereWidget', '{"enabled":false,"expanded":true,"position":500}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);

db/migrations/0141__add_code_note_mime_types.sql

@@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('codeNotesMimeTypes', '["text/x-csrc","text/x-c++src","text/x-csharp","text/css","text/x-go","text/x-groovy","text/x-haskell","text/html","message/http","text/x-java","application/javascript;env=frontend","application/javascript;env=backend","application/json","text/x-kotlin","text/x-markdown","text/x-perl","text/x-php","text/x-python","text/x-ruby",null,"text/x-sql","text/x-swift","text/xml","text/x-yaml"]', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 1);
+
+INSERT INTO sync (entityName, entityId, sourceId, utcSyncDate)
+VALUES ('options' ,'codeNotesMimeTypes', 'SYNC_FILL', '2018-01-01T00:00:00.000Z');

db/migrations/0142__similar_notes_widget.sql

@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('similarNotesWidget', '{"enabled":true,"expanded":true,"position":600}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);

db/migrations/0143__drop_event_log.sql

@@ -0,0 +1 @@
+DROP TABLE event_log;

db/migrations/0144__edited_notes_widget.sql

@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('editedNotesWidget', '{"enabled":true,"expanded":true,"position":50}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);

db/migrations/0145__calendar_widget.sql

@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('calendarWidget', '{"enabled":true,"expanded":true,"position":20}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);

db/migrations/0146__add_spell_check_options.sql

@@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('spellCheckEnabled', 'true', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('spellCheckLanguageCode', 'en-US', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);

db/migrations/0147__add_hideTabRowForOneTab_if_missing.sql

@@ -0,0 +1,3 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+SELECT 'hideTabRowForOneTab', 'false', '2019-05-01T18:31:00.874Z', '2019-05-01T18:31:00.874Z', 0
+WHERE NOT EXISTS(SELECT 1 FROM options WHERE name = 'hideTabRowForOneTab');

db/migrations/0148__make_isExpanded_not_null.sql

@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS "mig_branches" (
+                                          `branchId`	TEXT NOT NULL,
+                                          `noteId`	TEXT NOT NULL,
+                                          `parentNoteId`	TEXT NOT NULL,
+                                          `notePosition`	INTEGER NOT NULL,
+                                          `prefix`	TEXT,
+                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
+                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                          `utcDateModified`	TEXT NOT NULL,
+                                          utcDateCreated TEXT NOT NULL,
+                                          hash TEXT DEFAULT "" NOT NULL,
+                                          PRIMARY KEY(`branchId`));
+
+INSERT INTO mig_branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash)
+SELECT branchId, noteId, parentNoteId, notePosition, prefix, COALESCE(isExpanded, 0), isDeleted, utcDateModified, utcDateCreated, hash FROM branches;
+
+DROP TABLE branches;
+ALTER TABLE mig_branches RENAME TO branches;
+
+CREATE INDEX `IDX_branches_noteId` ON `branches` (`noteId`);
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);

db/migrations/0149__space_out_positions.sql

@@ -0,0 +1,2 @@
+UPDATE branches SET notePosition = notePosition * 10;
+UPDATE attributes SET position = position * 10;

db/migrations/0150__note_revision_contents.sql

@@ -0,0 +1,36 @@
+CREATE TABLE IF NOT EXISTS "note_revisions_mig" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                `noteId`	TEXT NOT NULL,
+                                                `title`	TEXT,
+                                                `contentLength`	INT NOT NULL,
+                                                `isProtected`	INT NOT NULL DEFAULT 0,
+                                                `utcDateLastEdited` TEXT NOT NULL,
+                                                `utcDateCreated` TEXT NOT NULL,
+                                                `utcDateModified` TEXT NOT NULL,
+                                                `dateLastEdited` TEXT NOT NULL,
+                                                `dateCreated` TEXT NOT NULL,
+                                                type TEXT DEFAULT '' NOT NULL,
+                                                mime TEXT DEFAULT '' NOT NULL,
+                                                hash TEXT DEFAULT '' NOT NULL);
+
+CREATE TABLE IF NOT EXISTS "note_revision_contents" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                 `content`	TEXT,
+                                                 hash TEXT DEFAULT '' NOT NULL,
+                                                 `utcDateModified` TEXT NOT NULL);
+
+INSERT INTO note_revision_contents (noteRevisionId, content, hash, utcDateModified)
+SELECT noteRevisionId, content, hash, utcDateModifiedTo FROM note_revisions;
+
+INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, contentLength, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
+SELECT noteRevisionId, noteId, title, COALESCE(LENGTH(content), 0), isProtected, utcDateModifiedFrom, utcDateModifiedTo, utcDateModifiedTo, dateModifiedFrom, dateModifiedTo, type, mime, hash FROM note_revisions;
+
+DROP TABLE note_revisions;
+ALTER TABLE note_revisions_mig RENAME TO note_revisions;
+
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
+CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
+CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
+CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
+CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
+
+INSERT INTO sync (entityName, entityId, sourceId, utcSyncDate)
+SELECT 'note_revision_contents', entityId, sourceId, utcSyncDate FROM sync WHERE entityName = 'note_revisions';

db/migrations/0151__add_isErased_to_note.sql

@@ -0,0 +1,31 @@
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+                                       `noteId`	TEXT NOT NULL,
+                                       `title`	TEXT NOT NULL DEFAULT "note",
+                                       `isProtected`	INT NOT NULL DEFAULT 0,
+                                       `type` TEXT NOT NULL DEFAULT 'text',
+                                       `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                       `hash` TEXT DEFAULT "" NOT NULL,
+                                       `isDeleted`	INT NOT NULL DEFAULT 0,
+                                       `isErased`	INT NOT NULL DEFAULT 0,
+                                       `dateCreated`	TEXT NOT NULL,
+                                       `dateModified`	TEXT NOT NULL,
+                                       `utcDateCreated`	TEXT NOT NULL,
+                                       `utcDateModified`	TEXT NOT NULL,
+                                       PRIMARY KEY(`noteId`));
+
+INSERT INTO notes_mig (noteId, title, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
+SELECT noteId, title, isProtected, type, mime, hash, isDeleted, 0, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+UPDATE notes SET isErased = 1 WHERE isDeleted = 1
+AND 1=(SELECT CASE WHEN content IS NULL THEN 1 ELSE 0 END FROM note_contents WHERE note_contents.noteId = notes.noteId);
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);

db/migrations/0152__add_contentLength_to_note.sql

@@ -0,0 +1,34 @@
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+                                           `noteId`	TEXT NOT NULL,
+                                           `title`	TEXT NOT NULL DEFAULT "note",
+                                           `contentLength`	INT NOT NULL,
+                                           `isProtected`	INT NOT NULL DEFAULT 0,
+                                           `type` TEXT NOT NULL DEFAULT 'text',
+                                           `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                           `hash` TEXT DEFAULT "" NOT NULL,
+                                           `isDeleted`	INT NOT NULL DEFAULT 0,
+                                           `isErased`	INT NOT NULL DEFAULT 0,
+                                           `dateCreated`	TEXT NOT NULL,
+                                           `dateModified`	TEXT NOT NULL,
+                                           `utcDateCreated`	TEXT NOT NULL,
+                                           `utcDateModified`	TEXT NOT NULL,
+                                           PRIMARY KEY(`noteId`));
+
+INSERT INTO notes_mig (noteId, title, contentLength, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
+SELECT noteId, title, -1, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
+
+-- should be OK since sync protocol changes so all instances must upgrade
+UPDATE attributes SET isDeleted = 1 WHERE name = 'fileSize';

db/migrations/0153__add_isErased_to_note_revision.sql

@@ -0,0 +1,28 @@
+CREATE TABLE IF NOT EXISTS "note_revisions_mig" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                 `noteId`	TEXT NOT NULL,
+                                                 `title`	TEXT,
+                                                 `contentLength`	INT NOT NULL,
+                                                 `isErased`	INT NOT NULL DEFAULT 0,
+                                                 `isProtected`	INT NOT NULL DEFAULT 0,
+                                                 `utcDateLastEdited` TEXT NOT NULL,
+                                                 `utcDateCreated` TEXT NOT NULL,
+                                                 `utcDateModified` TEXT NOT NULL,
+                                                 `dateLastEdited` TEXT NOT NULL,
+                                                 `dateCreated` TEXT NOT NULL,
+                                                 type TEXT DEFAULT '' NOT NULL,
+                                                 mime TEXT DEFAULT '' NOT NULL,
+                                                 hash TEXT DEFAULT '' NOT NULL);
+
+INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, contentLength, isErased, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
+SELECT noteRevisionId, noteId, title, contentLength, 0, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash FROM note_revisions;
+
+DROP TABLE note_revisions;
+ALTER TABLE note_revisions_mig RENAME TO note_revisions;
+
+UPDATE note_revisions SET isErased = (SELECT isErased FROM notes WHERE notes.noteId = note_revisions.noteId);
+
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
+CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
+CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
+CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
+CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);

db/migrations/0154__system_links_should_follow_camelCase.sql

@@ -0,0 +1,3 @@
+UPDATE attributes SET name = 'internalLink' WHERE name = 'internal-link';
+UPDATE attributes SET name = 'imageLink' WHERE name = 'image-link';
+UPDATE attributes SET name = 'relationMapLink' WHERE name = 'relation-map-link';

db/migrations/0155__indexes.sql

@@ -0,0 +1,5 @@
+DROP INDEX IF EXISTS IDX_attributes_name_index;
+DROP INDEX IF EXISTS IDX_branches_noteId;
+
+CREATE INDEX IDX_source_ids_utcDateCreated
+    on source_ids (utcDateCreated);

db/migrations/0156__add_deleteId.sql

@@ -0,0 +1,81 @@
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+                                           `noteId`	TEXT NOT NULL,
+                                           `title`	TEXT NOT NULL DEFAULT "note",
+                                           `contentLength`	INT NOT NULL,
+                                           `isProtected`	INT NOT NULL DEFAULT 0,
+                                           `type` TEXT NOT NULL DEFAULT 'text',
+                                           `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                           `hash` TEXT DEFAULT "" NOT NULL,
+                                           `isDeleted`	INT NOT NULL DEFAULT 0,
+                                           `deleteId`   TEXT DEFAULT NULL,
+                                           `isErased`	INT NOT NULL DEFAULT 0,
+                                           `dateCreated`	TEXT NOT NULL,
+                                           `dateModified`	TEXT NOT NULL,
+                                           `utcDateCreated`	TEXT NOT NULL,
+                                           `utcDateModified`	TEXT NOT NULL,
+                                           PRIMARY KEY(`noteId`));
+
+INSERT INTO notes_mig (noteId, title, contentLength, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
+SELECT noteId, title, -1, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
+
+CREATE TABLE IF NOT EXISTS "branches_mig" (
+                                          `branchId`	TEXT NOT NULL,
+                                          `noteId`	TEXT NOT NULL,
+                                          `parentNoteId`	TEXT NOT NULL,
+                                          `notePosition`	INTEGER NOT NULL,
+                                          `prefix`	TEXT,
+                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
+                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                          `deleteId`    TEXT DEFAULT NULL,
+                                          `utcDateModified`	TEXT NOT NULL,
+                                          utcDateCreated TEXT NOT NULL,
+                                          hash TEXT DEFAULT "" NOT NULL,
+                                          PRIMARY KEY(`branchId`));
+
+INSERT INTO branches_mig (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash)
+    SELECT branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash FROM branches;
+
+DROP TABLE branches;
+ALTER TABLE branches_mig RENAME TO branches;
+
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
+
+CREATE TABLE IF NOT EXISTS "attributes_mig"
+(
+    attributeId      TEXT not null primary key,
+    noteId       TEXT not null,
+    type         TEXT not null,
+    name         TEXT not null,
+    value        TEXT default '' not null,
+    position     INT  default 0 not null,
+    utcDateCreated  TEXT not null,
+    utcDateModified TEXT not null,
+    isDeleted    INT  not null,
+    `deleteId`    TEXT DEFAULT NULL,
+    hash         TEXT default "" not null,
+    isInheritable int DEFAULT 0 NULL);
+
+INSERT INTO attributes_mig (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable)
+SELECT attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable FROM attributes;
+
+DROP TABLE attributes;
+ALTER TABLE attributes_mig RENAME TO attributes;
+
+CREATE INDEX IDX_attributes_name_value
+    on attributes (name, value);
+CREATE INDEX IDX_attributes_noteId_index
+    on attributes (noteId);
+CREATE INDEX IDX_attributes_value_index
+    on attributes (value);

db/migrations/0157__fix_contentLength.sql

@@ -0,0 +1 @@
+UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);

db/migrations/0158__add_isSynced_to_sync.sql

@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS "sync_mig" (
+                                          `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                          `entityName`	TEXT NOT NULL,
+                                          `entityId`	TEXT NOT NULL,
+                                          `sourceId` TEXT NOT NULL,
+                                          `isSynced` INTEGER default 0 not null,
+                                          `utcSyncDate`	TEXT NOT NULL);
+
+INSERT INTO sync_mig (id, entityName, entityId, sourceId, isSynced, utcSyncDate)
+SELECT id, entityName, entityId, sourceId, 1, utcSyncDate FROM sync;
+
+DROP TABLE sync;
+
+ALTER TABLE sync_mig RENAME TO sync;
+
+CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
+                                                              `entityName`,
+                                                              `entityId`
+    );
+CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
+                                               `utcSyncDate`
+    );

db/schema.sql

@@ -1,27 +1,8 @@
-CREATE TABLE IF NOT EXISTS "sync" (
-                                    `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-                                    `entityName`	TEXT NOT NULL,
-                                    `entityId`	TEXT NOT NULL,
-                                    `sourceId` TEXT NOT NULL,
-                                    `utcSyncDate`	TEXT NOT NULL);
 CREATE TABLE IF NOT EXISTS "source_ids" (
                                           `sourceId`	TEXT NOT NULL,
                                           `utcDateCreated`	TEXT NOT NULL,
                                           PRIMARY KEY(`sourceId`)
 );
-CREATE TABLE IF NOT EXISTS "note_revisions" (
-                                              `noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
-                                              `noteId`	TEXT NOT NULL,
-                                              `title`	TEXT,
-                                              `content`	TEXT,
-                                              `isProtected`	INT NOT NULL DEFAULT 0,
-                                              `utcDateModifiedFrom` TEXT NOT NULL,
-                                              `utcDateModifiedTo` TEXT NOT NULL,
-                                              `dateModifiedFrom` TEXT NOT NULL,
-                                              `dateModifiedTo` TEXT NOT NULL,
-                                              type TEXT DEFAULT '' NOT NULL,
-                                              mime TEXT DEFAULT '' NOT NULL,
-                                              hash TEXT DEFAULT "" NOT NULL);
 CREATE TABLE IF NOT EXISTS "api_tokens"
 (
   apiTokenId TEXT PRIMARY KEY NOT NULL,
@@ -29,25 +10,6 @@ CREATE TABLE IF NOT EXISTS "api_tokens"
   utcDateCreated TEXT NOT NULL,
   isDeleted INT NOT NULL DEFAULT 0,
   hash TEXT DEFAULT "" NOT NULL);
-CREATE TABLE IF NOT EXISTS "branches" (
-                                        `branchId`	TEXT NOT NULL,
-                                        `noteId`	TEXT NOT NULL,
-                                        `parentNoteId`	TEXT NOT NULL,
-                                        `notePosition`	INTEGER NOT NULL,
-                                        `prefix`	TEXT,
-                                        `isExpanded`	BOOLEAN,
-                                        `isDeleted`	INTEGER NOT NULL DEFAULT 0,
-                                        `utcDateModified`	TEXT NOT NULL,
-                                        utcDateCreated TEXT NOT NULL,
-                                        hash TEXT DEFAULT "" NOT NULL,
-                                        PRIMARY KEY(`branchId`)
-);
-CREATE TABLE IF NOT EXISTS "event_log" (
-                                         `eventId`	TEXT NOT NULL PRIMARY KEY,
-                                         `noteId`	TEXT,
-                                         `comment`	TEXT,
-                                         `utcDateCreated`	TEXT NOT NULL
-);
 CREATE TABLE IF NOT EXISTS "options"
 (
   name TEXT not null PRIMARY KEY,
@@ -57,80 +19,6 @@ CREATE TABLE IF NOT EXISTS "options"
   utcDateCreated TEXT not null,
   utcDateModified TEXT NOT NULL
 );
-CREATE TABLE IF NOT EXISTS "attributes"
-(
-  attributeId      TEXT not null primary key,
-  noteId       TEXT not null,
-  type         TEXT not null,
-  name         TEXT not null,
-  value        TEXT default '' not null,
-  position     INT  default 0 not null,
-  utcDateCreated  TEXT not null,
-  utcDateModified TEXT not null,
-  isDeleted    INT  not null,
-  hash         TEXT default "" not null,
-  isInheritable int DEFAULT 0 NULL);
-CREATE TABLE IF NOT EXISTS "links" (
-                                     `linkId`	TEXT NOT NULL,
-                                     `noteId`	TEXT NOT NULL,
-                                     `targetNoteId`	TEXT NOT NULL,
-                                     `type` TEXT NOT NULL,
-                                     `hash` TEXT DEFAULT "" NOT NULL,
-                                     `isDeleted`	INTEGER NOT NULL DEFAULT 0,
-                                     `utcDateCreated`	TEXT NOT NULL,
-                                     `utcDateModified`	TEXT NOT NULL,
-                                     PRIMARY KEY(`linkId`)
-);
-CREATE TABLE IF NOT EXISTS "notes" (
-                                     `noteId`	TEXT NOT NULL,
-                                     `title`	TEXT NOT NULL DEFAULT "note",
-                                     `isProtected`	INT NOT NULL DEFAULT 0,
-                                     `type` TEXT NOT NULL DEFAULT 'text',
-                                     `mime` TEXT NOT NULL DEFAULT 'text/html',
-                                     `hash` TEXT DEFAULT "" NOT NULL,
-                                     `isDeleted`	INT NOT NULL DEFAULT 0,
-                                     `dateCreated`	TEXT NOT NULL,
-                                     `dateModified`	TEXT NOT NULL,
-                                     `utcDateCreated`	TEXT NOT NULL,
-                                     `utcDateModified`	TEXT NOT NULL,
-                                     PRIMARY KEY(`noteId`)
-);
-CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
-                                                              `entityName`,
-                                                              `entityId`
-  );
-CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
-                                            `utcSyncDate`
-  );
-CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (
-                                                              `noteId`
-  );
-CREATE INDEX `IDX_note_revisions_dateModifiedFrom` ON `note_revisions` (
-                                                                        `utcDateModifiedFrom`
-  );
-CREATE INDEX `IDX_note_revisions_dateModifiedTo` ON `note_revisions` (
-                                                                      `utcDateModifiedTo`
-  );
-CREATE INDEX `IDX_branches_noteId` ON `branches` (
-                                                  `noteId`
-  );
-CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (
-                                                               `noteId`,
-                                                               `parentNoteId`
-  );
-CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
-CREATE INDEX IDX_attributes_name_value
-  on attributes (name, value);
-CREATE INDEX IDX_links_noteId_index
-  on links (noteId);
-CREATE INDEX IDX_links_targetNoteId_index
-  on links (targetNoteId);
-CREATE INDEX IDX_attributes_name_index
-  on attributes (name);
-CREATE INDEX IDX_attributes_noteId_index
-  on attributes (noteId);
-CREATE INDEX IDX_attributes_value_index
-  on attributes (value);
 CREATE TABLE IF NOT EXISTS "note_contents" (
                                                    `noteId`	TEXT NOT NULL,
                                                    `content`	TEXT NULL DEFAULT NULL,
@@ -146,3 +34,100 @@ CREATE TABLE recent_notes
     utcDateCreated TEXT not null,
     isDeleted INT
 );
+CREATE TABLE IF NOT EXISTS "note_revision_contents" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                 `content`	TEXT,
+                                                 hash TEXT DEFAULT '' NOT NULL,
+                                                 `utcDateModified` TEXT NOT NULL);
+CREATE TABLE IF NOT EXISTS "note_revisions" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                 `noteId`	TEXT NOT NULL,
+                                                 `title`	TEXT,
+                                                 `contentLength`	INT NOT NULL,
+                                                 `isErased`	INT NOT NULL DEFAULT 0,
+                                                 `isProtected`	INT NOT NULL DEFAULT 0,
+                                                 `utcDateLastEdited` TEXT NOT NULL,
+                                                 `utcDateCreated` TEXT NOT NULL,
+                                                 `utcDateModified` TEXT NOT NULL,
+                                                 `dateLastEdited` TEXT NOT NULL,
+                                                 `dateCreated` TEXT NOT NULL,
+                                                 type TEXT DEFAULT '' NOT NULL,
+                                                 mime TEXT DEFAULT '' NOT NULL,
+                                                 hash TEXT DEFAULT '' NOT NULL);
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
+CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
+CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
+CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
+CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
+CREATE INDEX IDX_source_ids_utcDateCreated
+    on source_ids (utcDateCreated);
+CREATE TABLE IF NOT EXISTS "notes" (
+                                           `noteId`	TEXT NOT NULL,
+                                           `title`	TEXT NOT NULL DEFAULT "note",
+                                           `contentLength`	INT NOT NULL,
+                                           `isProtected`	INT NOT NULL DEFAULT 0,
+                                           `type` TEXT NOT NULL DEFAULT 'text',
+                                           `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                           `hash` TEXT DEFAULT "" NOT NULL,
+                                           `isDeleted`	INT NOT NULL DEFAULT 0,
+                                           `deleteId`   TEXT DEFAULT NULL,
+                                           `isErased`	INT NOT NULL DEFAULT 0,
+                                           `dateCreated`	TEXT NOT NULL,
+                                           `dateModified`	TEXT NOT NULL,
+                                           `utcDateCreated`	TEXT NOT NULL,
+                                           `utcDateModified`	TEXT NOT NULL,
+                                           PRIMARY KEY(`noteId`));
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
+CREATE TABLE IF NOT EXISTS "branches" (
+                                          `branchId`	TEXT NOT NULL,
+                                          `noteId`	TEXT NOT NULL,
+                                          `parentNoteId`	TEXT NOT NULL,
+                                          `notePosition`	INTEGER NOT NULL,
+                                          `prefix`	TEXT,
+                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
+                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                          `deleteId`    TEXT DEFAULT NULL,
+                                          `utcDateModified`	TEXT NOT NULL,
+                                          utcDateCreated TEXT NOT NULL,
+                                          hash TEXT DEFAULT "" NOT NULL,
+                                          PRIMARY KEY(`branchId`));
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
+CREATE TABLE IF NOT EXISTS "attributes"
+(
+    attributeId      TEXT not null primary key,
+    noteId       TEXT not null,
+    type         TEXT not null,
+    name         TEXT not null,
+    value        TEXT default '' not null,
+    position     INT  default 0 not null,
+    utcDateCreated  TEXT not null,
+    utcDateModified TEXT not null,
+    isDeleted    INT  not null,
+    `deleteId`    TEXT DEFAULT NULL,
+    hash         TEXT default "" not null,
+    isInheritable int DEFAULT 0 NULL);
+CREATE INDEX IDX_attributes_name_value
+    on attributes (name, value);
+CREATE INDEX IDX_attributes_noteId_index
+    on attributes (noteId);
+CREATE INDEX IDX_attributes_value_index
+    on attributes (value);
+CREATE TABLE IF NOT EXISTS "sync" (
+    `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `entityName`	TEXT NOT NULL,
+    `entityId`	TEXT NOT NULL,
+    `sourceId` TEXT NOT NULL,
+    `isSynced` INTEGER default 0 not null,
+    `utcSyncDate`	TEXT NOT NULL);
+CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
+                                                              `entityName`,
+                                                              `entityId`
+    );
+CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
+                                               `utcSyncDate`
+    );

docs/backend_api/ApiToken.html

@@ -28,7 +28,7 @@
 
 <header>
     
-        <h2><span class="attribs"><span class="type-signature"></span></span>ApiToken<span class="signature">(apiTokenId, token, isDeleted, utcDateCreated)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>ApiToken<span class="signature">()</span><span class="type-signature"></span></h2>
         
             <div class="class-description">ApiToken is an entity representing token used to authenticate against Trilium API from client applications. Currently used only by Trilium Sender.</div>
         
@@ -45,7 +45,7 @@
     
 
     
-    <h4 class="name" id="ApiToken"><span class="type-signature"></span>new ApiToken<span class="signature">(apiTokenId, token, isDeleted, utcDateCreated)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="ApiToken"><span class="type-signature"></span>new ApiToken<span class="signature">()</span><span class="type-signature"></span></h4>
     
 
     
@@ -60,10 +60,15 @@
 
 
 
-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
     
 
-<table class="params">
+<table class="props">
     <thead>
     <tr>
         
@@ -180,8 +185,6 @@
 
 
 
-
-
 <dl class="details">
 
     
@@ -239,6 +242,8 @@
 
 
 
+
+
     
     </div>
 
@@ -282,13 +287,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/Attribute.html

@@ -28,7 +28,7 @@
 
 <header>
     
-        <h2><span class="attribs"><span class="type-signature"></span></span>Attribute<span class="signature">(attributeId, noteId, type, name, value, position, isInheritable, isDeleted, utcDateCreated, utcDateModified)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>Attribute<span class="signature">()</span><span class="type-signature"></span></h2>
         
             <div class="class-description">Attribute is key value pair owned by a note.</div>
         
@@ -45,7 +45,7 @@
     
 
     
-    <h4 class="name" id="Attribute"><span class="type-signature"></span>new Attribute<span class="signature">(attributeId, noteId, type, name, value, position, isInheritable, isDeleted, utcDateCreated, utcDateModified)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="Attribute"><span class="type-signature"></span>new Attribute<span class="signature">()</span><span class="type-signature"></span></h4>
     
 
     
@@ -60,10 +60,15 @@
 
 
 
-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
     
 
-<table class="params">
+<table class="props">
     <thead>
     <tr>
         
@@ -267,6 +272,32 @@
 
     
 
+        <tr>
+            
+                <td class="name"><code>deleteId</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+|
+
+<span class="param-type">null</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">ID identifying delete transaction</td>
+        </tr>
+
+    
+
         <tr>
             
                 <td class="name"><code>utcDateCreated</code></td>
@@ -318,8 +349,6 @@
 
 
 
-
-
 <dl class="details">
 
     
@@ -349,7 +378,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line24">line 24</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line30">line 30</a>
     </li></ul></dd>
     
 
@@ -377,6 +406,8 @@
 
 
 
+
+
     
     </div>
 
@@ -462,7 +493,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line46">line 46</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line47">line 47</a>
     </li></ul></dd>
     
 
@@ -485,6 +516,8 @@
 
 
 
+
+
 <h5>Returns:</h5>
 
         
@@ -562,7 +595,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line57">line 57</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line54">line 54</a>
     </li></ul></dd>
     
 
@@ -585,6 +618,8 @@
 
 
 
+
+
 <h5>Returns:</h5>
 
         
@@ -662,7 +697,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line76">line 76</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line69">line 69</a>
     </li></ul></dd>
     
 
@@ -685,6 +720,8 @@
 
 
 
+
+
 <h5>Returns:</h5>
 
         
@@ -724,13 +761,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/Branch.html

@@ -28,7 +28,7 @@
 
 <header>
     
-        <h2><span class="attribs"><span class="type-signature"></span></span>Branch<span class="signature">(branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h2>
+        <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 note's placement in the tree - it's essentially pair of noteId and parentNoteId.
 Each note can have multiple (at least one) branches, meaning it can be placed into multiple places in the tree.</div>
@@ -46,7 +46,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     
 
     
-    <h4 class="name" id="Branch"><span class="type-signature"></span>new Branch<span class="signature">(branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="Branch"><span class="type-signature"></span>new Branch<span class="signature">()</span><span class="type-signature"></span></h4>
     
 
     
@@ -61,10 +61,15 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 
 
 
-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
     
 
-<table class="params">
+<table class="props">
     <thead>
     <tr>
         
@@ -245,6 +250,32 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 
     
 
+        <tr>
+            
+                <td class="name"><code>deleteId</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+|
+
+<span class="param-type">null</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">ID identifying delete transaction</td>
+        </tr>
+
+    
+
         <tr>
             
                 <td class="name"><code>utcDateModified</code></td>
@@ -296,8 +327,6 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 
 
 
-
-
 <dl class="details">
 
     
@@ -327,7 +356,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line24">line 24</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line25">line 25</a>
     </li></ul></dd>
     
 
@@ -355,6 +384,8 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 
 
 
+
+
     
     </div>
 
@@ -392,7 +423,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     
 
     
-    <h4 class="name" id="getNote"><span class="type-signature">(async) </span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
+    <h4 class="name" id="getNote"><span class="type-signature">(async) </span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
     
 
     
@@ -440,7 +471,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line38">line 38</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line32">line 32</a>
     </li></ul></dd>
     
 
@@ -463,6 +494,8 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 
 
 
+
+
 <h5>Returns:</h5>
 
         
@@ -474,10 +507,109 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     </dt>
     <dd>
         
-<span class="param-type"><a href="Note.html">Note</a></span>
-|
+<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
 
-<span class="param-type">null</span>
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="getParentNote"><span class="type-signature">(async) </span>getParentNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line37">line 37</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
 
 
     </dd>
@@ -505,13 +637,13 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/Entity.html

@@ -178,6 +178,8 @@
 
 
 
+
+
     
     </div>
 
@@ -210,13 +212,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/NoteRevision.html

@@ -28,7 +28,7 @@
 
 <header>
     
-        <h2><span class="attribs"><span class="type-signature"></span></span>NoteRevision<span class="signature">(noteRevisionId, noteId, type, mime, title, content, isProtected, dateModifiedFrom, dateModifiedTo, utcDateModifiedFrom, utcDateModifiedTo)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>NoteRevision<span class="signature">()</span><span class="type-signature"></span></h2>
         
             <div class="class-description">NoteRevision represents snapshot of note's title and content at some point in the past. It's used for seamless note versioning.</div>
         
@@ -45,7 +45,7 @@
     
 
     
-    <h4 class="name" id="NoteRevision"><span class="type-signature"></span>new NoteRevision<span class="signature">(noteRevisionId, noteId, type, mime, title, content, isProtected, dateModifiedFrom, dateModifiedTo, utcDateModifiedFrom, utcDateModifiedTo)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="NoteRevision"><span class="type-signature"></span>new NoteRevision<span class="signature">()</span><span class="type-signature"></span></h4>
     
 
     
@@ -60,10 +60,15 @@
 
 
 
-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
     
 
-<table class="params">
+<table class="props">
     <thead>
     <tr>
         
@@ -200,13 +205,36 @@
 
         <tr>
             
-                <td class="name"><code>content</code></td>
+                <td class="name"><code>contentLength</code></td>
             
 
             <td class="type">
             
                 
-<span class="param-type">string</span>
+<span class="param-type">int</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last"></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>isErased</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">boolean</span>
 
 
             
@@ -229,7 +257,7 @@
             <td class="type">
             
                 
-<span class="param-type">string</span>
+<span class="param-type">boolean</span>
 
 
             
@@ -246,7 +274,7 @@
 
         <tr>
             
-                <td class="name"><code>dateModifiedFrom</code></td>
+                <td class="name"><code>dateLastEdited</code></td>
             
 
             <td class="type">
@@ -269,7 +297,7 @@
 
         <tr>
             
-                <td class="name"><code>dateModifiedTo</code></td>
+                <td class="name"><code>dateCreated</code></td>
             
 
             <td class="type">
@@ -292,7 +320,7 @@
 
         <tr>
             
-                <td class="name"><code>utcDateModifiedFrom</code></td>
+                <td class="name"><code>utcDateLastEdited</code></td>
             
 
             <td class="type">
@@ -315,7 +343,30 @@
 
         <tr>
             
-                <td class="name"><code>utcDateModifiedTo</code></td>
+                <td class="name"><code>utcDateCreated</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last"></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>utcDateModified</code></td>
             
 
             <td class="type">
@@ -341,8 +392,6 @@
 
 
 
-
-
 <dl class="details">
 
     
@@ -372,7 +421,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line24">line 24</a>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line35">line 35</a>
     </li></ul></dd>
     
 
@@ -400,6 +449,8 @@
 
 
 
+
+
     
     </div>
 
@@ -429,6 +480,320 @@
     
 
     
+        <h3 class="subsection-title">Methods</h3>
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="getContent"><span class="type-signature">(async) </span>getContent<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;*>}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line69">line 69</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">Promise.&lt;*></span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="isStringNote"><span class="type-signature"></span>isStringNote<span class="signature">()</span><span class="type-signature"> &rarr; {boolean}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line55">line 55</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+<div class="param-desc">
+    true if the note has string content (not binary)
+</div>
+
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">boolean</span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="setContent"><span class="type-signature">(async) </span>setContent<span class="signature">()</span><span class="type-signature"> &rarr; {Promise}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line105">line 105</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">Promise</span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+    
 
     
 
@@ -443,13 +808,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/Option.html

@@ -28,7 +28,7 @@
 
 <header>
     
-        <h2><span class="attribs"><span class="type-signature"></span></span>Option<span class="signature">(name, value, isSynced, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>Option<span class="signature">()</span><span class="type-signature"></span></h2>
         
             <div class="class-description">Option represents name-value pair, either directly configurable by the user or some system property.</div>
         
@@ -45,7 +45,7 @@
     
 
     
-    <h4 class="name" id="Option"><span class="type-signature"></span>new Option<span class="signature">(name, value, isSynced, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="Option"><span class="type-signature"></span>new Option<span class="signature">()</span><span class="type-signature"></span></h4>
     
 
     
@@ -60,10 +60,15 @@
 
 
 
-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
     
 
-<table class="params">
+<table class="props">
     <thead>
     <tr>
         
@@ -203,8 +208,6 @@
 
 
 
-
-
 <dl class="details">
 
     
@@ -234,7 +237,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_option.js.html">entities/option.js</a>, <a href="entities_option.js.html#line17">line 17</a>
+        <a href="entities_option.js.html">entities/option.js</a>, <a href="entities_option.js.html#line22">line 22</a>
     </li></ul></dd>
     
 
@@ -262,6 +265,8 @@
 
 
 
+
+
     
     </div>
 
@@ -305,13 +310,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/RecentNote.html

@@ -28,7 +28,7 @@
 
 <header>
     
-        <h2><span class="attribs"><span class="type-signature"></span></span>RecentNote<span class="signature">(noteId, notePath, isDeleted, utcDateModified)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>RecentNote<span class="signature">()</span><span class="type-signature"></span></h2>
         
             <div class="class-description">RecentNote represents recently visited note.</div>
         
@@ -45,7 +45,7 @@
     
 
     
-    <h4 class="name" id="RecentNote"><span class="type-signature"></span>new RecentNote<span class="signature">(noteId, notePath, isDeleted, utcDateModified)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="RecentNote"><span class="type-signature"></span>new RecentNote<span class="signature">()</span><span class="type-signature"></span></h4>
     
 
     
@@ -60,10 +60,15 @@
 
 
 
-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
     
 
-<table class="params">
+<table class="props">
     <thead>
     <tr>
         
@@ -180,8 +185,6 @@
 
 
 
-
-
 <dl class="details">
 
     
@@ -239,6 +242,8 @@
 
 
 
+
+
     
     </div>
 
@@ -282,13 +287,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_api_token.js.html

@@ -34,10 +34,10 @@ const dateUtils = require('../services/date_utils');
 /**
  * ApiToken is an entity representing token used to authenticate against Trilium API from client applications. Currently used only by Trilium Sender.
  *
- * @param {string} apiTokenId - primary key
- * @param {string} token
- * @param {boolean} isDeleted - true if API token is deleted
- * @param {string} utcDateCreated
+ * @property {string} apiTokenId - primary key
+ * @property {string} token
+ * @property {boolean} isDeleted - true if API token is deleted
+ * @property {string} utcDateCreated
  *
  * @extends Entity
  */
@@ -69,13 +69,13 @@ module.exports = ApiToken;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_attribute.js.html

@@ -36,16 +36,17 @@ const sql = require('../services/sql');
 /**
  * Attribute is key value pair owned by a note.
  *
- * @param {string} attributeId
- * @param {string} noteId
- * @param {string} type
- * @param {string} name
- * @param {string} value
- * @param {int} position
- * @param {boolean} isInheritable
- * @param {boolean} isDeleted
- * @param {string} utcDateCreated
- * @param {string} utcDateModified
+ * @property {string} attributeId
+ * @property {string} noteId
+ * @property {string} type
+ * @property {string} name
+ * @property {string} value
+ * @property {int} position
+ * @property {boolean} isInheritable
+ * @property {boolean} isDeleted
+ * @property {string|null} deleteId - ID identifying delete transaction
+ * @property {string} utcDateCreated
+ * @property {string} utcDateModified
  *
  * @extends Entity
  */
@@ -72,11 +73,7 @@ class Attribute extends Entity {
      * @returns {Promise<Note|null>}
      */
     async getNote() {
-        if (!this.__note) {
-            this.__note = await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
-        }
-
-        return this.__note;
+        return await repository.getNote(this.noteId);
     }
 
     /**
@@ -91,11 +88,7 @@ class Attribute extends Entity {
             return null;
         }
 
-        if (!this.__targetNote) {
-            this.__targetNote = await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.value]);
-        }
-
-        return this.__targetNote;
+        return await repository.getNote(this.value);
     }
 
     /**
@@ -107,6 +100,10 @@ class Attribute extends Entity {
 
     async beforeSaving() {
         if (!this.value) {
+            if (this.type === 'relation') {
+                throw new Error(`Cannot save relation ${this.name} since it does not target any note.`);
+            }
+
             // null value isn't allowed
             this.value = "";
         }
@@ -137,6 +134,21 @@ class Attribute extends Entity {
     // cannot be static!
     updatePojo(pojo) {
         delete pojo.isOwned;
+        delete pojo.__note;
+    }
+
+    createClone(type, name, value) {
+        return new Attribute({
+            noteId: this.noteId,
+            type: type,
+            name: name,
+            value: value,
+            position: this.position,
+            isInheritable: this.isInheritable,
+            isDeleted: false,
+            utcDateCreated: this.utcDateCreated,
+            utcDateModified: this.utcDateModified
+        });
     }
 }
 
@@ -150,13 +162,13 @@ module.exports = Attribute;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_branch.js.html

@@ -37,15 +37,16 @@ const sql = require('../services/sql');
  * Branch represents note's placement in the tree - it's essentially pair of noteId and parentNoteId.
  * Each note can have multiple (at least one) branches, meaning it can be placed into multiple places in the tree.
  *
- * @param {string} branchId - primary key
- * @param {string} noteId
- * @param {string} parentNoteId
- * @param {int} notePosition
- * @param {string} prefix
- * @param {boolean} isExpanded
- * @param {boolean} isDeleted
- * @param {string} utcDateModified
- * @param {string} utcDateCreated
+ * @property {string} branchId - primary key
+ * @property {string} noteId
+ * @property {string} parentNoteId
+ * @property {int} notePosition
+ * @property {string} prefix
+ * @property {boolean} isExpanded
+ * @property {boolean} isDeleted
+ * @property {string|null} deleteId - ID identifying delete transaction
+ * @property {string} utcDateModified
+ * @property {string} utcDateCreated
  *
  * @extends Entity
  */
@@ -53,24 +54,26 @@ class Branch extends Entity {
     static get entityName() { return "branches"; }
     static get primaryKeyName() { return "branchId"; }
     // notePosition is not part of hash because it would produce a lot of updates in case of reordering
-    static get hashedProperties() { return ["branchId", "noteId", "parentNoteId", "isDeleted", "prefix"]; }
+    static get hashedProperties() { return ["branchId", "noteId", "parentNoteId", "isDeleted", "deleteId", "prefix"]; }
 
-    constructor(row = {}) {
-        super(row);
-
-        // used to detect move in note tree
-        this.origParentNoteId = this.parentNoteId;
+    /** @returns {Promise<Note|null>} */
+    async getNote() {
+        return await repository.getNote(this.noteId);
     }
 
-    /** @returns {Note|null} */
-    async getNote() {
-        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+    /** @returns {Promise<Note|null>} */
+    async getParentNote() {
+        return await repository.getNote(this.parentNoteId);
     }
 
     async beforeSaving() {
         if (this.notePosition === undefined) {
             const maxNotePos = await sql.getValue('SELECT MAX(notePosition) FROM branches WHERE parentNoteId = ? AND isDeleted = 0', [this.parentNoteId]);
-            this.notePosition = maxNotePos === null ? 0 : maxNotePos + 1;
+            this.notePosition = maxNotePos === null ? 0 : maxNotePos + 10;
+        }
+
+        if (!this.isExpanded) {
+            this.isExpanded = false;
         }
 
         if (!this.isDeleted) {
@@ -88,9 +91,17 @@ class Branch extends Entity {
         }
     }
 
-    // cannot be static!
-    updatePojo(pojo) {
-        delete pojo.origParentNoteId;
+    createClone(parentNoteId, notePosition) {
+        return new Branch({
+            noteId: this.noteId,
+            parentNoteId: parentNoteId,
+            notePosition: notePosition,
+            prefix: this.prefix,
+            isExpanded: this.isExpanded,
+            isDeleted: false,
+            utcDateCreated: this.utcDateCreated,
+            utcDateModified: this.utcDateModified
+        });
     }
 }
 
@@ -104,13 +115,13 @@ module.exports = Branch;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_entity.js.html

@@ -96,13 +96,13 @@ module.exports = Entity;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_note.js.html

@@ -42,8 +42,6 @@ const LABEL_DEFINITION = 'label-definition';
 const RELATION = 'relation';
 const RELATION_DEFINITION = 'relation-definition';
 
-const STRING_MIME_TYPES = ["application/x-javascript"];
-
 /**
  * This represents a Note which is a central object in the Trilium Notes project.
  *
@@ -51,8 +49,11 @@ const STRING_MIME_TYPES = ["application/x-javascript"];
  * @property {string} type - one of "text", "code", "file" or "render"
  * @property {string} mime - MIME type, e.g. "text/html"
  * @property {string} title - note title
+ * @property {int} contentLength - length of content
  * @property {boolean} isProtected - true if note is protected
  * @property {boolean} isDeleted - true if note is deleted
+ * @property {string|null} deleteId - ID identifying delete transaction
+ * @property {boolean} isErased - true if note's content is erased after it has been deleted
  * @property {string} dateCreated - local date time (with offset)
  * @property {string} dateModified - local date time (with offset)
  * @property {string} utcDateCreated
@@ -63,7 +64,7 @@ const STRING_MIME_TYPES = ["application/x-javascript"];
 class Note extends Entity {
     static get entityName() { return "notes"; }
     static get primaryKeyName() { return "noteId"; }
-    static get hashedProperties() { return ["noteId", "title", "type", "isProtected", "isDeleted"]; }
+    static get hashedProperties() { return ["noteId", "title", "type", "mime", "isProtected", "isDeleted", "deleteId"]; }
 
     /**
      * @param row - object containing database row from "notes" table
@@ -72,7 +73,7 @@ class Note extends Entity {
         super(row);
 
         this.isProtected = !!this.isProtected;
-        /* true if content (meaning any kind of potentially encrypted content) is either not encrypted
+        /* true if content is either not encrypted
          * or encrypted, but with available protected session (so effectively decrypted) */
         this.isContentAvailable = true;
 
@@ -81,7 +82,7 @@ class Note extends Entity {
             this.isContentAvailable = protectedSessionService.isProtectedSessionAvailable();
 
             if (this.isContentAvailable) {
-                protectedSessionService.decryptNote(this);
+                this.title = protectedSessionService.decryptString(this.title);
             }
             else {
                 this.title = "[protected]";
@@ -116,34 +117,46 @@ class Note extends Entity {
 
             if (this.isProtected) {
                 if (this.isContentAvailable) {
-                    protectedSessionService.decryptNoteContent(this);
+                    this.content = this.content === null ? null : protectedSessionService.decrypt(this.content);
                 }
                 else {
                     this.content = "";
                 }
             }
-
-            if (this.isStringNote()) {
-                this.content = this.content === null
-                    ? ""
-                    : this.content.toString("UTF-8");
-            }
         }
 
-        return this.content;
+        if (this.isStringNote()) {
+            return this.content === null
+                ? ""
+                : this.content.toString("UTF-8");
+        }
+        else {
+            return this.content;
+        }
     }
 
     /** @returns {Promise<*>} */
     async getJsonContent() {
         const content = await this.getContent();
 
+        if (!content || !content.trim()) {
+            return null;
+        }
+
         return JSON.parse(content);
     }
 
     /** @returns {Promise} */
     async setContent(content) {
-        // force updating note itself so that dateChanged is represented correctly even for the content
+        if (content === null || content === undefined) {
+            throw new Error(`Cannot set null content to note ${this.noteId}`);
+        }
+
+        content = Buffer.isBuffer(content) ? content : Buffer.from(content);
+
+        // force updating note itself so that dateModified is represented correctly even for the content
         this.forcedChange = true;
+        this.contentLength = content.byteLength;
         await this.save();
 
         this.content = content;
@@ -152,12 +165,12 @@ class Note extends Entity {
             noteId: this.noteId,
             content: content,
             utcDateModified: dateUtils.utcNowDateTime(),
-            hash: utils.hash(this.noteId + "|" + content)
+            hash: utils.hash(this.noteId + "|" + content.toString())
         };
 
         if (this.isProtected) {
             if (this.isContentAvailable) {
-                protectedSessionService.encryptNoteContent(pojo);
+                pojo.content = protectedSessionService.encrypt(pojo.content);
             }
             else {
                 throw new Error(`Cannot update content of noteId=${this.noteId} since we're out of protected session.`);
@@ -199,9 +212,7 @@ class Note extends Entity {
 
     /** @returns {boolean} true if the note has string content (not binary) */
     isStringNote() {
-        return ["text", "code", "relation-map", "search"].includes(this.type)
-            || this.mime.startsWith('text/')
-            || STRING_MIME_TYPES.includes(this.mime);
+        return utils.isStringNote(this.type, this.mime);
     }
 
     /** @returns {string} JS script environment - either "frontend" or "backend" */
@@ -221,11 +232,47 @@ class Note extends Entity {
         return null;
     }
 
+    async loadOwnedAttributesToCache() {
+        this.__ownedAttributeCache = await repository.getEntities(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`, [this.noteId]);
+        return this.__ownedAttributeCache;
+    }
+
     /**
-     * @returns {Promise<Attribute[]>} attributes belonging to this specific note (excludes inherited attributes)
+     * This method is a faster variant of getAttributes() which looks for only owned attributes.
+     * Use when inheritance is not needed and/or in batch/performance sensitive operations.
+     *
+     * @param {string} [type] - (optional) attribute type to filter
+     * @param {string} [name] - (optional) attribute name to filter
+     * @returns {Promise<Attribute[]>} note's "owned" attributes - excluding inherited ones
      */
-    async getOwnedAttributes() {
-        return await repository.getEntities(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`, [this.noteId]);
+    async getOwnedAttributes(type, name) {
+        if (!this.__ownedAttributeCache) {
+            await this.loadOwnedAttributesToCache();
+        }
+
+        if (type && name) {
+            return this.__ownedAttributeCache.filter(attr => attr.type === type && attr.name === name);
+        }
+        else if (type) {
+            return this.__ownedAttributeCache.filter(attr => attr.type === type);
+        }
+        else if (name) {
+            return this.__ownedAttributeCache.filter(attr => attr.name === name);
+        }
+        else {
+            return this.__ownedAttributeCache.slice();
+        }
+    }
+
+    /**
+     * @returns {Promise<Attribute>} attribute belonging to this specific note (excludes inherited attributes)
+     *
+     * This method can be significantly faster than the getAttribute()
+     */
+    async getOwnedAttribute(type, name) {
+        const attrs = await this.getOwnedAttributes(type, name);
+
+        return attrs.length > 0 ? attrs[0] : null;
     }
 
     /**
@@ -236,19 +283,26 @@ class Note extends Entity {
     }
 
     /**
-     * @param {string} [name] - attribute name to filter
+     * @param {string} [type] - (optional) attribute type to filter
+     * @param {string} [name] - (optional) attribute name to filter
      * @returns {Promise<Attribute[]>} all note's attributes, including inherited ones
      */
-    async getAttributes(name) {
+    async getAttributes(type, name) {
         if (!this.__attributeCache) {
             await this.loadAttributesToCache();
         }
 
-        if (name) {
+        if (type && name) {
+            return this.__attributeCache.filter(attr => attr.type === type && attr.name === name);
+        }
+        else if (type) {
+            return this.__attributeCache.filter(attr => attr.type === type);
+        }
+        else if (name) {
             return this.__attributeCache.filter(attr => attr.name === name);
         }
         else {
-            return this.__attributeCache;
+            return this.__attributeCache.slice();
         }
     }
 
@@ -257,7 +311,15 @@ class Note extends Entity {
      * @returns {Promise<Attribute[]>} all note's labels (attributes with type label), including inherited ones
      */
     async getLabels(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === LABEL);
+        return await this.getAttributes(LABEL, name);
+    }
+
+    /**
+     * @param {string} [name] - label name to filter
+     * @returns {Promise<Attribute[]>} all note's labels (attributes with type label), excluding inherited ones
+     */
+    async getOwnedLabels(name) {
+        return await this.getOwnedAttributes(LABEL, name);
     }
 
     /**
@@ -265,7 +327,7 @@ class Note extends Entity {
      * @returns {Promise<Attribute[]>} all note's label definitions, including inherited ones
      */
     async getLabelDefinitions(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === LABEL_DEFINITION);
+        return await this.getAttributes(LABEL_DEFINITION, name);
     }
 
     /**
@@ -273,7 +335,30 @@ class Note extends Entity {
      * @returns {Promise<Attribute[]>} all note's relations (attributes with type relation), including inherited ones
      */
     async getRelations(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === RELATION);
+        return await this.getAttributes(RELATION, name);
+    }
+
+    /**
+     * @param {string} [name] - relation name to filter
+     * @returns {Promise<Attribute[]>} all note's relations (attributes with type relation), excluding inherited ones
+     */
+    async getOwnedRelations(name) {
+        return await this.getOwnedAttributes(RELATION, name);
+    }
+
+    /**
+     * @param {string} [name] - relation name to filter
+     * @returns {Promise<Note[]>}
+     */
+    async getRelationTargets(name) {
+        const relations = await this.getRelations(name);
+        const targets = [];
+
+        for (const relation of relations) {
+            targets.push(await relation.getTargetNote());
+        }
+
+        return targets;
     }
 
     /**
@@ -281,7 +366,7 @@ class Note extends Entity {
      * @returns {Promise<Attribute[]>} all note's relation definitions including inherited ones
      */
     async getRelationDefinitions(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === RELATION_DEFINITION);
+        return await this.getAttributes(RELATION_DEFINITION, name);
     }
 
     /**
@@ -290,6 +375,7 @@ class Note extends Entity {
      */
     invalidateAttributeCache() {
         this.__attributeCache = null;
+        this.__ownedAttributeCache = null;
     }
 
     /** @returns {Promise<void>} */
@@ -299,29 +385,33 @@ class Note extends Entity {
             tree(noteId, level) AS (
                 SELECT ?, 0
                 UNION
-                SELECT branches.parentNoteId, tree.level + 1 FROM branches
+                SELECT branches.parentNoteId, tree.level + 1 
+                    FROM branches
                     JOIN tree ON branches.noteId = tree.noteId
-                    JOIN notes ON notes.noteId = branches.parentNoteId
-                WHERE notes.isDeleted = 0
-                  AND branches.isDeleted = 0
+                WHERE branches.isDeleted = 0
             ),
             treeWithAttrs(noteId, level) AS (
                 SELECT * FROM tree
                 UNION
-                SELECT attributes.value, treeWithAttrs.level + 1 FROM attributes
+                SELECT attributes.value, treeWithAttrs.level FROM attributes
                      JOIN treeWithAttrs ON treeWithAttrs.noteId = attributes.noteId
                 WHERE attributes.isDeleted = 0
                   AND attributes.type = 'relation'
                   AND attributes.name = 'template'
-                  AND (attributes.noteId = ? OR attributes.isInheritable = 1)
+                  AND (treeWithAttrs.level = 0 OR attributes.isInheritable = 1)
                 )
             SELECT attributes.* FROM attributes JOIN treeWithAttrs ON attributes.noteId = treeWithAttrs.noteId
-            WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR attributes.noteId = ?)
-            ORDER BY level, noteId, position`, [this.noteId, this.noteId, this.noteId]);
+            WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR treeWithAttrs.level = 0)
+            ORDER BY level, noteId, position`, [this.noteId]);
         // attributes are ordered so that "closest" attributes are first
         // we order by noteId so that attributes from same note stay together. Actual noteId ordering doesn't matter.
 
         const filteredAttributes = attributes.filter((attr, index) => {
+            // if this exact attribute already appears then don't include it (can happen via cloning)
+            if (attributes.findIndex(it => it.attributeId === attr.attributeId) !== index) {
+                return false;
+            }
+
             if (attr.isDefinition()) {
                 const firstDefinitionIndex = attributes.findIndex(el => el.type === attr.type && el.name === attr.name);
 
@@ -365,6 +455,15 @@ class Note extends Entity {
         return !!await this.getAttribute(type, name);
     }
 
+    /**
+     * @param {string} type - attribute type (label, relation, etc.)
+     * @param {string} name - attribute name
+     * @returns {Promise<boolean>} true if note has an attribute with given type and name (excluding inherited)
+     */
+    async hasOwnedAttribute(type, name) {
+        return !!await this.getOwnedAttribute(type, name);
+    }
+
     /**
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
@@ -379,7 +478,7 @@ class Note extends Entity {
     /**
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
-     * @returns {Promise<string>} attribute value of given type and name or null if no such attribute exists.
+     * @returns {Promise<string|null>} attribute value of given type and name or null if no such attribute exists.
      */
     async getAttributeValue(type, name) {
         const attr = await this.getAttribute(type, name);
@@ -387,6 +486,17 @@ class Note extends Entity {
         return attr ? attr.value : null;
     }
 
+    /**
+     * @param {string} type - attribute type (label, relation, etc.)
+     * @param {string} name - attribute name
+     * @returns {Promise<string|null>} attribute value of given type and name or null if no such attribute exists.
+     */
+    async getOwnedAttributeValue(type, name) {
+        const attr = await this.getOwnedAttribute(type, name);
+
+        return attr ? attr.value : null;
+    }
+
     /**
      * Based on enabled, attribute is either set or removed.
      *
@@ -406,7 +516,7 @@ class Note extends Entity {
     }
 
     /**
-     * Creates given attribute name-value pair if it doesn't exist.
+     * Update's given attribute's value or creates it if it doesn't exist
      *
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
@@ -414,10 +524,18 @@ class Note extends Entity {
      * @returns {Promise<void>}
      */
     async setAttribute(type, name, value) {
-        const attributes = await this.getOwnedAttributes();
-        let attr = attributes.find(attr => attr.type === type && (value === undefined || attr.value === value));
+        const attributes = await this.loadOwnedAttributesToCache();
+        let attr = attributes.find(attr => attr.type === type && attr.name === name);
 
-        if (!attr) {
+        if (attr) {
+            if (attr.value !== value) {
+                attr.value = value;
+                await attr.save();
+
+                this.invalidateAttributeCache();
+            }
+        }
+        else {
             attr = new Attribute({
                 noteId: this.noteId,
                 type: type,
@@ -440,10 +558,10 @@ class Note extends Entity {
      * @returns {Promise<void>}
      */
     async removeAttribute(type, name, value) {
-        const attributes = await this.getOwnedAttributes();
+        const attributes = await this.loadOwnedAttributesToCache();
 
         for (const attribute of attributes) {
-            if (attribute.type === type && (value === undefined || value === attribute.value)) {
+            if (attribute.type === type && attribute.name === name && (value === undefined || value === attribute.value)) {
                 attribute.isDeleted = true;
                 await attribute.save();
 
@@ -452,42 +570,104 @@ class Note extends Entity {
         }
     }
 
+    /**
+     * @return {Promise<Attribute>}
+     */
+    async addAttribute(type, name, value = "") {
+        const attr = new Attribute({
+            noteId: this.noteId,
+            type: type,
+            name: name,
+            value: value
+        });
+
+        await attr.save();
+
+        this.invalidateAttributeCache();
+
+        return attr;
+    }
+
+    async addLabel(name, value = "") {
+        return await this.addAttribute(LABEL, name, value);
+    }
+
+    async addRelation(name, targetNoteId) {
+        return await this.addAttribute(RELATION, name, targetNoteId);
+    }
+
     /**
      * @param {string} name - label name
      * @returns {Promise<boolean>} true if label exists (including inherited)
      */
     async hasLabel(name) { return await this.hasAttribute(LABEL, name); }
 
+    /**
+     * @param {string} name - label name
+     * @returns {Promise<boolean>} true if label exists (excluding inherited)
+     */
+    async hasOwnedLabel(name) { return await this.hasOwnedAttribute(LABEL, name); }
+
     /**
      * @param {string} name - relation name
      * @returns {Promise<boolean>} true if relation exists (including inherited)
      */
     async hasRelation(name) { return await this.hasAttribute(RELATION, name); }
 
+    /**
+     * @param {string} name - relation name
+     * @returns {Promise<boolean>} true if relation exists (excluding inherited)
+     */
+    async hasOwnedRelation(name) { return await this.hasOwnedAttribute(RELATION, name); }
+
     /**
      * @param {string} name - label name
-     * @returns {Promise<Attribute>} label if it exists, null otherwise
+     * @returns {Promise<Attribute|null>} label if it exists, null otherwise
      */
     async getLabel(name) { return await this.getAttribute(LABEL, name); }
 
+    /**
+     * @param {string} name - label name
+     * @returns {Promise<Attribute|null>} label if it exists, null otherwise
+     */
+    async getOwnedLabel(name) { return await this.getOwnedAttribute(LABEL, name); }
+
     /**
      * @param {string} name - relation name
-     * @returns {Promise<Attribute>} relation if it exists, null otherwise
+     * @returns {Promise<Attribute|null>} relation if it exists, null otherwise
      */
     async getRelation(name) { return await this.getAttribute(RELATION, name); }
 
+    /**
+     * @param {string} name - relation name
+     * @returns {Promise<Attribute|null>} relation if it exists, null otherwise
+     */
+    async getOwnedRelation(name) { return await this.getOwnedAttribute(RELATION, name); }
+
     /**
      * @param {string} name - label name
-     * @returns {Promise<string>} label value if label exists, null otherwise
+     * @returns {Promise<string|null>} label value if label exists, null otherwise
      */
     async getLabelValue(name) { return await this.getAttributeValue(LABEL, name); }
 
+    /**
+     * @param {string} name - label name
+     * @returns {Promise<string|null>} label value if label exists, null otherwise
+     */
+    async getOwnedLabelValue(name) { return await this.getOwnedAttributeValue(LABEL, name); }
+
     /**
      * @param {string} name - relation name
-     * @returns {Promise<string>} relation value if relation exists, null otherwise
+     * @returns {Promise<string|null>} relation value if relation exists, null otherwise
      */
     async getRelationValue(name) { return await this.getAttributeValue(RELATION, name); }
 
+    /**
+     * @param {string} name - relation name
+     * @returns {Promise<string|null>} relation value if relation exists, null otherwise
+     */
+    async getOwnedRelationValue(name) { return await this.getOwnedAttributeValue(RELATION, name); }
+
     /**
      * @param {string} name
      * @returns {Promise<Note>|null} target note of the relation or null (if target is empty or note was not found)
@@ -498,6 +678,16 @@ class Note extends Entity {
         return relation ? await repository.getNote(relation.value) : null;
     }
 
+    /**
+     * @param {string} name
+     * @returns {Promise<Note>|null} target note of the relation or null (if target is empty or note was not found)
+     */
+    async getOwnedRelationTarget(name) {
+        const relation = await this.getOwnedRelation(name);
+
+        return relation ? await repository.getNote(relation.value) : null;
+    }
+
     /**
      * Based on enabled, label is either set or removed.
      *
@@ -519,7 +709,7 @@ class Note extends Entity {
     async toggleRelation(enabled, name, value) { return await this.toggleAttribute(RELATION, enabled, name, value); }
 
     /**
-     * Create label name-value pair if it doesn't exist yet.
+     * Update's given label's value or creates it if it doesn't exist
      *
      * @param {string} name - label name
      * @param {string} [value] - label value
@@ -528,7 +718,7 @@ class Note extends Entity {
     async setLabel(name, value) { return await this.setAttribute(LABEL, name, value); }
 
     /**
-     * Create relation name-value pair if it doesn't exist yet.
+     * Update's given relation's value or creates it if it doesn't exist
      *
      * @param {string} name - relation name
      * @param {string} [value] - relation value (noteId)
@@ -641,28 +831,17 @@ class Note extends Entity {
     /**
      * Get list of links coming out of this note.
      *
-     * @returns {Promise<Link[]>}
+     * @deprecated - not intended for general use
+     * @returns {Promise<Attribute[]>}
      */
     async getLinks() {
-        return await repository.getEntities("SELECT * FROM links WHERE noteId = ? AND isDeleted = 0", [this.noteId]);
-    }
-
-    /**
-     * Get list of links targetting this note.
-     *
-     * @returns {Promise<Link[]>}
-     */
-    async getTargetLinks() {
-        return await repository.getEntities("SELECT * FROM links WHERE targetNoteId = ? AND isDeleted = 0", [this.noteId]);
-    }
-
-    /**
-     * Return all links from this note, including deleted ones.
-     *
-     * @returns {Promise<Link[]>}
-     */
-    async getLinksWithDeleted() {
-        return await repository.getEntities("SELECT * FROM links WHERE noteId = ?", [this.noteId]);
+        return await repository.getEntities(`
+            SELECT * 
+            FROM attributes 
+            WHERE noteId = ? AND 
+                  isDeleted = 0 AND
+                  type = 'relation' AND
+                  name IN ('internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink')`, [this.noteId]);
     }
 
     /**
@@ -719,6 +898,36 @@ class Note extends Entity {
                 AND parent_notes.isDeleted = 0`, [this.noteId]);
     }
 
+    /**
+     * @return {Promise<string[][]>} - array of notePaths (each represented by array of noteIds constituting the particular note path)
+     */
+    async getAllNotePaths() {
+        if (this.noteId === 'root') {
+            return [['root']];
+        }
+
+        const notePaths = [];
+
+        for (const parentNote of await this.getParentNotes()) {
+            for (const parentPath of await parentNote.getAllNotePaths()) {
+                parentPath.push(this.noteId);
+                notePaths.push(parentPath);
+            }
+        }
+
+        return notePaths;
+    }
+
+    /**
+     * @param ancestorNoteId
+     * @return {Promise<boolean>} - true if ancestorNoteId occurs in at least one of the note's paths
+     */
+    async isDescendantOfNote(ancestorNoteId) {
+        const notePaths = await this.getAllNotePaths();
+
+        return notePaths.some(path => path.includes(ancestorNoteId));
+    }
+
     beforeSaving() {
         if (!this.isDeleted) {
             this.isDeleted = false;
@@ -732,6 +941,10 @@ class Note extends Entity {
             this.utcDateCreated = dateUtils.utcNowDateTime();
         }
 
+        if (this.contentLength === undefined) {
+            this.contentLength = -1;
+        }
+
         super.beforeSaving();
 
         if (this.isChanged) {
@@ -744,7 +957,7 @@ class Note extends Entity {
     updatePojo(pojo) {
         if (pojo.isProtected) {
             if (this.isContentAvailable) {
-                protectedSessionService.encryptNote(pojo);
+                pojo.title = protectedSessionService.encrypt(pojo.title);
             }
             else {
                 // updating protected note outside of protected session means we will keep original ciphertexts
@@ -754,7 +967,9 @@ class Note extends Entity {
 
         delete pojo.isContentAvailable;
         delete pojo.__attributeCache;
+        delete pojo.__ownedAttributeCache;
         delete pojo.content;
+        /** zero references to contentHash, probably can be removed */
         delete pojo.contentHash;
     }
 }
@@ -769,13 +984,13 @@ module.exports = Note;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_note_revision.js.html

@@ -31,28 +31,34 @@
 const Entity = require('./entity');
 const protectedSessionService = require('../services/protected_session');
 const repository = require('../services/repository');
+const utils = require('../services/utils');
+const sql = require('../services/sql');
+const dateUtils = require('../services/date_utils');
+const syncTableService = require('../services/sync_table');
 
 /**
  * NoteRevision represents snapshot of note's title and content at some point in the past. It's used for seamless note versioning.
  *
- * @param {string} noteRevisionId
- * @param {string} noteId
- * @param {string} type
- * @param {string} mime
- * @param {string} title
- * @param {string} content
- * @param {string} isProtected
- * @param {string} dateModifiedFrom
- * @param {string} dateModifiedTo
- * @param {string} utcDateModifiedFrom
- * @param {string} utcDateModifiedTo
+ * @property {string} noteRevisionId
+ * @property {string} noteId
+ * @property {string} type
+ * @property {string} mime
+ * @property {string} title
+ * @property {int} contentLength
+ * @property {boolean} isErased
+ * @property {boolean} isProtected
+ * @property {string} dateLastEdited
+ * @property {string} dateCreated
+ * @property {string} utcDateLastEdited
+ * @property {string} utcDateCreated
+ * @property {string} utcDateModified
  *
  * @extends Entity
  */
 class NoteRevision extends Entity {
     static get entityName() { return "note_revisions"; }
     static get primaryKeyName() { return "noteRevisionId"; }
-    static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "content", "isProtected", "dateModifiedFrom", "dateModifiedTo", "utcDateModifiedFrom", "utcDateModifiedTo"]; }
+    static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "contentLength", "isErased", "isProtected", "dateLastEdited", "dateCreated", "utcDateLastEdited", "utcDateCreated", "utcDateModified"]; }
 
     constructor(row) {
         super(row);
@@ -60,20 +66,120 @@ class NoteRevision extends Entity {
         this.isProtected = !!this.isProtected;
 
         if (this.isProtected) {
-            protectedSessionService.decryptNoteRevision(this);
+            if (protectedSessionService.isProtectedSessionAvailable()) {
+                this.title = protectedSessionService.decryptString(this.title);
+            }
+            else {
+                this.title = "[Protected]";
+            }
         }
     }
 
     async getNote() {
-        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+        return await repository.getNote(this.noteId);
+    }
+
+    /** @returns {boolean} true if the note has string content (not binary) */
+    isStringNote() {
+        return utils.isStringNote(this.type, this.mime);
+    }
+
+    /*
+     * Note revision content has quite special handling - it's not a separate entity, but a lazily loaded
+     * part of NoteRevision entity with it's own sync. Reason behind this hybrid design is that
+     * content can be quite large and it's not necessary to load it / fill memory for any note access even
+     * if we don't need a content, especially for bulk operations like search.
+     *
+     * This is the same approach as is used for Note's content.
+     */
+
+    /** @returns {Promise<*>} */
+    async getContent(silentNotFoundError = false) {
+        if (this.content === undefined) {
+            const res = await sql.getRow(`SELECT content, hash FROM note_revision_contents WHERE noteRevisionId = ?`, [this.noteRevisionId]);
+
+            if (!res) {
+                if (silentNotFoundError) {
+                    return undefined;
+                }
+                else {
+                    throw new Error("Cannot find note revision content for noteRevisionId=" + this.noteRevisionId);
+                }
+            }
+
+            this.content = res.content;
+
+            if (this.isProtected) {
+                if (protectedSessionService.isProtectedSessionAvailable()) {
+                    this.content = protectedSessionService.decrypt(this.content);
+                }
+                else {
+                    this.content = "";
+                }
+            }
+        }
+
+        if (this.isStringNote()) {
+            return this.content === null
+                ? ""
+                : this.content.toString("UTF-8");
+        }
+        else {
+            return this.content;
+        }
+    }
+
+    /** @returns {Promise} */
+    async setContent(content) {
+        // force updating note itself so that utcDateModified is represented correctly even for the content
+        this.forcedChange = true;
+        this.contentLength = content === null ? 0 : content.length;
+        await this.save();
+
+        this.content = content;
+
+        const pojo = {
+            noteRevisionId: this.noteRevisionId,
+            content: content,
+            utcDateModified: dateUtils.utcNowDateTime(),
+            hash: utils.hash(this.noteRevisionId + "|" + content)
+        };
+
+        if (this.isProtected) {
+            if (protectedSessionService.isProtectedSessionAvailable()) {
+                pojo.content = protectedSessionService.encrypt(pojo.content);
+            }
+            else {
+                throw new Error(`Cannot update content of noteRevisionId=${this.noteRevisionId} since we're out of protected session.`);
+            }
+        }
+
+        await sql.upsert("note_revision_contents", "noteRevisionId", pojo);
+
+        await syncTableService.addNoteRevisionContentSync(this.noteRevisionId);
     }
 
     beforeSaving() {
-        if (this.isProtected) {
-            protectedSessionService.encryptNoteRevision(this);
+        super.beforeSaving();
+
+        if (this.isChanged) {
+            this.utcDateModified = dateUtils.utcNowDateTime();
+        }
+    }
+
+    // cannot be static!
+    updatePojo(pojo) {
+        if (pojo.isProtected) {
+            if (protectedSessionService.isProtectedSessionAvailable()) {
+                pojo.title = protectedSessionService.encrypt(pojo.title);
+            }
+            else {
+                // updating protected note outside of protected session means we will keep original ciphertexts
+                delete pojo.title;
+            }
         }
 
-        super.beforeSaving();
+        delete pojo.content;
     }
 }
 
@@ -87,13 +193,13 @@ module.exports = NoteRevision;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_option.js.html

@@ -34,11 +34,11 @@ const dateUtils = require('../services/date_utils');
 /**
  * Option represents name-value pair, either directly configurable by the user or some system property.
  *
- * @param {string} name
- * @param {string} value
- * @param {boolean} isSynced
- * @param {string} utcDateModified
- * @param {string} utcDateCreated
+ * @property {string} name
+ * @property {string} value
+ * @property {boolean} isSynced
+ * @property {string} utcDateModified
+ * @property {string} utcDateCreated
  *
  * @extends Entity
  */
@@ -76,13 +76,13 @@ module.exports = Option;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_recent_note.js.html

@@ -34,10 +34,10 @@ const dateUtils = require('../services/date_utils');
 /**
  * RecentNote represents recently visited note.
  *
- * @param {string} noteId
- * @param {string} notePath
- * @param {boolean} isDeleted
- * @param {string} utcDateModified
+ * @property {string} noteId
+ * @property {string} notePath
+ * @property {boolean} isDeleted
+ * @property {string} utcDateModified
  *
  * @extends Entity
  */
@@ -69,13 +69,13 @@ module.exports = RecentNote;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/global.html

@@ -102,6 +102,313 @@
 
         
                 
+<h4 class="name" id="CreateNewNoteParams">CreateNewNoteParams</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 class="last">Description</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    
+
+        <tr>
+            
+                <td class="name"><code>parentNoteId</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">MANDATORY</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>title</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">MANDATORY</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>content</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+|
+
+<span class="param-type">buffer</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">MANDATORY</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>type</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">text, code, file, image, search, book, relation-map - MANDATORY</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>mime</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">value is derived from default mimes for type</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>isProtected</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">boolean</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">default is false</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>isExpanded</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">boolean</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">default is false</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>prefix</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">default is empty string</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>notePosition</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">int</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">default is last existing notePosition in a parent + 10</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#line212">line 212</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+            
+                
 <h4 class="name" id="CreateNoteAttribute">CreateNoteAttribute</h4>
 
 
@@ -290,6 +597,194 @@
 
             
                 
+<h4 class="name" id="CreateNoteAttribute">CreateNoteAttribute</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 class="last">Description</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    
+
+        <tr>
+            
+                <td class="name"><code>type</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+
+                
+                </td>
+            
+
+            
+
+            <td class="description last">attribute type - label, relation etc.</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>name</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+
+                
+                </td>
+            
+
+            
+
+            <td class="description last">attribute name</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>value</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+                </td>
+            
+
+            
+
+            <td class="description last">attribute value</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#line233">line 233</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+            
+                
 <h4 class="name" id="CreateNoteExtraOptions">CreateNoteExtraOptions</h4>
 
 
@@ -558,7 +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#line180">line 180</a>
+        <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>
     
 
@@ -588,13 +1083,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/index.html

@@ -50,13 +50,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/scripts/linenumber.js

@@ -1,12 +1,12 @@
 /*global document */
-(function() {
-    var source = document.getElementsByClassName('prettyprint source linenums');
-    var i = 0;
-    var lineNumber = 0;
-    var lineId;
-    var lines;
-    var totalLines;
-    var anchorHash;
+(() => {
+    const source = document.getElementsByClassName('prettyprint source linenums');
+    let i = 0;
+    let lineNumber = 0;
+    let lineId;
+    let lines;
+    let totalLines;
+    let anchorHash;
 
     if (source && source[0]) {
         anchorHash = document.location.hash.substring(1);
@@ -15,7 +15,7 @@
 
         for (; i < totalLines; i++) {
             lineNumber++;
-            lineId = 'line' + lineNumber;
+            lineId = `line${lineNumber}`;
             lines[i].id = lineId;
             if (lineId === anchorHash) {
                 lines[i].className += ' selected';

docs/backend_api/services_backend_script_api.js.html

@@ -38,7 +38,7 @@ const repository = require('./repository');
 const axios = require('axios');
 const dayjs = require('dayjs');
 const cloningService = require('./cloning');
-const messagingService = require('./messaging');
+const ws = require('./ws.js');
 const appInfo = require('./app_info');
 const searchService = require('./search');
 
@@ -198,6 +198,66 @@ function BackendScriptApi(currentNote, apiParams) {
      */
     this.toggleNoteInParent = cloningService.toggleNoteInParent;
 
+    /**
+     * @typedef {object} CreateNoteAttribute
+     * @property {string} type - attribute type - label, relation etc.
+     * @property {string} name - attribute name
+     * @property {string} [value] - attribute value
+     */
+
+    /**
+     * Create text note. See also createNewNote() for more options.
+     *
+     * @param {string} parentNoteId
+     * @param {string} title
+     * @param {string} content
+     * @return {Promise<{note: Note, branch: Branch}>}
+     */
+    this.createTextNote = async (parentNoteId, title, content = '') => await noteService.createNewNote({
+        parentNoteId,
+        title,
+        content,
+        type: 'text'
+    });
+
+    /**
+     * Create data note - data in this context means object serializable to JSON. Created note will be of type 'code' and
+     * JSON MIME type. See also createNewNote() for more options.
+     *
+     * @param {string} parentNoteId
+     * @param {string} title
+     * @param {object} content
+     * @return {Promise<{note: Note, branch: Branch}>}
+     */
+    this.createDataNote = async (parentNoteId, title, content = {}) => await noteService.createNewNote({
+        parentNoteId,
+        title,
+        content: JSON.stringify(content, null, '\t'),
+        type: 'code',
+        mime: 'application/json'
+    });
+
+    /**
+     * @typedef {object} CreateNewNoteParams
+     * @property {string} parentNoteId - MANDATORY
+     * @property {string} title - MANDATORY
+     * @property {string|buffer} content - MANDATORY
+     * @property {string} type - text, code, file, image, search, book, relation-map - MANDATORY
+     * @property {string} mime - value is derived from default mimes for type
+     * @property {boolean} isProtected - default is false
+     * @property {boolean} isExpanded - default is false
+     * @property {string} prefix - default is empty string
+     * @property {int} notePosition - default is last existing notePosition in a parent + 10
+     */
+
+    /**
+     * @method
+     *
+     * @param {CreateNewNoteParams} [params]
+     * @returns {Promise<{note: Note, branch: Branch}>} object contains newly created entities note and branch
+     */
+    this.createNewNote = noteService.createNewNote;
+
     /**
      * @typedef {object} CreateNoteAttribute
      * @property {string} type - attribute type - label, relation etc.
@@ -216,6 +276,7 @@ function BackendScriptApi(currentNote, apiParams) {
 
     /**
      * @method
+     * @deprecated please use createNote() API method instead
      *
      * @param {string} parentNoteId - create new note under this parent
      * @param {string} title
@@ -223,23 +284,38 @@ function BackendScriptApi(currentNote, apiParams) {
      * @param {CreateNoteExtraOptions} [extraOptions={}]
      * @returns {Promise<{note: Note, branch: Branch}>} object contains newly created entities note and branch
      */
-    this.createNote = noteService.createNote;
+    this.createNote = async (parentNoteId, title, content = "", extraOptions= {}) => {
+        extraOptions.parentNoteId = parentNoteId;
+        extraOptions.title = title;
 
-    /**
-     * Creates new note according to given params and force all connected clients to refresh their tree.
-     *
-     * @method
-     *
-     * @param {string} parentNoteId - create new note under this parent
-     * @param {string} title
-     * @param {string} [content=""]
-     * @param {CreateNoteExtraOptions} [extraOptions={}]
-     * @returns {Promise<{note: Note, branch: Branch}>} object contains newly created entities note and branch
-     */
-    this.createNoteAndRefresh = async function(parentNoteId, title, content, extraOptions) {
-        await noteService.createNote(parentNoteId, title, content, extraOptions);
+        const parentNote = await repository.getNote(parentNoteId);
 
-        messagingService.refreshTree();
+        // code note type can be inherited, otherwise text is default
+        extraOptions.type = parentNote.type === 'code' ? 'code' : 'text';
+        extraOptions.mime = parentNote.type === 'code' ? parentNote.mime : 'text/html';
+
+        if (extraOptions.json) {
+            extraOptions.content = JSON.stringify(content || {}, null, '\t');
+            extraOptions.type = 'code';
+            extraOptions.mime = 'application/json';
+        }
+        else {
+            extraOptions.content = content;
+        }
+
+        const {note, branch} = await noteService.createNewNote(extraOptions);
+
+        for (const attr of extraOptions.attributes || []) {
+            await attributeService.createAttribute({
+                noteId: note.noteId,
+                type: attr.type,
+                name: attr.name,
+                value: attr.value,
+                isInheritable: !!attr.isInheritable
+            });
+        }
+
+        return {note, branch};
     };
 
     /**
@@ -266,6 +342,14 @@ function BackendScriptApi(currentNote, apiParams) {
      */
     this.getDateNote = dateNoteService.getDateNote;
 
+    /**
+     * Returns today's day note. If such note doesn't exist, it is created.
+     *
+     * @method
+     * @returns {Promise<Note|null>}
+     */
+    this.getTodayNote = dateNoteService.getTodayNote;
+
     /**
      * Returns note for the first date of the week of the given date.
      *
@@ -308,9 +392,10 @@ function BackendScriptApi(currentNote, apiParams) {
      * This method looks similar to toggleNoteInParent() but differs because we're looking up branch by prefix.
      *
      * @method
+     * @deprecated - this method is pretty confusing and serves specialized purpose only
      * @param {string} noteId
      * @param {string} prefix
-     * @param {string} [parentNoteId]
+     * @param {string|null} parentNoteId
      */
     this.setNoteToParent = treeService.setNoteToParent;
 
@@ -330,12 +415,10 @@ function BackendScriptApi(currentNote, apiParams) {
     this.sql = sql;
 
     /**
-     * Trigger tree refresh in all connected clients. This is required when some tree change happens in
-     * the backend.
-     *
-     * @returns {Promise<void>}
+     * @method
+     * @deprecated - this is now no-op since all the changes should be gracefully handled per widget
      */
-    this.refreshTree = messagingService.refreshTree;
+    this.refreshTree = () => {};
 
     /**
      * @return {{syncVersion, appVersion, buildRevision, dbVersion, dataDirectory, buildDate}|*} - object representing basic info about running Trilium version
@@ -343,7 +426,8 @@ function BackendScriptApi(currentNote, apiParams) {
     this.getAppInfo = () => appInfo
 }
 
-module.exports = BackendScriptApi;</code></pre>
+module.exports = BackendScriptApi;
+</code></pre>
         </article>
     </section>
 
@@ -353,13 +437,13 @@ module.exports = BackendScriptApi;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/styles/jsdoc-default.css

@@ -273,7 +273,7 @@ tr > th:last-child { border-right: 1px solid #ddd; }
     margin: 0;
 }
 
-.prettyprint
+.source
 {
     border: 1px solid #ddd;
     width: 80%;
@@ -284,7 +284,7 @@ tr > th:last-child { border-right: 1px solid #ddd; }
     width: inherit;
 }
 
-.prettyprint code
+.source code
 {
     font-size: 100%;
     line-height: 18px;

docs/frontend_api/Branch.html

@@ -93,7 +93,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line2">line 2</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line3">line 3</a>
     </li></ul></dd>
     
 
@@ -121,6 +121,8 @@
 
 
 
+
+
     
     </div>
 
@@ -181,7 +183,65 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line6">line 6</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line11">line 11</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="isDeleted"><span class="type-signature"></span>isDeleted<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line23">line 23</a>
     </li></ul></dd>
     
 
@@ -239,7 +299,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line17">line 17</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line21">line 21</a>
     </li></ul></dd>
     
 
@@ -297,7 +357,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line8">line 8</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line13">line 13</a>
     </li></ul></dd>
     
 
@@ -355,7 +415,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line13">line 13</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line17">line 17</a>
     </li></ul></dd>
     
 
@@ -413,7 +473,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line11">line 11</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line15">line 15</a>
     </li></ul></dd>
     
 
@@ -471,7 +531,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line15">line 15</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line19">line 19</a>
     </li></ul></dd>
     
 
@@ -547,7 +607,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line21">line 21</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line27">line 27</a>
     </li></ul></dd>
     
 
@@ -570,6 +630,110 @@
 
 
 
+
+
+<h5>Returns:</h5>
+
+        
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type"><a href="NoteShort.html">NoteShort</a></span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="getParentNote"><span class="type-signature">(async) </span>getParentNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="NoteShort.html">NoteShort</a>}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line32">line 32</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 <h5>Returns:</h5>
 
         
@@ -647,7 +811,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line26">line 26</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line37">line 37</a>
     </li></ul></dd>
     
 
@@ -670,6 +834,8 @@
 
 
 
+
+
 <h5>Returns:</h5>
 
         
@@ -713,13 +879,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><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></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/KeyboardActions.html

@@ -0,0 +1,280 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Class: KeyboardActions</title>
+
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+
+    <h1 class="page-title">Class: KeyboardActions</h1>
+
+    
+
+
+
+
+<section>
+
+<header>
+    
+        <h2><span class="attribs"><span class="type-signature"></span></span>KeyboardActions<span class="signature">()</span><span class="type-signature"></span></h2>
+        
+            <div class="class-description">blaa vlaa</div>
+        
+    
+</header>
+
+<article>
+    <div class="container-overview">
+    
+        
+
+    
+    <h2>Constructor</h2>
+    
+
+    
+    <h4 class="name" id="KeyboardActions"><span class="type-signature"></span>new KeyboardActions<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="services_keyboard_actions.js.html">services/keyboard_action.js</a>, <a href="services_keyboard_actions.js.html#line5">line 5</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
+    </div>
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+        <h3 class="subsection-title">Members</h3>
+
+        
+            
+<h4 class="name" id="JUMP_TO"><span class="type-signature"></span>JUMP_TO<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
+    
+
+<table class="props">
+    <thead>
+    <tr>
+        
+
+        <th>Type</th>
+
+        
+
+        
+
+        <th class="last">Description</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    
+
+        <tr>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </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_keyboard_actions.js.html">services/keyboard_action.js</a>, <a href="services_keyboard_actions.js.html#line7">line 7</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+    
+
+    
+
+    
+
+    
+</article>
+
+</section>
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="KeyboardActions.html">KeyboardActions</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>

docs/frontend_api/NoteComplement.html

@@ -0,0 +1,522 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Class: NoteComplement</title>
+
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+
+    <h1 class="page-title">Class: NoteComplement</h1>
+
+    
+
+
+
+
+<section>
+
+<header>
+    
+        <h2><span class="attribs"><span class="type-signature"></span></span>NoteComplement<span class="signature">()</span><span class="type-signature"></span></h2>
+        
+            <div class="class-description">Complements the NoteShort with the main note content and other extra attributes</div>
+        
+    
+</header>
+
+<article>
+    <div class="container-overview">
+    
+        
+
+    
+    <h2>Constructor</h2>
+    
+
+    
+    <h4 class="name" id="NoteComplement"><span class="type-signature"></span>new NoteComplement<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line5">line 5</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
+    </div>
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+        <h3 class="subsection-title">Members</h3>
+
+        
+            
+<h4 class="name" id="content"><span class="type-signature"></span>content<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line10">line 10</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="dateCreated"><span class="type-signature"></span>dateCreated<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line13">line 13</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="dateModified"><span class="type-signature"></span>dateModified<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line16">line 16</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="noteId"><span class="type-signature"></span>noteId<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line7">line 7</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="utcDateCreated"><span class="type-signature"></span>utcDateCreated<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line19">line 19</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="utcDateModified"><span class="type-signature"></span>utcDateModified<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line22">line 22</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+    
+
+    
+
+    
+
+    
+</article>
+
+</section>
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><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></ul><h3><a href="global.html">Global</a></h3>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>

docs/frontend_api/NoteFull.html

@@ -93,7 +93,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_full.js.html">entities/note_full.js</a>, <a href="entities_note_full.js.html#line6">line 6</a>
+        <a href="entities_note_full.js.html">entities/note_full.js</a>, <a href="entities_note_full.js.html#line7">line 7</a>
     </li></ul></dd>
     
 
@@ -121,6 +121,8 @@
 
 
 
+
+
     
     </div>
 
@@ -453,7 +455,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_attribute.js.html

@@ -29,6 +29,11 @@
             <pre class="prettyprint source linenums"><code>class Attribute {
     constructor(treeCache, row) {
         this.treeCache = treeCache;
+
+        this.update(row);
+    }
+
+    update(row) {
         /** @param {string} attributeId */
         this.attributeId = row.attributeId;
         /** @param {string} noteId */
@@ -43,12 +48,6 @@
         this.position = row.position;
         /** @param {boolean} isInheritable */
         this.isInheritable = row.isInheritable;
-        /** @param {boolean} isDeleted */
-        this.isDeleted = row.isDeleted;
-        /** @param {string} utcDateCreated */
-        this.utcDateCreated = row.utcDateCreated;
-        /** @param {string} utcDateModified */
-        this.utcDateModified = row.utcDateModified;
     }
 
     /** @returns {NoteShort} */
@@ -56,8 +55,17 @@
         return await this.treeCache.getNote(this.noteId);
     }
 
+    get jsonValue() {
+        try {
+            return JSON.parse(this.value);
+        }
+        catch (e) {
+            return null;
+        }
+    }
+
     get toString() {
-        return `Attribute(attributeId=${this.attributeId}, type=${this.type}, name=${this.name})`;
+        return `Attribute(attributeId=${this.attributeId}, type=${this.type}, name=${this.name}, value=${this.value})`;
     }
 }
 
@@ -71,13 +79,13 @@ export default Attribute;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><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></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_branch.js.html

@@ -30,11 +30,15 @@
 class Branch {
     constructor(treeCache, row) {
         this.treeCache = treeCache;
+
+        this.update(row);
+    }
+
+    update(row) {
         /** @param {string} primary key */
         this.branchId = row.branchId;
         /** @param {string} */
         this.noteId = row.noteId;
-        this.note = null;
         /** @param {string} */
         this.parentNoteId = row.parentNoteId;
         /** @param {int} */
@@ -43,11 +47,18 @@ class Branch {
         this.prefix = row.prefix;
         /** @param {boolean} */
         this.isExpanded = !!row.isExpanded;
+        /** @param {boolean} */
+        this.isDeleted = !!row.isDeleted;
     }
 
     /** @returns {NoteShort} */
     async getNote() {
-        return await this.treeCache.getNote(this.noteId);
+        return this.treeCache.getNote(this.noteId);
+    }
+
+    /** @returns {NoteShort} */
+    async getParentNote() {
+        return this.treeCache.getNote(this.parentNoteId);
     }
 
     /** @returns {boolean} true if it's top level, meaning its parent is root note */
@@ -70,13 +81,13 @@ export default Branch;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><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></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_note_complement.js.html

@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Source: entities/note_complement.js</title>
+
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+
+    <h1 class="page-title">Source: entities/note_complement.js</h1>
+
+    
+
+
+
+    
+    <section>
+        <article>
+            <pre class="prettyprint source linenums"><code>/**
+ * Complements the NoteShort with the main note content and other extra attributes
+ */
+class NoteComplement {
+    constructor(row) {
+        /** @param {string} */
+        this.noteId = row.noteId;
+
+        /** @param {string} */
+        this.content = row.content;
+
+        /** @param {string} */
+        this.dateCreated = row.dateCreated;
+
+        /** @param {string} */
+        this.dateModified = row.dateModified;
+
+        /** @param {string} */
+        this.utcDateCreated = row.utcDateCreated;
+
+        /** @param {string} */
+        this.utcDateModified = row.utcDateModified;
+    }
+}
+
+export default NoteComplement;</code></pre>
+        </article>
+    </section>
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><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></ul><h3><a href="global.html">Global</a></h3>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>

docs/frontend_api/entities_note_full.js.html

@@ -32,8 +32,8 @@
  * Represents full note, specifically including note's content.
  */
 class NoteFull extends NoteShort {
-    constructor(treeCache, row) {
-        super(treeCache, row);
+    constructor(treeCache, row, noteShort) {
+        super(treeCache, row, []);
 
         /** @param {string} */
         this.content = row.content;
@@ -49,6 +49,12 @@ class NoteFull extends NoteShort {
 
         /** @param {string} */
         this.utcDateModified = row.utcDateModified;
+
+        /* ugly */
+        this.parents = noteShort.parents;
+        this.parentToBranch = noteShort.parentToBranch;
+        this.children = noteShort.children;
+        this.childToBranch = noteShort.childToBranch;
     }
 }
 
@@ -68,7 +74,7 @@ export default NoteFull;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_note_short.js.html

@@ -27,6 +27,7 @@
     <section>
         <article>
             <pre class="prettyprint source linenums"><code>import server from '../services/server.js';
+import Attribute from './attribute.js';
 
 const LABEL = 'label';
 const LABEL_DEFINITION = 'label-definition';
@@ -35,24 +36,74 @@ const RELATION_DEFINITION = 'relation-definition';
 
 /**
  * This note's representation is used in note tree and is kept in TreeCache.
- * Its notable omission is the note content.
  */
 class NoteShort {
+    /**
+     * @param {TreeCache} treeCache
+     * @param {Object.&lt;string, Object>} row
+     */
     constructor(treeCache, row) {
         this.treeCache = treeCache;
+
+        /** @type {string[]} */
+        this.attributes = [];
+
+        /** @type {string[]} */
+        this.targetRelations = [];
+
+        /** @type {string[]} */
+        this.parents = [];
+        /** @type {string[]} */
+        this.children = [];
+
+        /** @type {Object.&lt;string, string>} */
+        this.parentToBranch = {};
+
+        /** @type {Object.&lt;string, string>} */
+        this.childToBranch = {};
+
+        this.update(row);
+    }
+
+    update(row) {
         /** @param {string} */
         this.noteId = row.noteId;
         /** @param {string} */
         this.title = row.title;
+        /** @param {int} */
+        this.contentLength = row.contentLength;
         /** @param {boolean} */
-        this.isProtected = row.isProtected;
+        this.isProtected = !!row.isProtected;
         /** @param {string} one of 'text', 'code', 'file' or 'render' */
         this.type = row.type;
         /** @param {string} content-type, e.g. "application/json" */
         this.mime = row.mime;
         /** @param {boolean} */
-        this.archived = row.archived;
-        this.cssClass = row.cssClass;
+        this.isDeleted = row.isDeleted;
+    }
+
+    addParent(parentNoteId, branchId) {
+        if (!this.parents.includes(parentNoteId)) {
+            this.parents.push(parentNoteId);
+        }
+
+        this.parentToBranch[parentNoteId] = branchId;
+    }
+
+    addChild(childNoteId, branchId) {
+        if (!this.children.includes(childNoteId)) {
+            this.children.push(childNoteId);
+        }
+
+        this.childToBranch[childNoteId] = branchId;
+
+        const branchIdPos = {};
+
+        for (const branchId of Object.values(this.childToBranch)) {
+            branchIdPos[branchId] = this.treeCache.getBranch(branchId).notePosition;
+        }
+
+        this.children.sort((a, b) => branchIdPos[this.childToBranch[a]] &lt; branchIdPos[this.childToBranch[b]] ? -1 : 1);
     }
 
     /** @returns {boolean} */
@@ -60,176 +111,341 @@ class NoteShort {
         return this.mime === "application/json";
     }
 
-    /** @returns {Promise&lt;Branch[]>} */
-    async getBranches() {
-        const branchIds = this.treeCache.parents[this.noteId].map(
-            parentNoteId => this.treeCache.getBranchIdByChildParent(this.noteId, parentNoteId));
+    async getContent() {
+        // we're not caching content since these objects are in treeCache and as such pretty long lived
+        const note = await server.get("notes/" + this.noteId);
+
+        return note.content;
+    }
+
+    async getJsonContent() {
+        const content = await this.getContent();
+
+        try {
+            return JSON.parse(content);
+        }
+        catch (e) {
+            console.log(`Cannot parse content of note ${this.noteId}: `, e.message);
+
+            return null;
+        }
+    }
+
+    /** @returns {string[]} */
+    getBranchIds() {
+        return Object.values(this.parentToBranch);
+    }
+
+    /** @returns {Branch[]} */
+    getBranches() {
+        const branchIds = Object.values(this.parentToBranch);
 
         return this.treeCache.getBranches(branchIds);
     }
 
     /** @returns {boolean} */
     hasChildren() {
-        return this.treeCache.children[this.noteId]
-            &amp;&amp; this.treeCache.children[this.noteId].length > 0;
+        return this.children.length > 0;
     }
 
-    /** @returns {Promise&lt;Branch[]>} */
-    async getChildBranches() {
-        if (!this.treeCache.children[this.noteId]) {
-            return [];
-        }
+    /** @returns {Branch[]} */
+    getChildBranches() {
+        // don't use Object.values() to guarantee order
+        const branchIds = this.children.map(childNoteId => this.childToBranch[childNoteId]);
 
-        const branchIds = this.treeCache.children[this.noteId].map(
-            childNoteId => this.treeCache.getBranchIdByChildParent(childNoteId, this.noteId));
-
-        return await this.treeCache.getBranches(branchIds);
+        return this.treeCache.getBranches(branchIds);
     }
 
     /** @returns {string[]} */
     getParentNoteIds() {
-        return this.treeCache.parents[this.noteId] || [];
+        return this.parents;
     }
 
-    /** @returns {Promise&lt;NoteShort[]>} */
-    async getParentNotes() {
-        return await this.treeCache.getNotes(this.getParentNoteIds());
+    /** @returns {NoteShort[]} */
+    getParentNotes() {
+        return this.treeCache.getNotesFromCache(this.parents);
     }
 
     /** @returns {string[]} */
     getChildNoteIds() {
-        return this.treeCache.children[this.noteId] || [];
+        return this.children;
     }
 
     /** @returns {Promise&lt;NoteShort[]>} */
     async getChildNotes() {
-        return await this.treeCache.getNotes(this.getChildNoteIds());
+        return await this.treeCache.getNotes(this.children);
     }
 
     /**
-     * @param {string} [name] - attribute name to filter
-     * @returns {Promise&lt;Attribute[]>}
+     * @param {string} [type] - (optional) attribute type to filter
+     * @param {string} [name] - (optional) attribute name to filter
+     * @returns {Attribute[]} all note's attributes, including inherited ones
      */
-    async getAttributes(name) {
-        if (!this.attributeCache) {
-            this.attributeCache = await server.get('notes/' + this.noteId + '/attributes');
+    getOwnedAttributes(type, name) {
+        const attrs = this.attributes
+            .map(attributeId => this.treeCache.attributes[attributeId])
+            .filter(attr => !!attr);
+
+        return this.__filterAttrs(attrs, type, name)
+    }
+
+    /**
+     * @param {string} [type] - (optional) attribute type to filter
+     * @param {string} [name] - (optional) attribute name to filter
+     * @returns {Attribute[]} all note's attributes, including inherited ones
+     */
+    getAttributes(type, name) {
+        const ownedAttributes = this.getOwnedAttributes();
+
+        const attrArrs = [
+            ownedAttributes
+        ];
+
+        for (const templateAttr of ownedAttributes.filter(oa => oa.type === 'relation' &amp;&amp; oa.name === 'template')) {
+            const templateNote = this.treeCache.getNoteFromCache(templateAttr.value);
+
+            if (templateNote) {
+                attrArrs.push(templateNote.getAttributes());
+            }
         }
 
-        if (name) {
-            return this.attributeCache.filter(attr => attr.name === name);
+        if (this.noteId !== 'root') {
+            for (const parentNote of this.getParentNotes()) {
+                // these virtual parent-child relationships are also loaded into frontend tree cache
+                if (parentNote.type !== 'search') {
+                    attrArrs.push(parentNote.getInheritableAttributes());
+                }
+            }
         }
-        else {
-            return this.attributeCache;
+
+        const attributes = attrArrs.flat();
+
+        return this.__filterAttrs(attributes, type, name);
+    }
+
+    __filterAttrs(attributes, type, name) {
+        if (type &amp;&amp; name) {
+            return attributes.filter(attr => attr.type === type &amp;&amp; attr.name === name);
+        } else if (type) {
+            return attributes.filter(attr => attr.type === type);
+        } else if (name) {
+            return attributes.filter(attr => attr.name === name);
+        } else {
+            return attributes;
         }
     }
 
+    getInheritableAttributes() {
+        const attrs = this.getAttributes();
+
+        return attrs.filter(attr => attr.isInheritable);
+    }
+
     /**
      * @param {string} [name] - label name to filter
-     * @returns {Promise&lt;Attribute[]>} all note's labels (attributes with type label), including inherited ones
+     * @returns {Attribute[]} all note's labels (attributes with type label), including inherited ones
      */
-    async getLabels(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === LABEL);
+    getOwnedLabels(name) {
+        return this.getOwnedAttributes(LABEL, name);
     }
 
     /**
      * @param {string} [name] - label name to filter
-     * @returns {Promise&lt;Attribute[]>} all note's label definitions, including inherited ones
+     * @returns {Attribute[]} all note's labels (attributes with type label), including inherited ones
      */
-    async getLabelDefinitions(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === LABEL_DEFINITION);
+    getLabels(name) {
+        return this.getAttributes(LABEL, name);
+    }
+
+    /**
+     * @param {string} [name] - label name to filter
+     * @returns {Attribute[]} all note's label definitions, including inherited ones
+     */
+    getLabelDefinitions(name) {
+        return this.getAttributes(LABEL_DEFINITION, name);
     }
 
     /**
      * @param {string} [name] - relation name to filter
-     * @returns {Promise&lt;Attribute[]>} all note's relations (attributes with type relation), including inherited ones
+     * @returns {Attribute[]} all note's relations (attributes with type relation), including inherited ones
      */
-    async getRelations(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === RELATION);
+    getOwnedRelations(name) {
+        return this.getOwnedAttributes(RELATION, name);
     }
 
     /**
      * @param {string} [name] - relation name to filter
-     * @returns {Promise&lt;Attribute[]>} all note's relation definitions including inherited ones
+     * @returns {Attribute[]} all note's relations (attributes with type relation), including inherited ones
      */
-    async getRelationDefinitions(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === RELATION_DEFINITION);
+    getRelations(name) {
+        return this.getAttributes(RELATION, name);
+    }
+
+    /**
+     * @param {string} [name] - relation name to filter
+     * @returns {Attribute[]} all note's relation definitions including inherited ones
+     */
+    getRelationDefinitions(name) {
+        return this.getAttributes(RELATION_DEFINITION, name);
     }
 
     /**
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
-     * @returns {Promise&lt;boolean>} true if note has an attribute with given type and name (including inherited)
+     * @returns {boolean} true if note has an attribute with given type and name (including inherited)
      */
-    async hasAttribute(type, name) {
-        return !!await this.getAttribute(type, name);
+    hasAttribute(type, name) {
+        return !!this.getAttribute(type, name);
     }
 
     /**
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
-     * @returns {Promise&lt;Attribute>} attribute of given type and name. If there's more such attributes, first is  returned. Returns null if there's no such attribute belonging to this note.
+     * @returns {boolean} true if note has an attribute with given type and name (including inherited)
      */
-    async getAttribute(type, name) {
-        const attributes = await this.getAttributes();
-
-        return attributes.find(attr => attr.type === type &amp;&amp; attr.name === name);
+    hasOwnedAttribute(type, name) {
+        return !!this.getOwnedAttribute(type, name);
     }
 
     /**
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
-     * @returns {Promise&lt;string>} attribute value of given type and name or null if no such attribute exists.
+     * @returns {Attribute} attribute of given type and name. If there's more such attributes, first is  returned. Returns null if there's no such attribute belonging to this note.
      */
-    async getAttributeValue(type, name) {
-        const attr = await this.getAttribute(type, name);
+    getOwnedAttribute(type, name) {
+        const attributes = this.getOwnedAttributes(type, name);
+
+        return attributes.length > 0 ? attributes[0] : 0;
+    }
+
+    /**
+     * @param {string} type - attribute type (label, relation, etc.)
+     * @param {string} name - attribute name
+     * @returns {Attribute} attribute of given type and name. If there's more such attributes, first is  returned. Returns null if there's no such attribute belonging to this note.
+     */
+    getAttribute(type, name) {
+        const attributes = this.getAttributes(type, name);
+
+        return attributes.length > 0 ? attributes[0] : 0;
+    }
+
+    /**
+     * @param {string} type - attribute type (label, relation, etc.)
+     * @param {string} name - attribute name
+     * @returns {string} attribute value of given type and name or null if no such attribute exists.
+     */
+    getOwnedAttributeValue(type, name) {
+        const attr = this.getOwnedAttribute(type, name);
+
+        return attr ? attr.value : null;
+    }
+
+    /**
+     * @param {string} type - attribute type (label, relation, etc.)
+     * @param {string} name - attribute name
+     * @returns {string} attribute value of given type and name or null if no such attribute exists.
+     */
+    getAttributeValue(type, name) {
+        const attr = this.getAttribute(type, name);
 
         return attr ? attr.value : null;
     }
 
     /**
      * @param {string} name - label name
-     * @returns {Promise&lt;boolean>} true if label exists (including inherited)
+     * @returns {boolean} true if label exists (excluding inherited)
      */
-    async hasLabel(name) { return await this.hasAttribute(LABEL, name); }
-
-    /**
-     * @param {string} name - relation name
-     * @returns {Promise&lt;boolean>} true if relation exists (including inherited)
-     */
-    async hasRelation(name) { return await this.hasAttribute(RELATION, name); }
+    hasOwnedLabel(name) { return this.hasOwnedAttribute(LABEL, name); }
 
     /**
      * @param {string} name - label name
-     * @returns {Promise&lt;Attribute>} label if it exists, null otherwise
+     * @returns {boolean} true if label exists (including inherited)
      */
-    async getLabel(name) { return await this.getAttribute(LABEL, name); }
+    hasLabel(name) { return this.hasAttribute(LABEL, name); }
 
     /**
      * @param {string} name - relation name
-     * @returns {Promise&lt;Attribute>} relation if it exists, null otherwise
+     * @returns {boolean} true if relation exists (excluding inherited)
      */
-    async getRelation(name) { return await this.getAttribute(RELATION, name); }
+    hasOwnedRelation(name) { return this.hasOwnedAttribute(RELATION, name); }
+
+    /**
+     * @param {string} name - relation name
+     * @returns {boolean} true if relation exists (including inherited)
+     */
+    hasRelation(name) { return this.hasAttribute(RELATION, name); }
 
     /**
      * @param {string} name - label name
-     * @returns {Promise&lt;string>} label value if label exists, null otherwise
+     * @returns {Attribute} label if it exists, null otherwise
      */
-    async getLabelValue(name) { return await this.getAttributeValue(LABEL, name); }
+    getOwnedLabel(name) { return this.getOwnedAttribute(LABEL, name); }
+
+    /**
+     * @param {string} name - label name
+     * @returns {Attribute} label if it exists, null otherwise
+     */
+    getLabel(name) { return this.getAttribute(LABEL, name); }
 
     /**
      * @param {string} name - relation name
-     * @returns {Promise&lt;string>} relation value if relation exists, null otherwise
+     * @returns {Attribute} relation if it exists, null otherwise
      */
-    async getRelationValue(name) { return await this.getAttributeValue(RELATION, name); }
+    getOwnedRelation(name) { return this.getOwnedAttribute(RELATION, name); }
+
+    /**
+     * @param {string} name - relation name
+     * @returns {Attribute} relation if it exists, null otherwise
+     */
+    getRelation(name) { return this.getAttribute(RELATION, name); }
+
+    /**
+     * @param {string} name - label name
+     * @returns {string} label value if label exists, null otherwise
+     */
+    getOwnedLabelValue(name) { return this.getOwnedAttributeValue(LABEL, name); }
+
+    /**
+     * @param {string} name - label name
+     * @returns {string} label value if label exists, null otherwise
+     */
+    getLabelValue(name) { return this.getAttributeValue(LABEL, name); }
+
+    /**
+     * @param {string} name - relation name
+     * @returns {string} relation value if relation exists, null otherwise
+     */
+    getOwnedRelationValue(name) { return this.getOwnedAttributeValue(RELATION, name); }
+
+    /**
+     * @param {string} name - relation name
+     * @returns {string} relation value if relation exists, null otherwise
+     */
+    getRelationValue(name) { return this.getAttributeValue(RELATION, name); }
 
     /**
      * @param {string} name
-     * @returns {Promise&lt;Note>|null} target note of the relation or null (if target is empty or note was not found)
+     * @returns {Promise&lt;NoteShort>|null} target note of the relation or null (if target is empty or note was not found)
      */
     async getRelationTarget(name) {
-        const relation = await this.getRelation(name);
+        const targets = await this.getRelationTargets(name);
 
-        return relation ? await repository.getNote(relation.value) : null;
+        return targets.length > 0 ? targets[0] : null;
+    }
+
+    /**
+     * @param {string} [name] - relation name to filter
+     * @returns {Promise&lt;NoteShort[]>}
+     */
+    async getRelationTargets(name) {
+        const relations = this.getRelations(name);
+        const targets = [];
+
+        for (const relation of relations) {
+            targets.push(await this.treeCache.getNote(relation.value));
+        }
+
+        return targets;
     }
 
     /**
@@ -237,7 +453,17 @@ class NoteShort {
      * Cache is note instance scoped.
      */
     invalidateAttributeCache() {
-        this.attributeCache = null;
+        this.__attributeCache = null;
+    }
+
+    /**
+     * Get relations which target this note
+     *
+     * @returns {Attribute[]}
+     */
+    getTargetRelations() {
+        return this.targetRelations
+            .map(attributeId => this.treeCache.attributes[attributeId]);
     }
 
     get toString() {
@@ -247,11 +473,14 @@ class NoteShort {
     get dto() {
         const dto = Object.assign({}, this);
         delete dto.treeCache;
-        delete dto.archived;
-        delete dto.attributeCache;
 
         return dto;
     }
+
+    getCssClass() {
+        const labels = this.getLabels('cssClass');
+        return labels.map(l => l.value).join(' ');
+    }
 }
 
 export default NoteShort;</code></pre>
@@ -264,13 +493,13 @@ export default NoteShort;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><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></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/global.html

@@ -204,7 +204,7 @@
 
             
 
-            <td class="description last">name of the JAM icon to be used (e.g. "clock" for "jam-clock" icon)</td>
+            <td class="description last">name of the boxicon to be used (e.g. "time" for "bx-time" icon)</td>
         </tr>
 
     
@@ -303,7 +303,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#line56">line 56</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line76">line 76</a>
     </li></ul></dd>
     
 
@@ -333,13 +333,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><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></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/index.html

@@ -50,13 +50,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><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></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/module.exports.html

@@ -0,0 +1,280 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Class: exports</title>
+
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+
+    <h1 class="page-title">Class: exports</h1>
+
+    
+
+
+
+
+<section>
+
+<header>
+    
+        <h2><span class="attribs"><span class="type-signature"></span></span>exports<span class="signature">()</span><span class="type-signature"></span></h2>
+        
+            <div class="class-description">blaa vlaa</div>
+        
+    
+</header>
+
+<article>
+    <div class="container-overview">
+    
+        
+
+    
+    <h2>Constructor</h2>
+    
+
+    
+    <h4 class="name" id="exports"><span class="type-signature"></span>new exports<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="services_keyboard_actions.js.html">services/keyboard_action.js</a>, <a href="services_keyboard_actions.js.html#line5">line 5</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
+    </div>
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+        <h3 class="subsection-title">Members</h3>
+
+        
+            
+<h4 class="name" id="JUMP_TO"><span class="type-signature"></span>JUMP_TO<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
+    
+
+<table class="props">
+    <thead>
+    <tr>
+        
+
+        <th>Type</th>
+
+        
+
+        
+
+        <th class="last">Description</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    
+
+        <tr>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </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_keyboard_actions.js.html">services/keyboard_action.js</a>, <a href="services_keyboard_actions.js.html#line7">line 7</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+    
+
+    
+
+    
+
+    
+</article>
+
+</section>
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><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="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>

docs/frontend_api/scripts/linenumber.js

@@ -1,12 +1,12 @@
 /*global document */
-(function() {
-    var source = document.getElementsByClassName('prettyprint source linenums');
-    var i = 0;
-    var lineNumber = 0;
-    var lineId;
-    var lines;
-    var totalLines;
-    var anchorHash;
+(() => {
+    const source = document.getElementsByClassName('prettyprint source linenums');
+    let i = 0;
+    let lineNumber = 0;
+    let lineId;
+    let lines;
+    let totalLines;
+    let anchorHash;
 
     if (source && source[0]) {
         anchorHash = document.location.hash.substring(1);
@@ -15,7 +15,7 @@
 
         for (; i < totalLines; i++) {
             lineNumber++;
-            lineId = 'line' + lineNumber;
+            lineId = `line${lineNumber}`;
             lines[i].id = lineId;
             if (lineId === anchorHash) {
                 lines[i].className += ' selected';

docs/frontend_api/services_frontend_script_api.js.html

@@ -29,14 +29,19 @@
             <pre class="prettyprint source linenums"><code>import treeService from './tree.js';
 import server from './server.js';
 import utils from './utils.js';
-import infoService from './info.js';
+import toastService from './toast.js';
 import linkService from './link.js';
 import treeCache from './tree_cache.js';
-import noteDetailService from './note_detail.js';
-import noteTypeService from './note_type.js';
 import noteTooltipService from './note_tooltip.js';
-import protectedSessionService from'./protected_session.js';
-import dateNotesService from'./date_notes.js';
+import protectedSessionService from './protected_session.js';
+import dateNotesService from './date_notes.js';
+import CollapsibleWidget from '../widgets/collapsible_widget.js';
+import ws from "./ws.js";
+import hoistedNoteService from "./hoisted_note.js";
+import appContext from "./app_context.js";
+import TabAwareWidget from "../widgets/tab_aware_widget.js";
+import TabCachingWidget from "../widgets/tab_caching_widget.js";
+import BasicWidget from "../widgets/basic_widget.js";
 
 /**
  * This is the main frontend API interface for scripts. It's published in the local "api" object.
@@ -44,9 +49,12 @@ import dateNotesService from'./date_notes.js';
  * @constructor
  * @hideconstructor
  */
-function FrontendScriptApi(startNote, currentNote, originEntity = null, tabContext = null) {
+function FrontendScriptApi(startNote, currentNote, originEntity = null, $container = null) {
     const $pluginButtons = $("#plugin-buttons");
 
+    /** @property {jQuery} container of all the rendered script content */
+    this.$container = $container;
+
     /** @property {object} note where script started executing */
     this.startNote = startNote;
     /** @property {object} note where script is currently executing */
@@ -57,8 +65,17 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     // to keep consistency with backend API
     this.dayjs = dayjs;
 
-    /** @property {TabContext|null} - experimental! */
-    this.tabContext = tabContext;
+    /** @property {CollapsibleWidget} */
+    this.CollapsibleWidget = CollapsibleWidget;
+
+    /** @property {TabAwareWidget} */
+    this.TabAwareWidget = TabAwareWidget;
+
+    /** @property {TabCachingWidget} */
+    this.TabCachingWidget = TabCachingWidget;
+
+    /** @property {BasicWidget} */
+    this.BasicWidget = BasicWidget;
 
     /**
      * Activates note in the tree and in the note detail.
@@ -67,24 +84,27 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
      * @param {string} notePath (or noteId)
      * @returns {Promise&lt;void>}
      */
-    this.activateNote = treeService.activateNote;
+    this.activateNote = async notePath => {
+        await appContext.tabManager.getActiveTabContext().setNote(notePath);
+    };
 
     /**
-     * Activates newly created note. Compared to this.activateNote() also refreshes tree.
+     * Activates newly created note. Compared to this.activateNote() also makes sure that frontend has been fully synced.
      *
      * @param {string} notePath (or noteId)
      * @return {Promise&lt;void>}
      */
     this.activateNewNote = async notePath => {
-        await treeService.reload();
+        await ws.waitForMaxKnownSyncId();
 
-        await treeService.activateNote(notePath, noteDetailService.focusAndSelectTitle);
+        await appContext.tabManager.getActiveTabContext().setNote(notePath);
+        appContext.triggerEvent('focusAndSelectTitle');
     };
 
     /**
      * @typedef {Object} ToolbarButtonOptions
      * @property {string} title
-     * @property {string} [icon] - name of the JAM icon to be used (e.g. "clock" for "jam-clock" icon)
+     * @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
      * @property {string} [shortcut] - keyboard shortcut for the button, e.g. "alt+t"
      */
@@ -99,10 +119,10 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
 
         const button = $('&lt;button>')
             .addClass("btn btn-sm")
-            .click(opts.action);
+            .on('click', opts.action);
 
         if (opts.icon) {
-            button.append($("&lt;span>").addClass("jam jam-" + opts.icon))
+            button.append($("&lt;span>").addClass("bx bx-" + opts.icon))
                   .append("&amp;nbsp;");
         }
 
@@ -115,7 +135,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
         }
 
         if (opts.shortcut) {
-            $(document).bind('keydown', opts.shortcut, opts.action);
+            utils.bindGlobalShortcut(opts.shortcut, opts.action);
 
             button.attr("title", "Shortcut " + opts.shortcut);
         }
@@ -137,14 +157,14 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     }
 
     /**
-     * Executes given anonymous function on the server.
+     * Executes given anonymous function on the backend.
      * Internally this serializes the anonymous function into string and sends it to backend via AJAX.
      *
      * @param {string} script - script to be executed on the backend
      * @param {Array.&lt;?>} params - list of parameters to the anonymous function to be send to backend
      * @return {Promise&lt;*>} return value of the executed function on the backend
      */
-    this.runOnServer = async (script, params = []) => {
+    this.runOnBackend = async (script, params = []) => {
         if (typeof script === "function") {
             script = script.toString();
         }
@@ -156,9 +176,12 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
             currentNoteId: currentNote.noteId,
             originEntityName: "notes", // currently there's no other entity on frontend which can trigger event
             originEntityId: originEntity ? originEntity.noteId : null
-        });
+        }, "script");
 
         if (ret.success) {
+            // wait until all the changes done in the script has been synced to frontend before continuing
+            await ws.waitForSyncId(ret.maxSyncId);
+
             return ret.executionResult;
         }
         else {
@@ -166,6 +189,12 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
         }
     };
 
+    /**
+     * @deprecated new name of this API call is runOnBackend so use that
+     * @method
+     */
+    this.runOnServer = this.runOnBackend;
+
     /**
      * This is a powerful search method - you can search by attributes and their values, e.g.:
      * "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
@@ -219,16 +248,12 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     this.getNotes = async (noteIds, silentNotFoundError = false) => await treeCache.getNotes(noteIds, silentNotFoundError);
 
     /**
-     * @param {string} noteId
+     * Update frontend tree (note) cache from the backend.
+     *
+     * @param {string[]} noteIds
      * @method
      */
-    this.reloadChildren = async noteId => await treeCache.reloadChildren(noteId);
-
-    /**
-     * @param {string} noteId
-     * @method
-     */
-    this.reloadParents = async noteId => await treeCache.reloadParents(noteId);
+    this.reloadNotes = async noteIds => await treeCache.reloadNotes(noteIds);
 
     /**
      * Instance name identifies particular Trilium instance. It can be useful for scripts
@@ -258,7 +283,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
      * @method
      * @param {string} message
      */
-    this.showMessage = infoService.showMessage;
+    this.showMessage = toastService.showMessage;
 
     /**
      * Show error message to the user.
@@ -266,15 +291,13 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
      * @method
      * @param {string} message
      */
-    this.showError = infoService.showError;
+    this.showError = toastService.showError;
 
     /**
-     * Refresh tree
-     *
      * @method
-     * @returns {Promise&lt;void>}
+     * @deprecated - this is now no-op since all the changes should be gracefully handled per widget
      */
-    this.refreshTree = treeService.reload;
+    this.refreshTree = () => {};
 
     /**
      * Create note link (jQuery object) for given note.
@@ -286,57 +309,32 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     this.createNoteLink = linkService.createNoteLink;
 
     /**
+     * Adds given text to the editor cursor
+     *
+     * @param {string} text - this must be clear text, HTML is not supported.
      * @method
-     * @returns {NoteFull} active note (loaded into right pane)
      */
-    this.getActiveNote = noteDetailService.getActiveNote;
+    this.addTextToActiveTabEditor = text => appContext.triggerCommand('addTextToActiveEditor', {text});
+
+    /**
+     * @method
+     * @returns {NoteShort} active note (loaded into right pane)
+     */
+    this.getActiveTabNote = () => appContext.tabManager.getActiveTabNote();
+
+    /**
+     * See https://ckeditor.com/docs/ckeditor5/latest/api/module_core_editor_editor-Editor.html for a documentation on the returned instance.
+     *
+     * @method
+     * @param callback - method receiving "textEditor" instance
+     */
+    this.getActiveTabTextEditor = callback => appContext.triggerCommand('executeInActiveEditor', {callback});
 
     /**
      * @method
      * @returns {Promise&lt;string|null>} returns note path of active note or null if there isn't active note
      */
-    this.getActiveNotePath = () => {
-        const activeTabContext = noteDetailService.getActiveTabContext();
-
-        return activeTabContext ? activeTabContext.notePath : null;
-    };
-
-    /**
-     * This method checks whether user navigated away from the note from which the scripts has been started.
-     * This is necessary because script execution is async and by the time it is finished, the user might have
-     * already navigated away from this page - the end result would be that script might return data for the wrong
-     * note.
-     *
-     * @method
-     * @return {boolean} returns true if the original note is still loaded, false if user switched to another
-     */
-    this.isNoteStillActive = () => {
-        return this.originEntity.noteId === tabContext.noteId;
-    };
-
-    /**
-     * @method
-     * @param {function} func - callback called on note change as user is typing (not necessarily tied to save event)
-     */
-    this.onNoteChange = noteDetailService.onNoteChange;
-
-    /**
-     * @method
-     * @returns {array} list of default code mime types
-     */
-    this.getDefaultCodeMimeTypes = noteTypeService.getDefaultCodeMimeTypes;
-
-    /**
-     * @method
-     * @returns {array} list of currently used code mime types
-     */
-    this.getCodeMimeTypes = noteTypeService.getCodeMimeTypes;
-
-    /**
-     * @method
-     * @param {array} types - list of mime types to be used
-     */
-    this.setCodeMimeTypes = noteTypeService.setCodeMimeTypes;
+    this.getActiveTabNotePath = () => appContext.tabManager.getActiveTabNotePath();
 
     /**
      * @method
@@ -345,9 +343,32 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     this.setupElementTooltip = noteTooltipService.setupElementTooltip;
 
     /**
+     * @deprecated use protectNote and protectSubtree instead
      * @method
      */
-    this.protectActiveNote = protectedSessionService.protectNoteAndSendToServer;
+    this.protectActiveNote = async () => {
+        const activeNote = appContext.tabManager.getActiveTabNote();
+
+        await protectedSessionService.protectNote(activeNote.noteId, true, false);
+    };
+
+    /**
+     * @method
+     * @param {string} noteId
+     * @param {boolean} protect - true to protect note, false to unprotect
+     */
+    this.protectNote = async (noteId, protect) => {
+        await protectedSessionService.protectNote(noteId, protect, false);
+    };
+
+    /**
+     * @method
+     * @param {string} noteId
+     * @param {boolean} protect - true to protect subtree, false to unprotect
+     */
+    this.protectSubTree = async (noteId, protect) => {
+        await protectedSessionService.protectNote(noteId, protect, true);
+    };
 
     /**
      * Returns date-note for today. If it doesn't exist, it is automatically created.
@@ -383,6 +404,33 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
      * @return {Promise&lt;NoteShort>}
      */
     this.getYearNote = dateNotesService.getYearNote;
+
+    /**
+     * Hoist note. See https://github.com/zadam/trilium/wiki/Note-hoisting
+     *
+     * @method
+     * @param {string} noteId - set hoisted note. 'root' will effectively unhoist
+     * @return {Promise}
+     */
+    this.setHoistedNoteId = hoistedNoteService.setHoistedNoteId;
+
+    /**
+     * @method
+     * @param {string} keyboardShortcut - e.g. "ctrl+shift+a"
+     * @param {function} handler
+     */
+    this.bindGlobalShortcut = utils.bindGlobalShortcut;
+
+    /**
+     * Trilium runs in backend and frontend process, when something is changed on the backend from script,
+     * frontend will get asynchronously synchronized.
+     *
+     * This method returns a promise which resolves once all the backend -> frontend synchronization is finished.
+     * Typical use case is when new note has been created, we should wait until it is synced into frontend and only then activate it.
+     *
+     * @method
+     */
+    this.waitUntilSynced = ws.waitForMaxKnownSyncId;
 }
 
 export default FrontendScriptApi;</code></pre>
@@ -395,13 +443,13 @@ export default FrontendScriptApi;</code></pre>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><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></ul><h3><a href="global.html">Global</a></h3>
 </nav>
 
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/services_keyboard_action.js.html

@@ -0,0 +1,280 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Source: services/keyboard_action.js</title>
+
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+
+    <h1 class="page-title">Source: services/keyboard_action.js</h1>
+
+    
+
+
+
+    
+    <section>
+        <article>
+            <pre class="prettyprint source linenums"><code>/**
+ * blaa vlaa
+ */
+class KeyboardAction {
+    constructor(params) {
+        this.optionName = params.optionName;
+    }
+}
+
+/**
+ * Open "Jump to note" dialog
+ * @static
+ */
+KeyboardAction.JumpToNote = new KeyboardAction({
+	optionName: "JumpToNote",
+	defaultShortcuts: "mod+j",
+	description: 'Open "Jump to note" dialog'
+});
+
+/** @static */
+KeyboardAction.MarkdownToHTML = new KeyboardAction({
+	optionName: "MarkdownToHTML",
+	defaultShortcuts: "mod+return"
+});
+
+/** @static */
+KeyboardAction.NewTab = new KeyboardAction({
+	optionName: "NewTab",
+	defaultShortcuts: "mod+t"
+});
+
+/** @static */
+KeyboardAction.CloseTab = new KeyboardAction({
+	optionName: "CloseTab",
+	defaultShortcuts: "mod+w"
+});
+
+/** @static */
+KeyboardAction.NextTab = new KeyboardAction({
+	optionName: "NextTab",
+	defaultShortcuts: "mod+tab"
+});
+
+/** @static */
+KeyboardAction.PreviousTab = new KeyboardAction({
+	optionName: "PreviousTab",
+	defaultShortcuts: "mod+shift+tab"
+});
+
+/** @static */
+KeyboardAction.CreateNoteAfter = new KeyboardAction({
+	optionName: "CreateNoteAfter",
+	defaultShortcuts: "mod+o"
+});
+
+/** @static */
+KeyboardAction.CreateNoteInto = new KeyboardAction({
+	optionName: "CreateNoteInto",
+	defaultShortcuts: "mod+p"
+});
+
+/** @static */
+KeyboardAction.ScrollToActiveNote = new KeyboardAction({
+	optionName: "ScrollToActiveNote",
+	defaultShortcuts: "mod+."
+});
+
+/** @static */
+KeyboardAction.CollapseTree = new KeyboardAction({
+	optionName: "CollapseTree",
+	defaultShortcuts: "alt+c"
+});
+
+/** @static */
+KeyboardAction.RunSQL = new KeyboardAction({
+	optionName: "RunSQL",
+	defaultShortcuts: "mod+return"
+});
+
+/** @static */
+KeyboardAction.FocusNote = new KeyboardAction({
+	optionName: "FocusNote",
+	defaultShortcuts: "return"
+});
+
+/** @static */
+KeyboardAction.RunCurrentNote = new KeyboardAction({
+	optionName: "RunCurrentNote",
+	defaultShortcuts: "mod+return"
+});
+
+/** @static */
+KeyboardAction.ClipboardCopy = new KeyboardAction({
+	optionName: "ClipboardCopy",
+	defaultShortcuts: "mod+c"
+});
+
+/** @static */
+KeyboardAction.ClipboardPaste = new KeyboardAction({
+	optionName: "ClipboardPaste",
+	defaultShortcuts: "mod+v"
+});
+
+/** @static */
+KeyboardAction.ClipboardCut = new KeyboardAction({
+	optionName: "ClipboardCut",
+	defaultShortcuts: "mod+x"
+});
+
+/** @static */
+KeyboardAction.SelectAllNotesInParent = new KeyboardAction({
+	optionName: "SelectAllNotesInParent",
+	defaultShortcuts: "mod+a"
+});
+
+/** @static */
+KeyboardAction.Undo = new KeyboardAction({
+	optionName: "Undo",
+	defaultShortcuts: "mod+z"
+});
+
+/** @static */
+KeyboardAction.Redo = new KeyboardAction({
+	optionName: "Redo",
+	defaultShortcuts: "mod+y"
+});
+
+/** @static */
+KeyboardAction.AddLinkToText = new KeyboardAction({
+	optionName: "AddLinkToText",
+	defaultShortcuts: "mod+l"
+});
+
+/** @static */
+KeyboardAction.CloneNotesTo = new KeyboardAction({
+	optionName: "CloneNotesTo",
+	defaultShortcuts: "mod+shift+c"
+});
+
+/** @static */
+KeyboardAction.MoveNotesTo = new KeyboardAction({
+	optionName: "MoveNotesTo",
+	defaultShortcuts: "mod+shift+c"
+});
+
+/** @static */
+KeyboardAction.SearchNotes = new KeyboardAction({
+	optionName: "SearchNotes",
+	defaultShortcuts: "mod+s"
+});
+
+/** @static */
+KeyboardAction.ShowAttributes = new KeyboardAction({
+	optionName: "ShowAttributes",
+	defaultShortcuts: "alt+a"
+});
+
+/** @static */
+KeyboardAction.ShowHelp = new KeyboardAction({
+	optionName: "ShowHelp",
+	defaultShortcuts: "f1"
+});
+
+/** @static */
+KeyboardAction.OpenSQLConsole = new KeyboardAction({
+	optionName: "OpenSQLConsole",
+	defaultShortcuts: "alt+o"
+});
+
+/** @static */
+KeyboardAction.BackInNoteHistory = new KeyboardAction({
+	optionName: "BackInNoteHistory",
+	defaultShortcuts: "alt+left"
+});
+
+/** @static */
+KeyboardAction.ForwardInNoteHistory = new KeyboardAction({
+	optionName: "ForwardInNoteHistory",
+	defaultShortcuts: "alt+right"
+});
+
+/** @static */
+KeyboardAction.ToggleZenMode = new KeyboardAction({
+	optionName: "ToggleZenMode",
+	defaultShortcuts: "alt+m"
+});
+
+/** @static */
+KeyboardAction.InsertDateTime = new KeyboardAction({
+	optionName: "InsertDateTime",
+	defaultShortcuts: "alt+t"
+});
+
+/** @static */
+KeyboardAction.ReloadApp = new KeyboardAction({
+    optionName: "ReloadApp",
+    defaultShortcuts: ["f5", "mod+r"]
+});
+
+/** @static */
+KeyboardAction.OpenDevTools = new KeyboardAction({
+	optionName: "OpenDevTools",
+	defaultShortcuts: "mod+shift+i"
+});
+
+/** @static */
+KeyboardAction.FindInText = new KeyboardAction({
+	optionName: "FindInText",
+	defaultShortcuts: "mod+f"
+});
+
+/** @static */
+KeyboardAction.ToggleFullscreen = new KeyboardAction({
+	optionName: "ToggleFullscreen",
+	defaultShortcuts: "f11"
+});
+
+/** @static */
+KeyboardAction.ZoomOut = new KeyboardAction({
+	optionName: "ZoomOut",
+	defaultShortcuts: "mod+-"
+});
+
+/** @static */
+KeyboardAction.ZoomIn = new KeyboardAction({
+	optionName: "ZoomIn",
+	defaultShortcuts: "mod+="
+});
+
+export default KeyboardAction;</code></pre>
+        </article>
+    </section>
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="KeyboardAction.html">KeyboardAction</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>

docs/frontend_api/services_keyboard_actions.js.html

@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Source: services/keyboard_action.js</title>
+
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+
+    <h1 class="page-title">Source: services/keyboard_action.js</h1>
+
+    
+
+
+
+    
+    <section>
+        <article>
+            <pre class="prettyprint source linenums"><code>/**
+ * blaa vlaa
+ */
+class KeyboardActions {
+    constructor() {
+        /** @property {string} */
+        this.JUMP_TO = "";
+    }
+}
+
+export default KeyboardActions;</code></pre>
+        </article>
+    </section>
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="KeyboardActions.html">KeyboardActions</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>

docs/frontend_api/styles/jsdoc-default.css

@@ -273,7 +273,7 @@ tr > th:last-child { border-right: 1px solid #ddd; }
     margin: 0;
 }
 
-.prettyprint
+.source
 {
     border: 1px solid #ddd;
     width: 80%;
@@ -284,7 +284,7 @@ tr > th:last-child { border-right: 1px solid #ddd; }
     width: inherit;
 }
 
-.prettyprint code
+.source code
 {
     font-size: 100%;
     line-height: 18px;

electron.js

@@ -1,118 +1,50 @@
 'use strict';
 
-const electron = require('electron');
-const path = require('path');
-const log = require('./src/services/log');
+const {app, globalShortcut} = require('electron');
 const sqlInit = require('./src/services/sql_init');
-const cls = require('./src/services/cls');
-const url = require("url");
-const port = require('./src/services/port');
 const appIconService = require('./src/services/app_icon');
-const windowStateKeeper = require('electron-window-state');
-
-const app = electron.app;
-const globalShortcut = electron.globalShortcut;
+const windowService = require('./src/services/window');
 
 // Adds debug features like hotkeys for triggering dev tools and reload
 require('electron-debug')();
 
 appIconService.installLocalAppIcon();
 
-// Prevent window being garbage collected
-let mainWindow;
-
 require('electron-dl')({ saveAs: true });
 
-function onClosed() {
-    // Dereference the window
-    // For multiple windows store them in an array
-    mainWindow = null;
-}
-
-async function createMainWindow() {
-    await sqlInit.dbConnection;
-
-    // if schema doesn't exist -> setup process
-    // if schema exists, then we need to wait until the migration process is finished
-    if (await sqlInit.schemaExists()) {
-        await sqlInit.dbReady;
-    }
-
-    const mainWindowState = windowStateKeeper({
-        // default window width & height so it's usable on 1600 * 900 display (including some extra panels etc.)
-        defaultWidth: 1200,
-        defaultHeight: 800
-    });
-
-    const win = new electron.BrowserWindow({
-        x: mainWindowState.x,
-        y: mainWindowState.y,
-        width: mainWindowState.width,
-        height: mainWindowState.height,
-        title: 'Trilium Notes',
-        webPreferences: {
-            nodeIntegration: true
-        },
-        icon: path.join(__dirname, 'images/app-icons/png/256x256.png')
-    });
-
-    mainWindowState.manage(win);
-
-    win.setMenuBarVisibility(false);
-    win.loadURL('http://127.0.0.1:' + await port);
-    win.on('closed', onClosed);
-
-    win.webContents.on('new-window', (e, url) => {
-        if (url !== win.webContents.getURL()) {
-            e.preventDefault();
-            require('electron').shell.openExternal(url);
-        }
-    });
-
-    // prevent drag & drop to navigate away from trilium
-    win.webContents.on('will-navigate', (ev, targetUrl) => {
-        const parsedUrl = url.parse(targetUrl);
-
-        // we still need to allow internal redirects from setup and migration pages
-        if (!['localhost', '127.0.0.1'].includes(parsedUrl.hostname) || (parsedUrl.path && parsedUrl.path !== '/')) {
-            ev.preventDefault();
-        }
-    });
-
-    return win;
-}
-
 app.on('window-all-closed', () => {
     if (process.platform !== 'darwin') {
         app.quit();
     }
-});
-
-app.on('activate', () => {
-    if (!mainWindow) {
-        mainWindow = createMainWindow();
+    else if (process.platform === 'win32') {
+        app.exit(0); // attempt to fix the issue when app.quite() won't terminate processes on windows
     }
 });
 
 app.on('ready', async () => {
     app.setAppUserModelId('com.github.zadam.trilium');
 
-    mainWindow = await createMainWindow();
+    await sqlInit.dbConnection;
 
-    const result = globalShortcut.register('CommandOrControl+Alt+P', cls.wrap(async () => {
-        // window may be hidden / not in focus
-        mainWindow.focus();
+    // if db is not initialized -> setup process
+    // if db is initialized, then we need to wait until the migration process is finished
+    if (await sqlInit.isDbInitialized()) {
+        await sqlInit.dbReady;
 
-        mainWindow.webContents.send('create-day-sub-note');
-    }));
-
-    if (!result) {
-        log.error("Could not register global shortcut CTRL+ALT+P");
+        await windowService.createMainWindow();
     }
+    else {
+        await windowService.createSetupWindow();
+    }
+
+    await windowService.registerGlobalShortcuts();
 });
 
 app.on('will-quit', () => {
     globalShortcut.unregisterAll();
 });
 
+// this is to disable electron warning spam in the dev console (local development only)
+process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
+
 require('./src/www');