Merge branch 'develop' into feature/llm-integration

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*.{js,ts}]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true

.gitattributes

@@ -0,0 +1 @@
+**/package-lock.json linguist-generated=true

.vscode/extensions.json

@@ -1,5 +1,6 @@
 {
     "recommendations": [
-        "lokalise.i18n-ally"
+        "lokalise.i18n-ally",
+        "editorconfig.editorconfig"
     ]
 }

.vscode/snippets.code-snippets

@@ -0,0 +1,26 @@
+{
+	// Place your Notes workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and 
+	// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope 
+	// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is 
+	// used to trigger the snippet and the body will be expanded and inserted. Possible variables are: 
+	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. 
+	// Placeholders with the same ids are connected.
+	// Example:
+	// "Print to console": {
+	// 	"scope": "javascript,typescript",
+	// 	"prefix": "log",
+	// 	"body": [
+	// 		"console.log('$1');",
+	// 		"$2"
+	// 	],
+	// 	"description": "Log output to console"
+	// }
+
+	"JQuery HTMLElement field": {
+		"scope": "typescript",
+		"prefix": "jqf",
+		"body": [
+			"private $${1:name}!: JQuery<HTMLElement>;"
+		]
+	}
+}

_check_ts_progress.sh

@@ -1,10 +1,13 @@
 #!/usr/bin/env bash
 
+cd src/public
+echo Summary
 cloc HEAD \
     --git --md \
-    --include-lang=javascript,typescript \
-    --found=filelist.txt \
-    --exclude-dir=public,libraries,views,docs
+    --include-lang=javascript,typescript
 
-grep -R \.js$ filelist.txt
-rm filelist.txt
+echo By file
+cloc HEAD \
+    --git --md \
+    --include-lang=javascript,typescript \
+    --by-file | grep \.js\|

bin/copy-dist.ts

@@ -23,13 +23,13 @@ async function copyNodeModuleFileOrFolder(source: string) {
 }
 
 const copy = async () => {
-  for (const srcFile of fs.readdirSync("build")) {    
+  for (const srcFile of fs.readdirSync("build")) {
     const destFile = path.join(DEST_DIR, path.basename(srcFile));
     log(`Copying source ${srcFile} -> ${destFile}.`);
     fs.copySync(path.join("build", srcFile), destFile, { recursive: true });
   }
 
-  const filesToCopy = ["config-sample.ini"];
+  const filesToCopy = ["config-sample.ini", "tsconfig.webpack.json"];
   for (const file of filesToCopy) {
     log(`Copying ${file}`);
     await fs.copy(file, path.join(DEST_DIR, file));
@@ -45,11 +45,11 @@ const copy = async () => {
   for (const dir of srcDirsToCopy) {
     log(`Copying ${dir}`);
     await fs.copy(dir, path.join(DEST_DIR_SRC, path.basename(dir)));
-  }  
+  }
 
   /**
-   * Directories to be copied relative to the project root into <resource_dir>/src/public/app-dist.
-   */
+    * Directories to be copied relative to the project root into <resource_dir>/src/public/app-dist.
+    */
   const publicDirsToCopy = [ "./src/public/app/doc_notes" ];
   const PUBLIC_DIR = path.join(DEST_DIR, "src", "public", "app-dist");
   for (const dir of publicDirsToCopy) {

bin/copy-trilium.sh

@@ -44,7 +44,7 @@ cp -R "$script_dir/../build/src" "$DIR"
 cp "$script_dir/../build/electron-main.js" "$DIR"
 
 # run in subshell (so we return to original dir)
-(cd $DIR && npm install --omit=dev)
+(cd $DIR && npm install --omit=dev --legacy-peer-deps)
 
 if [[ -d "$DIR"/node_modules ]]; then
     # cleanup of useless files in dependencies

bin/update-build-info.ts

@@ -22,4 +22,4 @@ export default {
 };
 `;
 
-fs.writeFileSync("src/services/build.ts", output);
+fs.writeFileSync("src/services/build.ts", output);

bin/update-nightly-version.ts

@@ -1,14 +1,14 @@
 /**
  * @module
- * 
+ *
  * The nightly version works uses the version described in `package.json`, just like any release.
  * The problem with this approach is that production builds have a very aggressive cache, and
  * usually running the nightly with this cached version of the application will mean that the
  * user might run into module not found errors or styling errors caused by an old cache.
- * 
+ *
  * This script is supposed to be run in the CI, which will update locally the version field of
  * `package.json` to contain the date. For example, `0.90.9-beta` will become `0.90.9-test-YYMMDD-HHMMSS`.
- * 
+ *
  */
 
 import { fileURLToPath } from "url";
@@ -33,7 +33,7 @@ function processVersion(version) {
 function main() {
     const scriptDir = dirname(fileURLToPath(import.meta.url));
     const packageJsonPath = join(scriptDir, "..", "package.json");
-    
+
     // Read the version from package.json and process it.
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
     const currentVersion = packageJson.version;
@@ -43,7 +43,7 @@ function main() {
 
     // Write the adjusted version back in.
     packageJson.version = adjustedVersion;
-    const formattedJson = JSON.stringify(packageJson, null, 4);    
+    const formattedJson = JSON.stringify(packageJson, null, 4);
     fs.writeFileSync(packageJsonPath, formattedJson);
 }
 

bin/watch-dist.ts

@@ -15,4 +15,4 @@ const sourceDir = "src/public";
 chokidar
     .watch(sourceDir)
     .on("change", onFileChanged);
-console.log(`Watching for changes to ${sourceDir}...`);
+console.log(`Watching for changes to ${sourceDir}...`);

docker-compose.yml

@@ -13,7 +13,9 @@ services:
     ports:
       # By default, Trilium will be available at http://localhost:8080
       # It will also be accessible at http://<host-ip>:8080
-      # You might want to limit this with something like Docker Networks, reverse proxies, or firewall rules, such as UFW
+      # You might want to limit this with something like Docker Networks, reverse proxies, or firewall rules,
+      # however be aware that using UFW is known to not work with default Docker installations, see:
+      # https://docs.docker.com/engine/network/packet-filtering-firewalls/#docker-and-ufw
       - '8080:8080'
     volumes:
       # Unless TRILIUM_DATA_DIR is set, the data will be stored in the "trilium-data" directory in the home directory.

docs/frontend_api/BasicWidget.html

@@ -1068,7 +1068,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/FAttachment.html

@@ -1058,7 +1058,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/FAttribute.html

@@ -918,7 +918,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/FBranch.html

@@ -1130,7 +1130,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/FNote.html

@@ -8806,7 +8806,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/FrontendScriptApi.html

@@ -8730,7 +8730,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/NoteContextAwareWidget.html

@@ -1582,7 +1582,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/RightPanelWidget.html

@@ -1787,7 +1787,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_fattachment.js.html

@@ -93,7 +93,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_fattribute.js.html

@@ -127,7 +127,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_fblob.js.html

@@ -81,7 +81,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_fbranch.js.html

@@ -106,7 +106,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_fnote.js.html

@@ -1055,7 +1055,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/global.html

@@ -898,7 +898,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/index.html

@@ -56,7 +56,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/services_frontend_script_api.js.html

@@ -698,7 +698,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/widgets_basic_widget.js.html

@@ -299,7 +299,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/widgets_note_context_aware_widget.js.html

@@ -179,7 +179,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/widgets_right_panel_widget.js.html

@@ -115,7 +115,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="BasicWidg
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.4</a>
 </footer>
 
 <script> prettyPrint(); </script>

electron-main.ts

@@ -1,4 +1,4 @@
 import { initializeTranslations } from "./src/services/i18n.js";
 
 await initializeTranslations();
-await import("./electron.js")
+await import("./electron.js")

electron.ts

@@ -48,11 +48,11 @@ electron.app.on("ready", async () => {
     await windowService.createMainWindow(electron.app);
 
     if (process.platform === "darwin") {
-      electron.app.on("activate", async () => {
+    electron.app.on("activate", async () => {
         if (electron.BrowserWindow.getAllWindows().length === 0) {
-          await windowService.createMainWindow(electron.app);
+        await windowService.createMainWindow(electron.app);
         }
-      });
+    });
     }
 
     tray.createTray();