mirror of
https://gitlab.com/ArkHost/HelixNotes.git
synced 2026-11-22 11:04:56 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1f1ef0b02 | ||
|
|
806c63aa65 | ||
|
|
4157beddf7 | ||
|
|
923cb9571c | ||
|
|
640b5e3d10 | ||
|
|
3607cf1b3f | ||
|
|
245cdacb68 | ||
|
|
2983e3db29 | ||
|
|
cc7c9e2b49 | ||
|
|
2240231f61 | ||
|
|
b2d0c7175e | ||
|
|
1bc0026731 | ||
|
|
41c0e4c993 | ||
|
|
34a0f9efa3 | ||
|
|
9d92489586 | ||
|
|
c45efb60ab | ||
|
|
0d11fd01dd | ||
|
|
0aaa05ce5c | ||
|
|
77e92ef25c | ||
|
|
d7e4be7f3a | ||
|
|
2aa572dcaa | ||
|
|
32f270ce9e |
No files matched your search
@@ -13,9 +13,6 @@ bun.lockb
|
||||
/.svelte-kit
|
||||
/build
|
||||
|
||||
# Local tests
|
||||
/tests/
|
||||
|
||||
# Nix
|
||||
/result
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# HelixNotes
|
||||
|
||||
[](https://gitlab.com/ArkHost/HelixNotes/-/blob/main/LICENSE)
|
||||
[](https://gitlab.com/ArkHost/HelixNotes/-/releases/v1.3.4)
|
||||
[](https://gitlab.com/ArkHost/HelixNotes/-/releases/v1.3.5)
|
||||
[](https://helixnotes.com)
|
||||
[]()
|
||||
|
||||
@@ -10,7 +10,7 @@ A local markdown note-taking app built with Tauri, SvelteKit, and Rust.
|
||||
Your notes are stored as standard Markdown files on your local filesystem.
|
||||
No cloud, no lock-in.
|
||||
|
||||
## Download (v1.3.4)
|
||||
## Download (v1.3.5)
|
||||
|
||||
### Linux
|
||||
|
||||
@@ -18,7 +18,7 @@ No cloud, no lock-in.
|
||||
|
||||
The AppImage works only on Fedora 43+, Arch Linux, and openSUSE Tumbleweed (x86_64).
|
||||
|
||||
[Download AppImage](https://download.helixnotes.com/releases/v1.3.4/HelixNotes_1.3.4_amd64.AppImage)
|
||||
[Download AppImage](https://download.helixnotes.com/releases/v1.3.5/HelixNotes_1.3.5_amd64.AppImage)
|
||||
|
||||
#### Distro-specific packages
|
||||
|
||||
@@ -108,26 +108,28 @@ sudo eopkg it helixnotes
|
||||
|
||||
#### Manual package downloads
|
||||
|
||||
- [.deb](https://download.helixnotes.com/releases/v1.3.4/HelixNotes_1.3.4_amd64.deb) (Ubuntu 22.04+)
|
||||
- [.rpm](https://download.helixnotes.com/releases/v1.3.4/HelixNotes-1.3.4-1.x86_64.rpm)
|
||||
- [.deb](https://download.helixnotes.com/releases/v1.3.5/HelixNotes_1.3.5_amd64.deb) (Ubuntu 22.04+)
|
||||
- [.rpm](https://download.helixnotes.com/releases/v1.3.5/HelixNotes-1.3.5-1.x86_64.rpm)
|
||||
|
||||
### Windows
|
||||
|
||||
[Download Installer](https://download.helixnotes.com/releases/v1.3.4/HelixNotes_1.3.4_x64-setup.exe) (Windows 10/11)
|
||||
[Download Installer](https://download.helixnotes.com/releases/v1.3.5/HelixNotes_1.3.5_x64-setup.exe) (Windows 10/11)
|
||||
|
||||
### macOS
|
||||
|
||||
[Download .dmg (Apple Silicon)](https://download.helixnotes.com/releases/v1.3.4/HelixNotes_1.3.4_aarch64.dmg) (M-series Macs)
|
||||
[Download .dmg (Apple Silicon)](https://download.helixnotes.com/releases/v1.3.5/HelixNotes_1.3.5_aarch64.dmg) (M-series Macs)
|
||||
|
||||
> **"HelixNotes is damaged and can't be opened"?** The app isn't damaged. The macOS build isn't notarized by Apple yet, so Gatekeeper blocks it on Apple Silicon. Run this once in Terminal, then open it normally (you'll need to redo it after each update):
|
||||
>
|
||||
> ```bash
|
||||
> xattr -cr /Applications/HelixNotes.app
|
||||
> ```
|
||||
[Download .dmg (Intel)](https://download.helixnotes.com/releases/v1.3.5/HelixNotes_1.3.5_x64.dmg)
|
||||
|
||||
The Apple Silicon build is signed and notarized by Apple. The Intel build may still trigger a Gatekeeper warning. If macOS reports that the Intel build is damaged, run this once after installing or updating it:
|
||||
|
||||
```bash
|
||||
xattr -cr /Applications/HelixNotes.app
|
||||
```
|
||||
|
||||
### Android
|
||||
|
||||
[Download APK](https://download.helixnotes.com/releases/v1.3.4/HelixNotes_1.3.4_android.apk)
|
||||
[Download APK](https://download.helixnotes.com/releases/v1.3.5/HelixNotes_1.3.5_android.apk)
|
||||
|
||||
---
|
||||
|
||||
|
||||
+9
-3
@@ -2,8 +2,9 @@
|
||||
"name": "helixnotes",
|
||||
"private": true,
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"version": "1.3.5",
|
||||
"version": "1.3.6",
|
||||
"type": "module",
|
||||
"packageManager": "pnpm@11.18.0",
|
||||
"scripts": {
|
||||
"dev": "vite dev",
|
||||
"build": "vite build",
|
||||
@@ -35,18 +36,23 @@
|
||||
"vite": "^7.3.6"
|
||||
},
|
||||
"dependencies": {
|
||||
"@codemirror/commands": "^6.11.1",
|
||||
"@codemirror/lang-markdown": "^6.5.2",
|
||||
"@codemirror/language": "^6.12.4",
|
||||
"@codemirror/state": "^6.7.6",
|
||||
"@codemirror/view": "^6.43.13",
|
||||
"@lezer/highlight": "^1.2.4",
|
||||
"@tauri-apps/api": "^2.10.1",
|
||||
"@tauri-apps/plugin-dialog": "^2.6.0",
|
||||
"@tauri-apps/plugin-fs": "^2.4.5",
|
||||
"@tauri-apps/plugin-updater": "^2.10.0",
|
||||
"@tiptap/core": "^3.19.0",
|
||||
"@tiptap/extension-code-block-lowlight": "^3.19.0",
|
||||
"@tiptap/extension-code-block": "^3.19.0",
|
||||
"@tiptap/extension-color": "^3.19.0",
|
||||
"@tiptap/extension-details": "^3.19.0",
|
||||
"@tiptap/extension-highlight": "^3.19.0",
|
||||
"@tiptap/extension-image": "^3.19.0",
|
||||
"@tiptap/extension-link": "^3.19.0",
|
||||
"@tiptap/extension-placeholder": "^3.19.0",
|
||||
"@tiptap/extension-subscript": "^3.19.0",
|
||||
"@tiptap/extension-superscript": "^3.19.0",
|
||||
"@tiptap/extension-table": "^3.19.0",
|
||||
|
||||
Generated
+194
-31
@@ -11,6 +11,24 @@ importers:
|
||||
|
||||
.:
|
||||
dependencies:
|
||||
'@codemirror/commands':
|
||||
specifier: ^6.11.1
|
||||
version: 6.11.1
|
||||
'@codemirror/lang-markdown':
|
||||
specifier: ^6.5.2
|
||||
version: 6.5.2
|
||||
'@codemirror/language':
|
||||
specifier: ^6.12.4
|
||||
version: 6.12.4
|
||||
'@codemirror/state':
|
||||
specifier: ^6.7.6
|
||||
version: 6.7.6
|
||||
'@codemirror/view':
|
||||
specifier: ^6.43.13
|
||||
version: 6.43.13
|
||||
'@lezer/highlight':
|
||||
specifier: ^1.2.4
|
||||
version: 1.2.4
|
||||
'@tauri-apps/api':
|
||||
specifier: ^2.10.1
|
||||
version: 2.10.1
|
||||
@@ -26,9 +44,9 @@ importers:
|
||||
'@tiptap/core':
|
||||
specifier: ^3.19.0
|
||||
version: 3.19.0(@tiptap/pm@3.19.0)
|
||||
'@tiptap/extension-code-block-lowlight':
|
||||
'@tiptap/extension-code-block':
|
||||
specifier: ^3.19.0
|
||||
version: 3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/extension-code-block@3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0)(highlight.js@11.11.1)(lowlight@3.3.0)
|
||||
version: 3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0)
|
||||
'@tiptap/extension-color':
|
||||
specifier: ^3.19.0
|
||||
version: 3.19.0(@tiptap/extension-text-style@3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0)))
|
||||
@@ -44,9 +62,6 @@ importers:
|
||||
'@tiptap/extension-link':
|
||||
specifier: ^3.19.0
|
||||
version: 3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0)
|
||||
'@tiptap/extension-placeholder':
|
||||
specifier: ^3.19.0
|
||||
version: 3.19.0(@tiptap/extensions@3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0))
|
||||
'@tiptap/extension-subscript':
|
||||
specifier: ^3.19.0
|
||||
version: 3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0)
|
||||
@@ -178,6 +193,36 @@ packages:
|
||||
'@chevrotain/types@11.1.2':
|
||||
resolution: {integrity: sha512-U+HFai5+zmJCkK86QsaJtoITlboZHBqrVketcO2ROv865xfCMSFpELQoz1GkX5GzME8pTa+3kbKrZHQtI0gdbw==}
|
||||
|
||||
'@codemirror/autocomplete@6.20.3':
|
||||
resolution: {integrity: sha512-tlosUqb+3BbxCxZdu4tKeRghPFC+QM7q4X5YhKV2eCmPG+1r2F3f4AaSz5sCrFqUtX4Jh20VFTKecl16MgiV9g==}
|
||||
|
||||
'@codemirror/commands@6.11.1':
|
||||
resolution: {integrity: sha512-O/4hG3SC1YwcmQ0d2UVNDs+AsaNWd1iHVxbTeEBuqH+6bExAiPK3iS/BvpY6rZGURALv4ZD3sIgcCmRvw3ehBg==}
|
||||
|
||||
'@codemirror/lang-css@6.3.1':
|
||||
resolution: {integrity: sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg==}
|
||||
|
||||
'@codemirror/lang-html@6.4.12':
|
||||
resolution: {integrity: sha512-pw2ReWKUqSkbvh76RAT4NYxiogRu+PWkR2ukAwO9uOgrm8uipkzjtKKtNpyeAQwHOqxEeSvAXZ6vr3AfyB9y/w==}
|
||||
|
||||
'@codemirror/lang-javascript@6.2.5':
|
||||
resolution: {integrity: sha512-zD4e5mS+50htS7F+TYjBPsiIFGanfVqg4HyUz6WNFikgOPf2BgKlx+TQedI1w6n/IqRBVBbBWmGFdLB/7uxO4A==}
|
||||
|
||||
'@codemirror/lang-markdown@6.5.2':
|
||||
resolution: {integrity: sha512-AwBOdkWYuA//WcM0xO5PfHPUcmz/O2i5o0Nsg1U69SII/loCJlFI1Romd9xp2HYb1kYJRGZotyqRghuHH5n8Kw==}
|
||||
|
||||
'@codemirror/language@6.12.4':
|
||||
resolution: {integrity: sha512-1q4PaT+o6PbgpkJt4Q8Fv5XJxTy4FUZ4MWETtyiDw3J0Pyr9E2vqcKL+k9wcvjNTIsauxvE7OfmWj3FRPHQ76A==}
|
||||
|
||||
'@codemirror/lint@6.9.7':
|
||||
resolution: {integrity: sha512-28/+iWLYxKxsvGYhSYL7zaCZqLz5+FFFDq9tVsvGv9kv8RY4fFAchJ5WX9M3YrrRlTIsECjsXPqeNgnSmNP2dg==}
|
||||
|
||||
'@codemirror/state@6.7.6':
|
||||
resolution: {integrity: sha512-kAz+AncRtKuIknedxT1bq4XwXv4UowhbkHU1myPrtVb/jZtImWuV5BXzv5vK6i3kYACsdiZiQKFQQ5Mq7elW8w==}
|
||||
|
||||
'@codemirror/view@6.43.13':
|
||||
resolution: {integrity: sha512-sihaFrUzAsYBQsL9J2t69y8nfMQGwcYmggAZsk+kjPbjYZMyuf2hU8tUNTZ+P+isb6XRr8JE22TZlJxBoVdH1A==}
|
||||
|
||||
'@esbuild/aix-ppc64@0.28.2':
|
||||
resolution: {integrity: sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==}
|
||||
engines: {node: '>=18'}
|
||||
@@ -356,6 +401,30 @@ packages:
|
||||
'@jridgewell/trace-mapping@0.3.31':
|
||||
resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
|
||||
|
||||
'@lezer/common@1.5.3':
|
||||
resolution: {integrity: sha512-H0iErY4e43LpXbYDyBci5W4v/RwTgGV3YzYOlJPiGZ8RY8w51kVE+xLn1tg3Z6UmSfyETvtsUK3r7YsgDQEI7Q==}
|
||||
|
||||
'@lezer/css@1.3.8':
|
||||
resolution: {integrity: sha512-EJn1zcL9qoDptief6ipWKZKLiOpXkxSe0+t8CH9oiMVcZlq7NBWrjCqnc/41EIjeo/ITj1gFFiATdTkaJDL+Og==}
|
||||
|
||||
'@lezer/highlight@1.2.4':
|
||||
resolution: {integrity: sha512-4UeRVFO0lsBaM7GA32zOqbmqNPme9jedo8Ey+5c5656MU3MLitMLIA8aCZTYjUMEpEsuSeXEm78Uea6Iq3bvSg==}
|
||||
|
||||
'@lezer/html@1.3.13':
|
||||
resolution: {integrity: sha512-oI7n6NJml729m7pjm9lvLvmXbdoMoi2f+1pwSDJkl9d68zGr7a9Btz8NdHTGQZtW2DA25ybeuv/SyDb9D5tseg==}
|
||||
|
||||
'@lezer/javascript@1.5.5':
|
||||
resolution: {integrity: sha512-sWg4yX1J6XW67AaAynVt0iwF0M5c+np36TEu+P2ifAJ8haRYvHnWDV28r1jdwnJehWCwXECutAUy56K4RBZIyg==}
|
||||
|
||||
'@lezer/lr@1.4.10':
|
||||
resolution: {integrity: sha512-rnCpTIBafOx4mRp43xOxDJbFipJm/c0cia/V5TiGlhmMa+wsSdoGmUN3w5Bqrks/09Q/D4tNAmWaT8p6NRi77A==}
|
||||
|
||||
'@lezer/markdown@1.7.2':
|
||||
resolution: {integrity: sha512-iTkYvoVcKt3WkeL7qUDyXHONZEwLio4wj8KTNi2dnjQEXBZKMV63BpQrPqfsM+OkvuRbiSTAcycYAsQzLhRNoQ==}
|
||||
|
||||
'@marijn/find-cluster-break@1.0.4':
|
||||
resolution: {integrity: sha512-Wy0V7+SGUjnF9/TkiM1hKVDPj7jKXduPNboMVtHTA8dySMURWqfg/JZ9E2Sq8JgSJmkl7k7Qe9FLeMSrSraWmQ==}
|
||||
|
||||
'@mermaid-js/parser@1.2.0':
|
||||
resolution: {integrity: sha512-oYPyv8A4As1yH5Bx+04iQEQxXuIQDe0GKCNSRgao6z8AM9jixXIfP0vsppRLvGf+nKIOb9/LdpWA4YuJiVvESA==}
|
||||
|
||||
@@ -764,15 +833,6 @@ packages:
|
||||
peerDependencies:
|
||||
'@tiptap/extension-list': ^3.19.0
|
||||
|
||||
'@tiptap/extension-code-block-lowlight@3.19.0':
|
||||
resolution: {integrity: sha512-P8O8i1J+XozEVA7bF/Ijwf/r1rVqrh1DBQ7dXxBcrUvLpIGyVjtxX228jBF/kD4kf2xOlphvjDhV2fLa8XOVsg==}
|
||||
peerDependencies:
|
||||
'@tiptap/core': ^3.19.0
|
||||
'@tiptap/extension-code-block': ^3.19.0
|
||||
'@tiptap/pm': ^3.19.0
|
||||
highlight.js: ^11
|
||||
lowlight: ^2 || ^3
|
||||
|
||||
'@tiptap/extension-code-block@3.19.0':
|
||||
resolution: {integrity: sha512-b/2qR+tMn8MQb+eaFYgVk4qXnLNkkRYmwELQ8LEtEDQPxa5Vl7J3eu8+4OyoIFhZrNDZvvoEp80kHMCP8sI6rg==}
|
||||
peerDependencies:
|
||||
@@ -874,11 +934,6 @@ packages:
|
||||
peerDependencies:
|
||||
'@tiptap/core': ^3.19.0
|
||||
|
||||
'@tiptap/extension-placeholder@3.19.0':
|
||||
resolution: {integrity: sha512-i15OfgyI4IDCYAcYSKUMnuZkYuUInfanjf9zquH8J2BETiomf/jZldVCp/QycMJ8DOXZ38fXDc99wOygnSNySg==}
|
||||
peerDependencies:
|
||||
'@tiptap/extensions': ^3.19.0
|
||||
|
||||
'@tiptap/extension-strike@3.19.0':
|
||||
resolution: {integrity: sha512-xYpabHsv7PccLUBQaP8AYiFCnYbx6P93RHPd0lgNwhdOjYFd931Zy38RyoxPHAgbYVmhf1iyx7lpuLtBnhS5dA==}
|
||||
peerDependencies:
|
||||
@@ -1680,6 +1735,9 @@ packages:
|
||||
resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
|
||||
engines: {node: '>=0.10.0'}
|
||||
|
||||
style-mod@4.1.4:
|
||||
resolution: {integrity: sha512-XXWIQt633/EpAFx8aZDOTjBzrCaGmhvEQlQo6MVPfa2OzO2cWo+4hV9h+6UkHYlXGfy+ODXKUdP7Pthmcu5ATw==}
|
||||
|
||||
stylis@4.4.0:
|
||||
resolution: {integrity: sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA==}
|
||||
|
||||
@@ -1800,6 +1858,86 @@ snapshots:
|
||||
|
||||
'@chevrotain/types@11.1.2': {}
|
||||
|
||||
'@codemirror/autocomplete@6.20.3':
|
||||
dependencies:
|
||||
'@codemirror/language': 6.12.4
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.13
|
||||
'@lezer/common': 1.5.3
|
||||
|
||||
'@codemirror/commands@6.11.1':
|
||||
dependencies:
|
||||
'@codemirror/language': 6.12.4
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.13
|
||||
'@lezer/common': 1.5.3
|
||||
|
||||
'@codemirror/lang-css@6.3.1':
|
||||
dependencies:
|
||||
'@codemirror/autocomplete': 6.20.3
|
||||
'@codemirror/language': 6.12.4
|
||||
'@codemirror/state': 6.7.6
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/css': 1.3.8
|
||||
|
||||
'@codemirror/lang-html@6.4.12':
|
||||
dependencies:
|
||||
'@codemirror/autocomplete': 6.20.3
|
||||
'@codemirror/lang-css': 6.3.1
|
||||
'@codemirror/lang-javascript': 6.2.5
|
||||
'@codemirror/language': 6.12.4
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.13
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/css': 1.3.8
|
||||
'@lezer/html': 1.3.13
|
||||
|
||||
'@codemirror/lang-javascript@6.2.5':
|
||||
dependencies:
|
||||
'@codemirror/autocomplete': 6.20.3
|
||||
'@codemirror/language': 6.12.4
|
||||
'@codemirror/lint': 6.9.7
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.13
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/javascript': 1.5.5
|
||||
|
||||
'@codemirror/lang-markdown@6.5.2':
|
||||
dependencies:
|
||||
'@codemirror/autocomplete': 6.20.3
|
||||
'@codemirror/lang-html': 6.4.12
|
||||
'@codemirror/language': 6.12.4
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.13
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/markdown': 1.7.2
|
||||
|
||||
'@codemirror/language@6.12.4':
|
||||
dependencies:
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.13
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/highlight': 1.2.4
|
||||
'@lezer/lr': 1.4.10
|
||||
style-mod: 4.1.4
|
||||
|
||||
'@codemirror/lint@6.9.7':
|
||||
dependencies:
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.13
|
||||
crelt: 1.0.6
|
||||
|
||||
'@codemirror/state@6.7.6':
|
||||
dependencies:
|
||||
'@marijn/find-cluster-break': 1.0.4
|
||||
|
||||
'@codemirror/view@6.43.13':
|
||||
dependencies:
|
||||
'@codemirror/state': 6.7.6
|
||||
crelt: 1.0.6
|
||||
style-mod: 4.1.4
|
||||
w3c-keyname: 2.2.8
|
||||
|
||||
'@esbuild/aix-ppc64@0.28.2':
|
||||
optional: true
|
||||
|
||||
@@ -1905,6 +2043,41 @@ snapshots:
|
||||
'@jridgewell/resolve-uri': 3.1.2
|
||||
'@jridgewell/sourcemap-codec': 1.5.5
|
||||
|
||||
'@lezer/common@1.5.3': {}
|
||||
|
||||
'@lezer/css@1.3.8':
|
||||
dependencies:
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/highlight': 1.2.4
|
||||
'@lezer/lr': 1.4.10
|
||||
|
||||
'@lezer/highlight@1.2.4':
|
||||
dependencies:
|
||||
'@lezer/common': 1.5.3
|
||||
|
||||
'@lezer/html@1.3.13':
|
||||
dependencies:
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/highlight': 1.2.4
|
||||
'@lezer/lr': 1.4.10
|
||||
|
||||
'@lezer/javascript@1.5.5':
|
||||
dependencies:
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/highlight': 1.2.4
|
||||
'@lezer/lr': 1.4.10
|
||||
|
||||
'@lezer/lr@1.4.10':
|
||||
dependencies:
|
||||
'@lezer/common': 1.5.3
|
||||
|
||||
'@lezer/markdown@1.7.2':
|
||||
dependencies:
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/highlight': 1.2.4
|
||||
|
||||
'@marijn/find-cluster-break@1.0.4': {}
|
||||
|
||||
'@mermaid-js/parser@1.2.0':
|
||||
dependencies:
|
||||
'@chevrotain/types': 11.1.2
|
||||
@@ -2195,14 +2368,6 @@ snapshots:
|
||||
dependencies:
|
||||
'@tiptap/extension-list': 3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0)
|
||||
|
||||
'@tiptap/extension-code-block-lowlight@3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/extension-code-block@3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0)(highlight.js@11.11.1)(lowlight@3.3.0)':
|
||||
dependencies:
|
||||
'@tiptap/core': 3.19.0(@tiptap/pm@3.19.0)
|
||||
'@tiptap/extension-code-block': 3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0)
|
||||
'@tiptap/pm': 3.19.0
|
||||
highlight.js: 11.11.1
|
||||
lowlight: 3.3.0
|
||||
|
||||
'@tiptap/extension-code-block@3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0)':
|
||||
dependencies:
|
||||
'@tiptap/core': 3.19.0(@tiptap/pm@3.19.0)
|
||||
@@ -2286,10 +2451,6 @@ snapshots:
|
||||
dependencies:
|
||||
'@tiptap/core': 3.19.0(@tiptap/pm@3.19.0)
|
||||
|
||||
'@tiptap/extension-placeholder@3.19.0(@tiptap/extensions@3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0))':
|
||||
dependencies:
|
||||
'@tiptap/extensions': 3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))(@tiptap/pm@3.19.0)
|
||||
|
||||
'@tiptap/extension-strike@3.19.0(@tiptap/core@3.19.0(@tiptap/pm@3.19.0))':
|
||||
dependencies:
|
||||
'@tiptap/core': 3.19.0(@tiptap/pm@3.19.0)
|
||||
@@ -3193,6 +3354,8 @@ snapshots:
|
||||
|
||||
source-map-js@1.2.1: {}
|
||||
|
||||
style-mod@4.1.4: {}
|
||||
|
||||
stylis@4.4.0: {}
|
||||
|
||||
svelte-check@4.3.6(picomatch@4.0.5)(svelte@5.56.9)(typescript@5.9.3):
|
||||
|
||||
Generated
+7
-2
@@ -1,6 +1,6 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
version = 4
|
||||
|
||||
[[package]]
|
||||
name = "adler2"
|
||||
@@ -1776,17 +1776,21 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "helixnotes"
|
||||
version = "1.3.5"
|
||||
version = "1.3.6"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"arboard",
|
||||
"chrono",
|
||||
"dirs",
|
||||
"fs4",
|
||||
"futures",
|
||||
"gray_matter",
|
||||
"image",
|
||||
"libc",
|
||||
"log",
|
||||
"notify",
|
||||
"objc2-app-kit",
|
||||
"parking_lot",
|
||||
"png 0.17.16",
|
||||
"quick-xml",
|
||||
"rayon",
|
||||
@@ -1809,6 +1813,7 @@ dependencies = [
|
||||
"tauri-plugin-single-instance",
|
||||
"tauri-plugin-updater",
|
||||
"tauri-plugin-window-state",
|
||||
"tempfile",
|
||||
"tokio",
|
||||
"urlencoding",
|
||||
"uuid",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "helixnotes"
|
||||
version = "1.3.5"
|
||||
version = "1.3.6"
|
||||
description = "Local markdown note-taking app"
|
||||
authors = ["HelixNotes"]
|
||||
license = "AGPL-3.0-or-later"
|
||||
@@ -32,7 +32,9 @@ serde_json = "1"
|
||||
serde_yaml = "0.9"
|
||||
log = "0.4"
|
||||
notify = "8"
|
||||
parking_lot = "0.12"
|
||||
walkdir = "2"
|
||||
tempfile = "3"
|
||||
chrono = { version = "0.4", features = ["serde", "unstable-locales"] }
|
||||
sys-locale = "0.3"
|
||||
uuid = { version = "1", features = ["v4"] }
|
||||
@@ -41,6 +43,7 @@ gray_matter = "0.2"
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
dirs = "6"
|
||||
regex = "1"
|
||||
aho-corasick = "1"
|
||||
zip = { version = "2", default-features = false, features = ["deflate"] }
|
||||
reqwest = { version = "0.12", default-features = false, features = ["json", "stream", "rustls-tls", "blocking"] }
|
||||
futures = "0.3"
|
||||
@@ -48,10 +51,14 @@ rayon = "1"
|
||||
quick-xml = "0.41"
|
||||
urlencoding = "2"
|
||||
sha2 = "0.10"
|
||||
fs4 = { version = "0.8", default-features = false }
|
||||
rustls = { version = "0.23", default-features = false, features = ["ring", "logging", "std", "tls12"] }
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
objc2-app-kit = "0.3.2"
|
||||
|
||||
[target.'cfg(target_os = "android")'.dependencies]
|
||||
libc = "0.2"
|
||||
|
||||
[target.'cfg(target_os = "ios")'.dependencies]
|
||||
tauri-plugin-ios-vault-access = { path = "plugins/ios-vault-access" }
|
||||
|
||||
|
||||
@@ -35,6 +35,16 @@ class MainActivity : TauriActivity() {
|
||||
webView.settings.layoutAlgorithm = android.webkit.WebSettings.LayoutAlgorithm.NORMAL
|
||||
}
|
||||
|
||||
override fun onPause() {
|
||||
// Give the editor a chance to persist its current document before Android
|
||||
// suspends the WebView. The save remains best-effort when the process is killed.
|
||||
webView?.evaluateJavascript(
|
||||
"window.dispatchEvent(new Event('app-lifecycle-flush'))",
|
||||
null
|
||||
)
|
||||
super.onPause()
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
if (hasStoragePermission()) {
|
||||
|
||||
+78
-46
@@ -89,6 +89,7 @@ pub fn ai_request(
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.clone(),
|
||||
event_type: "error".to_string(),
|
||||
text: None,
|
||||
error: Some(e),
|
||||
@@ -109,13 +110,40 @@ fn normalize_openai_base(base: &str) -> String {
|
||||
.to_string()
|
||||
}
|
||||
|
||||
fn openai_request_body(
|
||||
model: &str,
|
||||
system_prompt: Option<&str>,
|
||||
user_message: &str,
|
||||
stream: bool,
|
||||
max_tokens: u32,
|
||||
) -> serde_json::Value {
|
||||
// GPT-5/6 reject legacy output limits and sampling with their default reasoning.
|
||||
let reasoning = model.starts_with("gpt-5") || model.starts_with("gpt-6");
|
||||
let token_key = if reasoning {
|
||||
"max_completion_tokens"
|
||||
} else {
|
||||
"max_tokens"
|
||||
};
|
||||
let mut messages = Vec::with_capacity(if system_prompt.is_some() { 2 } else { 1 });
|
||||
if let Some(system) = system_prompt {
|
||||
messages.push(json!({ "role": "system", "content": system }));
|
||||
}
|
||||
messages.push(json!({ "role": "user", "content": user_message }));
|
||||
let mut body =
|
||||
json!({ "model": model, "stream": stream, token_key: max_tokens, "messages": messages });
|
||||
if stream && !reasoning {
|
||||
body["temperature"] = json!(0.7);
|
||||
}
|
||||
body
|
||||
}
|
||||
|
||||
async fn stream_anthropic(
|
||||
app: &AppHandle,
|
||||
api_key: &str,
|
||||
model: &str,
|
||||
system_prompt: &str,
|
||||
user_message: &str,
|
||||
_request_id: &str,
|
||||
request_id: &str,
|
||||
) -> Result<(), String> {
|
||||
let client = Client::new();
|
||||
|
||||
@@ -168,6 +196,7 @@ async fn stream_anthropic(
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
@@ -185,6 +214,7 @@ async fn stream_anthropic(
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "text".to_string(),
|
||||
text: Some(text.to_string()),
|
||||
error: None,
|
||||
@@ -196,6 +226,7 @@ async fn stream_anthropic(
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
@@ -210,6 +241,7 @@ async fn stream_anthropic(
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "error".to_string(),
|
||||
text: None,
|
||||
error: Some(msg.to_string()),
|
||||
@@ -228,6 +260,7 @@ async fn stream_anthropic(
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
@@ -244,37 +277,11 @@ async fn stream_openai(
|
||||
model: &str,
|
||||
system_prompt: &str,
|
||||
user_message: &str,
|
||||
_request_id: &str,
|
||||
request_id: &str,
|
||||
) -> Result<(), String> {
|
||||
let client = Client::new();
|
||||
|
||||
let is_gpt5 = model.starts_with("gpt-5");
|
||||
let token_key = if is_gpt5 {
|
||||
"max_completion_tokens"
|
||||
} else {
|
||||
"max_tokens"
|
||||
};
|
||||
|
||||
let mut body = json!({
|
||||
"model": model,
|
||||
"stream": true,
|
||||
token_key: 4096,
|
||||
"messages": [
|
||||
{
|
||||
"role": "system",
|
||||
"content": system_prompt
|
||||
},
|
||||
{
|
||||
"role": "user",
|
||||
"content": user_message
|
||||
}
|
||||
]
|
||||
});
|
||||
|
||||
// GPT-5 models don't support temperature
|
||||
if !is_gpt5 {
|
||||
body["temperature"] = json!(0.7);
|
||||
}
|
||||
let body = openai_request_body(model, Some(system_prompt), user_message, true, 4096);
|
||||
|
||||
let mut req = client.post(url).header("content-type", "application/json");
|
||||
|
||||
@@ -312,6 +319,7 @@ async fn stream_openai(
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
@@ -327,6 +335,7 @@ async fn stream_openai(
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "text".to_string(),
|
||||
text: Some(content.to_string()),
|
||||
error: None,
|
||||
@@ -341,6 +350,7 @@ async fn stream_openai(
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
@@ -355,6 +365,7 @@ async fn stream_openai(
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "error".to_string(),
|
||||
text: None,
|
||||
error: Some(err.to_string()),
|
||||
@@ -371,6 +382,7 @@ async fn stream_openai(
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
@@ -445,23 +457,7 @@ async fn test_anthropic(api_key: &str, model: &str) -> Result<String, String> {
|
||||
|
||||
async fn test_openai(url: &str, api_key: Option<&str>, model: &str) -> Result<String, String> {
|
||||
let client = Client::new();
|
||||
let is_gpt5 = model.starts_with("gpt-5");
|
||||
let token_key = if is_gpt5 {
|
||||
"max_completion_tokens"
|
||||
} else {
|
||||
"max_tokens"
|
||||
};
|
||||
|
||||
let body = json!({
|
||||
"model": model,
|
||||
token_key: 20,
|
||||
"messages": [
|
||||
{
|
||||
"role": "user",
|
||||
"content": "Hi"
|
||||
}
|
||||
]
|
||||
});
|
||||
let body = openai_request_body(model, None, "Hi", false, 20);
|
||||
|
||||
let mut req = client.post(url).header("content-type", "application/json");
|
||||
|
||||
@@ -483,3 +479,39 @@ async fn test_openai(url: &str, api_key: Option<&str>, model: &str) -> Result<St
|
||||
Err(format!("API error {}: {}", status, body_text))
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod request_tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn gpt6_streaming_requests_use_supported_parameters() {
|
||||
let body = openai_request_body(
|
||||
"gpt-6-astra",
|
||||
Some("Return Markdown"),
|
||||
"Revise this",
|
||||
true,
|
||||
4096,
|
||||
);
|
||||
assert_eq!(body["max_completion_tokens"], 4096);
|
||||
assert!(body.get("max_tokens").is_none());
|
||||
assert!(body.get("temperature").is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn prior_openai_and_local_models_keep_their_parameter_contract() {
|
||||
let prior = openai_request_body("gpt-5.5", None, "Hi", false, 20);
|
||||
assert!(prior.get("max_completion_tokens").is_some());
|
||||
assert!(prior.get("max_tokens").is_none());
|
||||
let local = openai_request_body(
|
||||
"gemma3:4b",
|
||||
Some("Return Markdown"),
|
||||
"Revise this",
|
||||
true,
|
||||
4096,
|
||||
);
|
||||
assert_eq!(local["max_tokens"], 4096);
|
||||
assert_eq!(local["temperature"], 0.7);
|
||||
assert!(local.get("max_completion_tokens").is_none());
|
||||
}
|
||||
}
|
||||
+967
-172
File diff suppressed because it is too large.
Load diff
+2403
-708
File diff suppressed because it is too large.
Load diff
+136
-53
@@ -24,6 +24,63 @@ fn history_dir(vault_path: &str, note_id: &str) -> Result<PathBuf, String> {
|
||||
.join(safe_path_component(note_id, "note ID")?))
|
||||
}
|
||||
|
||||
fn snapshot_path(dir: &Path, raw_content: &str) -> Result<(), String> {
|
||||
use std::io::Write;
|
||||
let mut temporary = tempfile::Builder::new()
|
||||
.prefix(".helixnotes-history-")
|
||||
.tempfile_in(dir)
|
||||
.map_err(|error| error.to_string())?;
|
||||
temporary
|
||||
.write_all(raw_content.as_bytes())
|
||||
.map_err(|error| error.to_string())?;
|
||||
temporary
|
||||
.as_file()
|
||||
.sync_all()
|
||||
.map_err(|error| error.to_string())?;
|
||||
let mut instant = Utc::now();
|
||||
loop {
|
||||
// Fractional seconds keep timestamps valid RFC3339 for the UI while
|
||||
// allowing multiple versions within one second.
|
||||
let timestamp = instant.format("%Y-%m-%dT%H-%M-%S%.3f");
|
||||
let path = dir.join(format!("{timestamp}.md"));
|
||||
match temporary.persist_noclobber(&path) {
|
||||
Ok(_) => return Ok(()),
|
||||
Err(error) if error.error.kind() == std::io::ErrorKind::AlreadyExists => {
|
||||
temporary = error.file;
|
||||
instant += chrono::Duration::milliseconds(1);
|
||||
}
|
||||
Err(error) => return Err(error.error.to_string()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn version_timestamp(filename: &str) -> String {
|
||||
match (filename.get(..13), filename.get(14..16), filename.get(17..)) {
|
||||
(Some(hour), Some(minute), Some(rest))
|
||||
if filename.as_bytes().get(10) == Some(&b'T')
|
||||
&& filename.as_bytes().get(13) == Some(&b'-')
|
||||
&& filename.as_bytes().get(16) == Some(&b'-') =>
|
||||
{
|
||||
format!("{hour}:{minute}:{rest}Z")
|
||||
}
|
||||
_ => filename.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
fn snapshot_filename(timestamp: &str) -> String {
|
||||
let time = timestamp.strip_suffix('Z').unwrap_or(timestamp);
|
||||
match (time.get(..13), time.get(14..16), time.get(17..)) {
|
||||
(Some(hour), Some(minute), Some(rest))
|
||||
if time.as_bytes().get(10) == Some(&b'T')
|
||||
&& time.as_bytes().get(13) == Some(&b':')
|
||||
&& time.as_bytes().get(16) == Some(&b':') =>
|
||||
{
|
||||
format!("{hour}-{minute}-{rest}.md")
|
||||
}
|
||||
_ => format!("{timestamp}.md"),
|
||||
}
|
||||
}
|
||||
|
||||
/// Save a version snapshot if enough time has passed since the last one.
|
||||
/// Minimum interval: 5 minutes between snapshots.
|
||||
pub fn maybe_snapshot(vault_path: &str, note_id: &str, raw_content: &str, max_versions: u32) {
|
||||
@@ -32,31 +89,34 @@ pub fn maybe_snapshot(vault_path: &str, note_id: &str, raw_content: &str, max_ve
|
||||
return;
|
||||
};
|
||||
|
||||
// Check if we should create a snapshot (5 min cooldown)
|
||||
// Old second-resolution and new fractional-second names share the first
|
||||
// 19 ASCII bytes. Ignore arbitrary files (including malformed Unicode).
|
||||
if let Ok(entries) = fs::read_dir(&dir) {
|
||||
let mut files: Vec<String> = entries
|
||||
.filter_map(|e| e.ok())
|
||||
.filter_map(|e| e.file_name().to_str().map(|s| s.to_string()))
|
||||
.filter(|n| n.ends_with(".md"))
|
||||
.collect();
|
||||
files.sort();
|
||||
|
||||
if let Some(last) = files.last() {
|
||||
if let Some(ts) = last.strip_suffix(".md") {
|
||||
// Parse timestamp: 2026-02-08T18-30-00.md
|
||||
if let Some(t_pos) = ts.find('T') {
|
||||
let date_part = &ts[..t_pos];
|
||||
let time_part = &ts[t_pos + 1..];
|
||||
let time_colons = time_part.replace('-', ":");
|
||||
let iso = format!("{}T{}Z", date_part, time_colons);
|
||||
if let Ok(last_time) = iso.parse::<DateTime<Utc>>() {
|
||||
let elapsed = Utc::now() - last_time;
|
||||
if elapsed.num_minutes() < 5 {
|
||||
return; // Too soon, skip
|
||||
}
|
||||
}
|
||||
let latest = entries
|
||||
.filter_map(|entry| {
|
||||
let name = entry.ok()?.file_name();
|
||||
let name = name.to_str()?;
|
||||
if !name.ends_with(".md") {
|
||||
return None;
|
||||
}
|
||||
}
|
||||
let (Some(hour), Some(minute), Some(second)) =
|
||||
(name.get(..13), name.get(14..16), name.get(17..19))
|
||||
else {
|
||||
return None;
|
||||
};
|
||||
if name.as_bytes().get(10) != Some(&b'T')
|
||||
|| name.as_bytes().get(13) != Some(&b'-')
|
||||
|| name.as_bytes().get(16) != Some(&b'-')
|
||||
{
|
||||
return None;
|
||||
}
|
||||
format!("{hour}:{minute}:{second}Z")
|
||||
.parse::<DateTime<Utc>>()
|
||||
.ok()
|
||||
})
|
||||
.max();
|
||||
if latest.is_some_and(|last| (Utc::now() - last).num_minutes() < 5) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,12 +126,8 @@ pub fn maybe_snapshot(vault_path: &str, note_id: &str, raw_content: &str, max_ve
|
||||
return;
|
||||
}
|
||||
|
||||
let timestamp = Utc::now().format("%Y-%m-%dT%H-%M-%S").to_string();
|
||||
let filename = format!("{}.md", timestamp);
|
||||
let path = dir.join(&filename);
|
||||
|
||||
if let Err(e) = fs::write(&path, raw_content) {
|
||||
eprintln!("Failed to write version snapshot: {}", e);
|
||||
if let Err(error) = snapshot_path(&dir, raw_content) {
|
||||
eprintln!("Failed to write version snapshot: {error}");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -91,11 +147,7 @@ pub fn force_snapshot(
|
||||
let dir = history_dir(vault_path, note_id)?;
|
||||
fs::create_dir_all(&dir).map_err(|error| error.to_string())?;
|
||||
|
||||
let timestamp = Utc::now().format("%Y-%m-%dT%H-%M-%S").to_string();
|
||||
let filename = format!("{}.md", timestamp);
|
||||
let path = dir.join(&filename);
|
||||
|
||||
fs::write(&path, raw_content).map_err(|error| error.to_string())?;
|
||||
snapshot_path(&dir, raw_content)?;
|
||||
|
||||
if max_versions > 0 {
|
||||
prune_versions(&dir, max_versions)?;
|
||||
@@ -123,16 +175,7 @@ pub fn list_versions(vault_path: &str, note_id: &str) -> Result<Vec<VersionEntry
|
||||
.to_string();
|
||||
let meta = fs::metadata(&path).map_err(|e| e.to_string())?;
|
||||
|
||||
// Parse timestamp from filename
|
||||
let timestamp = if let Some(t_pos) = filename.find('T') {
|
||||
let date_part = &filename[..t_pos];
|
||||
let time_part = &filename[t_pos + 1..];
|
||||
let time_colons = time_part.replace('-', ":");
|
||||
format!("{}T{}Z", date_part, time_colons)
|
||||
} else {
|
||||
filename.clone()
|
||||
};
|
||||
|
||||
let timestamp = version_timestamp(&filename);
|
||||
entries.push(VersionEntry {
|
||||
timestamp,
|
||||
size: meta.len(),
|
||||
@@ -148,15 +191,8 @@ pub fn list_versions(vault_path: &str, note_id: &str) -> Result<Vec<VersionEntry
|
||||
/// Get the raw content of a specific version.
|
||||
pub fn get_version(vault_path: &str, note_id: &str, timestamp: &str) -> Result<String, String> {
|
||||
safe_path_component(timestamp, "version timestamp")?;
|
||||
// Convert ISO timestamp back to filename: 2026-02-08T18:30:00Z → 2026-02-08T18-30-00.md
|
||||
let filename = if let Some(t_pos) = timestamp.find('T') {
|
||||
let date_part = ×tamp[..t_pos];
|
||||
let time_part = timestamp[t_pos + 1..].trim_end_matches('Z');
|
||||
let time_dashes = time_part.replace(':', "-");
|
||||
format!("{date_part}T{time_dashes}.md")
|
||||
} else {
|
||||
format!("{}.md", timestamp)
|
||||
};
|
||||
// Accept both legacy second-resolution names and unique suffixes.
|
||||
let filename = snapshot_filename(timestamp);
|
||||
|
||||
let path = history_dir(vault_path, note_id)?.join(&filename);
|
||||
fs::read_to_string(&path).map_err(|e| format!("Version not found: {}", e))
|
||||
@@ -206,4 +242,51 @@ mod tests {
|
||||
|
||||
fs::remove_dir_all(vault).unwrap();
|
||||
}
|
||||
#[test]
|
||||
fn rapid_forced_versions_are_individually_retrievable_and_prunable() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let root = vault.path().to_str().unwrap();
|
||||
for index in 0..200 {
|
||||
super::force_snapshot(root, "note", &format!("snapshot {index}"), 0).unwrap();
|
||||
}
|
||||
let versions = list_versions(root, "note").unwrap();
|
||||
assert_eq!(versions.len(), 200);
|
||||
let contents: std::collections::HashSet<_> = versions
|
||||
.iter()
|
||||
.map(|version| get_version(root, "note", &version.timestamp).unwrap())
|
||||
.collect();
|
||||
assert_eq!(contents.len(), 200);
|
||||
assert!(contents.contains("snapshot 0"));
|
||||
assert!(contents.contains("snapshot 199"));
|
||||
|
||||
super::force_snapshot(root, "note", "latest", 10).unwrap();
|
||||
let retained = list_versions(root, "note").unwrap();
|
||||
assert_eq!(retained.len(), 10);
|
||||
assert_eq!(
|
||||
get_version(root, "note", &retained[0].timestamp).unwrap(),
|
||||
"latest"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn legacy_versions_remain_readable_and_recent_unique_versions_observe_cooldown() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let root = vault.path().to_str().unwrap();
|
||||
let history = vault.path().join(".helixnotes/history/note");
|
||||
fs::create_dir_all(&history).unwrap();
|
||||
fs::write(history.join("2026-01-01T00-00-00.md"), "legacy").unwrap();
|
||||
fs::write(history.join("2026-01-01T1é-00-00.md"), "unusual filename").unwrap();
|
||||
super::force_snapshot(root, "note", "new", 0).unwrap();
|
||||
super::maybe_snapshot(root, "note", "too soon", 0);
|
||||
let versions = list_versions(root, "note").unwrap();
|
||||
assert_eq!(versions.len(), 3);
|
||||
assert_eq!(
|
||||
get_version(root, "note", "2026-01-01T00:00:00Z").unwrap(),
|
||||
"legacy"
|
||||
);
|
||||
assert_eq!(
|
||||
get_version(root, "note", &versions[0].timestamp).unwrap(),
|
||||
"new"
|
||||
);
|
||||
}
|
||||
}
|
||||
+54
-27
@@ -37,8 +37,6 @@ pub fn run() {
|
||||
let config = commands::load_app_config();
|
||||
#[cfg(desktop)]
|
||||
let show_tray = config.show_tray_icon;
|
||||
#[cfg(desktop)]
|
||||
let close_to_tray = config.close_to_tray && show_tray;
|
||||
let app_state = AppState::new(config);
|
||||
|
||||
// Inject the compile-time platform so the frontend never sniffs the (sometimes
|
||||
@@ -148,9 +146,9 @@ pub fn run() {
|
||||
asset_scope::allow_external_note_assets(app.handle(), &resolved);
|
||||
}
|
||||
let app_state = app.state::<AppState>();
|
||||
let _ = app_state.pending_open_file.lock().map(|mut p| {
|
||||
*p = Some(resolved_str.to_string());
|
||||
});
|
||||
if let Err(error) = app_state.enqueue_open_file(resolved_str.to_string()) {
|
||||
log::error!("Could not queue startup file: {error}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -164,6 +162,8 @@ pub fn run() {
|
||||
commands::restore_external_vault,
|
||||
commands::remove_vault,
|
||||
commands::get_app_config,
|
||||
#[cfg(desktop)]
|
||||
commands::complete_window_close,
|
||||
commands::set_theme,
|
||||
commands::set_system_themes,
|
||||
commands::set_accent_color,
|
||||
@@ -173,6 +173,7 @@ pub fn run() {
|
||||
commands::import_custom_themes,
|
||||
commands::set_font_size,
|
||||
commands::set_scroll_to_change_font_size,
|
||||
commands::set_toolbar_layout,
|
||||
commands::set_font_family,
|
||||
commands::set_line_height,
|
||||
commands::set_ui_scale,
|
||||
@@ -216,6 +217,10 @@ pub fn run() {
|
||||
commands::save_attachment,
|
||||
commands::get_notebook_icons,
|
||||
commands::set_notebook_icon,
|
||||
commands::import_notebook_icon,
|
||||
commands::get_tag_styles,
|
||||
commands::set_tag_style,
|
||||
commands::import_tag_icon,
|
||||
commands::set_general_settings,
|
||||
commands::get_quick_access,
|
||||
commands::add_quick_access,
|
||||
@@ -248,6 +253,9 @@ pub fn run() {
|
||||
commands::get_install_type,
|
||||
commands::is_mobile_platform,
|
||||
commands::get_pending_open_file,
|
||||
commands::ack_pending_open_file,
|
||||
#[cfg(desktop)]
|
||||
commands::cancel_window_close,
|
||||
])
|
||||
.register_asynchronous_uri_scheme_protocol("imgproxy", |_ctx, request, responder| {
|
||||
let path = request.uri().path().to_string();
|
||||
@@ -302,7 +310,14 @@ pub fn run() {
|
||||
}
|
||||
let _ = asset_scope::allow_external_note_assets(app, &resolved);
|
||||
}
|
||||
let _ = app.emit("open-file", resolved_str.to_string());
|
||||
if let Err(error) = app
|
||||
.state::<AppState>()
|
||||
.enqueue_open_file(resolved_str.to_string())
|
||||
{
|
||||
log::error!("Could not queue open file: {error}");
|
||||
} else {
|
||||
let _ = app.emit("open-file-pending", ());
|
||||
}
|
||||
}
|
||||
}
|
||||
}));
|
||||
@@ -335,32 +350,44 @@ pub fn run() {
|
||||
queue_macos_traffic_light_fix(window);
|
||||
}
|
||||
|
||||
match event {
|
||||
tauri::WindowEvent::CloseRequested { api, .. } => {
|
||||
// Only hide to tray for the main window
|
||||
if close_to_tray && window.label() == "main" {
|
||||
api.prevent_close();
|
||||
let _ = window.hide();
|
||||
// Closing the main window also requests a save-aware close of note windows.
|
||||
if matches!(event, tauri::WindowEvent::Destroyed) && window.label() == "main" {
|
||||
for (label, win) in window.app_handle().webview_windows() {
|
||||
if label.starts_with("note-") {
|
||||
let _ = win.close();
|
||||
}
|
||||
}
|
||||
tauri::WindowEvent::Destroyed
|
||||
// When main window is destroyed, close all note windows
|
||||
if window.label() == "main" => {
|
||||
let app = window.app_handle();
|
||||
for (label, win) in app.webview_windows() {
|
||||
if label.starts_with("note-") {
|
||||
let _ = win.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
builder
|
||||
.run(tauri::generate_context!())
|
||||
.expect("error while running tauri application");
|
||||
let app = builder
|
||||
.build(tauri::generate_context!())
|
||||
.expect("error while building tauri application");
|
||||
app.run(|app, event| {
|
||||
#[cfg(desktop)]
|
||||
if let tauri::RunEvent::ExitRequested {
|
||||
code: Some(_), api, ..
|
||||
} = event
|
||||
{
|
||||
let windows = app.webview_windows();
|
||||
if !windows.is_empty() {
|
||||
// Menu/tray Quit must give each editor the same save opportunity
|
||||
// as a window close. The app exits once the last window closes.
|
||||
api.prevent_exit();
|
||||
app.state::<AppState>()
|
||||
.quitting
|
||||
.store(true, std::sync::atomic::Ordering::Relaxed);
|
||||
for window in windows.values() {
|
||||
if let Err(error) = window.close() {
|
||||
log::error!("Failed to close window during quit: {error}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#[cfg(mobile)]
|
||||
let _ = (app, event);
|
||||
});
|
||||
}
|
||||
|
||||
#[cfg(desktop)]
|
||||
@@ -369,7 +396,7 @@ fn setup_tray(app: &mut tauri::App) -> Result<(), Box<dyn std::error::Error>> {
|
||||
let quit = MenuItemBuilder::with_id("quit", "Quit").build(app)?;
|
||||
let menu = MenuBuilder::new(app).items(&[&show, &quit]).build()?;
|
||||
|
||||
let _tray = TrayIconBuilder::new()
|
||||
let _tray = TrayIconBuilder::with_id("helixnotes")
|
||||
.icon(
|
||||
Image::from_path("icons/32x32.png")
|
||||
.unwrap_or_else(|_| app.default_window_icon().cloned().unwrap()),
|
||||
|
||||
+1510
-216
File diff suppressed because it is too large.
Load diff
+289
-7
@@ -1,30 +1,312 @@
|
||||
use crate::search::SearchIndex;
|
||||
use crate::search::{SearchIndex, SearchIndexShutdown};
|
||||
use crate::types::AppConfig;
|
||||
use crate::vault::watcher::VaultWatcher;
|
||||
use std::collections::{HashMap, HashSet, VecDeque};
|
||||
use std::sync::atomic::AtomicBool;
|
||||
use std::sync::Arc;
|
||||
use std::sync::Mutex;
|
||||
use std::sync::{Arc, Mutex, Weak};
|
||||
use tauri::AppHandle;
|
||||
#[cfg(desktop)]
|
||||
use tauri::{Manager, Runtime, Url};
|
||||
|
||||
#[cfg(desktop)]
|
||||
fn is_detached_window_for_vault(label: &str, url: &Url, target_path: &str) -> bool {
|
||||
label.starts_with("note-")
|
||||
&& url
|
||||
.query_pairs()
|
||||
.any(|(key, value)| key == "vault" && value == target_path)
|
||||
}
|
||||
|
||||
struct CachedSearchIndex {
|
||||
index: Weak<SearchIndex>,
|
||||
shutdown: Arc<SearchIndexShutdown>,
|
||||
}
|
||||
|
||||
#[derive(Clone, serde::Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct PendingOpenFile {
|
||||
pub id: u64,
|
||||
pub path: String,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct PendingOpenFiles {
|
||||
next_id: u64,
|
||||
requests: VecDeque<PendingOpenFile>,
|
||||
}
|
||||
|
||||
pub struct AppState {
|
||||
pub config: Mutex<AppConfig>,
|
||||
pub search_index: Mutex<Option<Arc<SearchIndex>>>,
|
||||
pub watcher: Mutex<Option<VaultWatcher>>,
|
||||
search_indexes: Mutex<HashMap<String, CachedSearchIndex>>,
|
||||
pub watchers: Mutex<HashMap<String, VaultWatcher>>,
|
||||
pub vault_transition: tokio::sync::Mutex<()>,
|
||||
pub vault_maintenance: Arc<tokio::sync::Mutex<()>>,
|
||||
pub note_save: Arc<tokio::sync::Mutex<()>>,
|
||||
pub importing: AtomicBool,
|
||||
pub syncing: AtomicBool,
|
||||
pub pending_open_file: Mutex<Option<String>>,
|
||||
#[cfg(desktop)]
|
||||
pub quitting: AtomicBool,
|
||||
pending_open_files: Mutex<PendingOpenFiles>,
|
||||
}
|
||||
|
||||
impl AppState {
|
||||
pub fn enqueue_open_file(&self, path: String) -> Result<(), String> {
|
||||
let mut pending = self
|
||||
.pending_open_files
|
||||
.lock()
|
||||
.map_err(|error| error.to_string())?;
|
||||
pending.next_id += 1;
|
||||
let id = pending.next_id;
|
||||
pending.requests.push_back(PendingOpenFile { id, path });
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn peek_pending_open_file(&self) -> Result<Option<PendingOpenFile>, String> {
|
||||
let pending = self
|
||||
.pending_open_files
|
||||
.lock()
|
||||
.map_err(|error| error.to_string())?;
|
||||
Ok(pending.requests.front().cloned())
|
||||
}
|
||||
|
||||
pub fn ack_pending_open_file(&self, id: u64) -> Result<bool, String> {
|
||||
let mut pending = self
|
||||
.pending_open_files
|
||||
.lock()
|
||||
.map_err(|error| error.to_string())?;
|
||||
if pending
|
||||
.requests
|
||||
.front()
|
||||
.is_some_and(|request| request.id == id)
|
||||
{
|
||||
pending.requests.pop_front();
|
||||
Ok(true)
|
||||
} else {
|
||||
Ok(false)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ensure_vault_watcher(&self, app: &AppHandle, vault_path: &str) -> Result<(), String> {
|
||||
let mut watchers = self.watchers.lock().map_err(|error| error.to_string())?;
|
||||
if !watchers.contains_key(vault_path) {
|
||||
let watcher = crate::vault::watcher::start_watcher(app.clone(), vault_path.to_owned())?;
|
||||
watchers.insert(vault_path.to_owned(), watcher);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn retain_vault_watchers(&self) -> Result<(), String> {
|
||||
let configured: HashSet<String> = {
|
||||
let config = self.config.lock().map_err(|error| error.to_string())?;
|
||||
config
|
||||
.vaults
|
||||
.iter()
|
||||
.map(|vault| vault.path.clone())
|
||||
.chain(config.active_vault.clone())
|
||||
.collect()
|
||||
};
|
||||
let removed = {
|
||||
let mut watchers = self.watchers.lock().map_err(|error| error.to_string())?;
|
||||
let removed: Vec<String> = watchers
|
||||
.keys()
|
||||
.filter(|path| !configured.contains(*path))
|
||||
.cloned()
|
||||
.collect();
|
||||
removed
|
||||
.into_iter()
|
||||
.filter_map(|path| watchers.remove(&path))
|
||||
.collect::<Vec<_>>()
|
||||
};
|
||||
drop(removed);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(desktop)]
|
||||
pub fn ensure_no_detached_windows<R: Runtime>(
|
||||
app: &AppHandle<R>,
|
||||
target_path: &str,
|
||||
) -> Result<(), String> {
|
||||
for (label, window) in app.webview_windows() {
|
||||
if is_detached_window_for_vault(
|
||||
&label,
|
||||
&window.url().map_err(|error| error.to_string())?,
|
||||
target_path,
|
||||
) {
|
||||
return Err(
|
||||
"Close this vault's detached note windows before forgetting it.".into(),
|
||||
);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// A refresh worker may outlive a vault switch. Reuse its writer when opening
|
||||
// that vault again instead of competing for Tantivy's exclusive writer lock.
|
||||
pub fn search_index_for_vault(&self, vault_path: &str) -> Result<Arc<SearchIndex>, String> {
|
||||
let mut indexes = self
|
||||
.search_indexes
|
||||
.lock()
|
||||
.map_err(|error| error.to_string())?;
|
||||
indexes
|
||||
.retain(|_, cached| cached.index.strong_count() > 0 || !cached.shutdown.is_finished());
|
||||
if let Some(cached) = indexes.get(vault_path) {
|
||||
if let Some(index) = cached.index.upgrade() {
|
||||
return Ok(index);
|
||||
}
|
||||
// The last Arc is gone, but its writer may still be shutting down.
|
||||
cached.shutdown.wait();
|
||||
}
|
||||
let index = Arc::new(SearchIndex::new(vault_path)?);
|
||||
indexes.insert(
|
||||
vault_path.to_owned(),
|
||||
CachedSearchIndex {
|
||||
index: Arc::downgrade(&index),
|
||||
shutdown: index.shutdown_signal(),
|
||||
},
|
||||
);
|
||||
Ok(index)
|
||||
}
|
||||
|
||||
pub fn validate_vault(&self, vault_path: &str) -> Result<(), String> {
|
||||
let config = self.config.lock().map_err(|error| error.to_string())?;
|
||||
if config.active_vault.as_deref() == Some(vault_path)
|
||||
|| config.vaults.iter().any(|vault| vault.path == vault_path)
|
||||
{
|
||||
Ok(())
|
||||
} else {
|
||||
Err("Unknown vault".to_string())
|
||||
}
|
||||
}
|
||||
|
||||
pub fn vault_snapshot(&self, vault_path: &str) -> Result<Option<Arc<SearchIndex>>, String> {
|
||||
let search = self
|
||||
.search_index
|
||||
.lock()
|
||||
.map_err(|error| error.to_string())?;
|
||||
let config = self.config.lock().map_err(|error| error.to_string())?;
|
||||
if config.active_vault.as_deref() == Some(vault_path) {
|
||||
return Ok(search.clone());
|
||||
}
|
||||
if !config.vaults.iter().any(|vault| vault.path == vault_path) {
|
||||
return Err("Unknown vault".to_string());
|
||||
}
|
||||
drop(config);
|
||||
drop(search);
|
||||
// Detached windows retain access to configured vaults. Never pair their
|
||||
// writes with the main window's index, nor hold config during disk I/O.
|
||||
self.search_index_for_vault(vault_path).map(Some)
|
||||
}
|
||||
|
||||
pub fn active_vault_snapshot(&self) -> Result<(String, Option<Arc<SearchIndex>>), String> {
|
||||
// Match vault transition and watcher lock order. The vault and its
|
||||
// optional index must remain paired even if a switch follows the read.
|
||||
let search = self
|
||||
.search_index
|
||||
.lock()
|
||||
.map_err(|error| error.to_string())?;
|
||||
let config = self.config.lock().map_err(|error| error.to_string())?;
|
||||
Ok((
|
||||
config.active_vault.clone().ok_or("No active vault")?,
|
||||
search.clone(),
|
||||
))
|
||||
}
|
||||
|
||||
pub fn active_search(&self) -> Result<(Arc<SearchIndex>, String), String> {
|
||||
let (vault_path, search) = self.active_vault_snapshot()?;
|
||||
Ok((search.ok_or("Search index not initialized")?, vault_path))
|
||||
}
|
||||
|
||||
#[cfg(desktop)]
|
||||
pub fn should_hide_to_tray(&self, label: &str, tray_available: bool) -> Result<bool, String> {
|
||||
if label != "main"
|
||||
|| !tray_available
|
||||
|| self.quitting.load(std::sync::atomic::Ordering::Relaxed)
|
||||
{
|
||||
return Ok(false);
|
||||
}
|
||||
let config = self.config.lock().map_err(|error| error.to_string())?;
|
||||
Ok(config.show_tray_icon && config.close_to_tray)
|
||||
}
|
||||
|
||||
pub fn new(config: AppConfig) -> Self {
|
||||
Self {
|
||||
config: Mutex::new(config),
|
||||
search_index: Mutex::new(None),
|
||||
watcher: Mutex::new(None),
|
||||
search_indexes: Mutex::new(HashMap::new()),
|
||||
watchers: Mutex::new(HashMap::new()),
|
||||
vault_transition: tokio::sync::Mutex::new(()),
|
||||
vault_maintenance: Arc::new(tokio::sync::Mutex::new(())),
|
||||
note_save: Arc::new(tokio::sync::Mutex::new(())),
|
||||
importing: AtomicBool::new(false),
|
||||
syncing: AtomicBool::new(false),
|
||||
pending_open_file: Mutex::new(None),
|
||||
#[cfg(desktop)]
|
||||
quitting: AtomicBool::new(false),
|
||||
pending_open_files: Mutex::new(PendingOpenFiles::default()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(all(test, desktop))]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn pending_open_requests_survive_reads_and_only_acknowledge_head() {
|
||||
let state = AppState::new(AppConfig::default());
|
||||
state.enqueue_open_file("one.md".into()).unwrap();
|
||||
state.enqueue_open_file("two.md".into()).unwrap();
|
||||
let first = state.peek_pending_open_file().unwrap().unwrap();
|
||||
assert_eq!(first.path, "one.md");
|
||||
assert_eq!(
|
||||
state.peek_pending_open_file().unwrap().unwrap().id,
|
||||
first.id
|
||||
);
|
||||
assert!(!state.ack_pending_open_file(first.id + 1).unwrap());
|
||||
assert_eq!(
|
||||
state.peek_pending_open_file().unwrap().unwrap().id,
|
||||
first.id
|
||||
);
|
||||
assert!(state.ack_pending_open_file(first.id).unwrap());
|
||||
let second = state.peek_pending_open_file().unwrap().unwrap();
|
||||
assert_eq!(second.path, "two.md");
|
||||
assert!(!state.ack_pending_open_file(first.id).unwrap());
|
||||
assert!(state.ack_pending_open_file(second.id).unwrap());
|
||||
assert!(state.peek_pending_open_file().unwrap().is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn detached_window_owner_matches_encoded_vault_path_only() {
|
||||
let url = Url::parse("tauri://localhost/?note=a.md&vault=%2Fvaults%2FA%26B").unwrap();
|
||||
assert!(is_detached_window_for_vault(
|
||||
"note-123",
|
||||
&url,
|
||||
"/vaults/A&B"
|
||||
));
|
||||
assert!(!is_detached_window_for_vault("note-123", &url, "/vaults/A"));
|
||||
assert!(!is_detached_window_for_vault("main", &url, "/vaults/A&B"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn close_policy_respects_live_settings_window_type_and_explicit_quit() {
|
||||
let mut state = AppState::new(AppConfig {
|
||||
show_tray_icon: true,
|
||||
close_to_tray: true,
|
||||
..AppConfig::default()
|
||||
});
|
||||
assert!(state.should_hide_to_tray("main", true).unwrap());
|
||||
assert!(!state.should_hide_to_tray("note-123", true).unwrap());
|
||||
assert!(!state.should_hide_to_tray("main", false).unwrap());
|
||||
state
|
||||
.quitting
|
||||
.store(true, std::sync::atomic::Ordering::Relaxed);
|
||||
assert!(!state.should_hide_to_tray("main", true).unwrap());
|
||||
state
|
||||
.quitting
|
||||
.store(false, std::sync::atomic::Ordering::Relaxed);
|
||||
state.config.get_mut().unwrap().close_to_tray = false;
|
||||
assert!(!state.should_hide_to_tray("main", true).unwrap());
|
||||
state.config.get_mut().unwrap().close_to_tray = true;
|
||||
state.config.get_mut().unwrap().show_tray_icon = false;
|
||||
assert!(!state.should_hide_to_tray("main", true).unwrap());
|
||||
}
|
||||
}
|
||||
+1032
-242
File diff suppressed because it is too large.
Load diff
+84
-5
@@ -42,6 +42,37 @@ pub struct NotebookEntry {
|
||||
pub note_count: usize,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct TagStyle {
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub icon: Option<String>,
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub color: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
#[serde(tag = "kind", content = "value", rename_all = "lowercase")]
|
||||
pub enum TagStyleChange {
|
||||
Icon(Option<String>),
|
||||
Color(Option<String>),
|
||||
Reset,
|
||||
}
|
||||
|
||||
impl TagStyle {
|
||||
pub fn is_empty(&self) -> bool {
|
||||
self.icon
|
||||
.as_ref()
|
||||
.map(|value| value.trim().is_empty())
|
||||
.unwrap_or(true)
|
||||
&& self
|
||||
.color
|
||||
.as_ref()
|
||||
.map(|value| value.trim().is_empty())
|
||||
.unwrap_or(true)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct NoteContent {
|
||||
pub path: String,
|
||||
@@ -73,6 +104,8 @@ pub struct VaultConfig {
|
||||
pub sync_interval_minutes: u32,
|
||||
#[serde(default)]
|
||||
pub last_sync_time: Option<String>,
|
||||
#[serde(default)]
|
||||
pub last_backup_time: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
@@ -107,6 +140,12 @@ pub enum StartupView {
|
||||
All,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ToolbarLayout {
|
||||
pub main: Vec<String>,
|
||||
pub more: Vec<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct AppConfig {
|
||||
pub vaults: Vec<VaultConfig>,
|
||||
@@ -127,6 +166,8 @@ pub struct AppConfig {
|
||||
#[serde(default = "default_true")]
|
||||
pub scroll_to_change_font_size: bool,
|
||||
#[serde(default)]
|
||||
pub toolbar_layout: Option<ToolbarLayout>,
|
||||
#[serde(default)]
|
||||
pub font_family: Option<String>,
|
||||
#[serde(default)]
|
||||
pub line_height: Option<f64>,
|
||||
@@ -181,8 +222,6 @@ pub struct AppConfig {
|
||||
#[serde(default)]
|
||||
pub backup_location: Option<String>,
|
||||
#[serde(default)]
|
||||
pub last_backup_time: Option<String>,
|
||||
#[serde(default)]
|
||||
pub backup_include_attachments: bool,
|
||||
#[serde(default = "default_max_versions")]
|
||||
pub max_versions_per_note: u32,
|
||||
@@ -276,7 +315,7 @@ fn default_max_versions() -> u32 {
|
||||
}
|
||||
|
||||
fn default_ai_model() -> String {
|
||||
"claude-sonnet-4-6".to_string()
|
||||
"claude-sonnet-5".to_string()
|
||||
}
|
||||
|
||||
fn default_system_light_theme() -> String {
|
||||
@@ -299,6 +338,7 @@ impl Default for AppConfig {
|
||||
accent_color: None,
|
||||
font_size: None,
|
||||
scroll_to_change_font_size: true,
|
||||
toolbar_layout: None,
|
||||
font_family: None,
|
||||
line_height: None,
|
||||
ui_scale: None,
|
||||
@@ -326,7 +366,6 @@ impl Default for AppConfig {
|
||||
backup_frequency: "24h".to_string(),
|
||||
backup_max_count: 10,
|
||||
backup_location: None,
|
||||
last_backup_time: None,
|
||||
backup_include_attachments: false,
|
||||
max_versions_per_note: 20,
|
||||
ai_provider: None,
|
||||
@@ -336,7 +375,7 @@ impl Default for AppConfig {
|
||||
ollama_api_key: None,
|
||||
openai_compatible_base_url: None,
|
||||
openai_compatible_api_key: None,
|
||||
ai_model: "claude-sonnet-4-6".to_string(),
|
||||
ai_model: default_ai_model(),
|
||||
ai_writing_style: None,
|
||||
default_view_mode: false,
|
||||
new_notes_in_source_mode: false,
|
||||
@@ -419,18 +458,57 @@ impl Default for VaultState {
|
||||
}
|
||||
}
|
||||
|
||||
/// Half-open UTF-16 offsets into the corresponding plain-text result field.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
pub struct SearchMatch {
|
||||
pub start: usize,
|
||||
pub end: usize,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
pub enum SearchTargetField {
|
||||
Body,
|
||||
Title,
|
||||
Tags,
|
||||
}
|
||||
|
||||
/// Half-open UTF-16 offsets into the indexed field, with exact source context.
|
||||
/// Body excludes frontmatter; tags use the indexed space-joined values.
|
||||
/// Text is capped at 240 Unicode scalars and each context at 32 scalars.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
pub struct SearchTarget {
|
||||
pub field: SearchTargetField,
|
||||
pub start: usize,
|
||||
pub end: usize,
|
||||
pub text: String,
|
||||
pub before: String,
|
||||
pub after: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct SearchResult {
|
||||
pub path: String,
|
||||
pub title: String,
|
||||
pub snippet: String,
|
||||
pub score: f32,
|
||||
pub title_matches: Vec<SearchMatch>,
|
||||
pub snippet_matches: Vec<SearchMatch>,
|
||||
pub match_target: Option<SearchTarget>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
|
||||
pub struct SearchPage {
|
||||
pub results: Vec<SearchResult>,
|
||||
pub total: usize,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct FileEvent {
|
||||
pub vault_path: String,
|
||||
pub event_type: String,
|
||||
pub path: String,
|
||||
pub note: Option<NoteEntry>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
@@ -467,6 +545,7 @@ pub struct VersionEntry {
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct AiStreamEvent {
|
||||
pub request_id: String,
|
||||
pub event_type: String, // "text", "done", "error"
|
||||
pub text: Option<String>,
|
||||
pub error: Option<String>,
|
||||
|
||||
+334
-108
@@ -1,5 +1,7 @@
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::path::Path;
|
||||
use std::fs::OpenOptions;
|
||||
use std::io;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use chrono::Utc;
|
||||
use gray_matter::engine::YAML;
|
||||
@@ -9,23 +11,16 @@ use uuid::Uuid;
|
||||
|
||||
use crate::types::{ImportResult, NoteMeta};
|
||||
use crate::vault::frontmatter;
|
||||
use crate::vault::operations::replace_file_atomically;
|
||||
|
||||
pub fn import(vault_path: &str) -> Result<ImportResult, String> {
|
||||
let vault = Path::new(vault_path);
|
||||
|
||||
let file_index = build_file_index(vault);
|
||||
let file_index = build_file_index(vault)?;
|
||||
|
||||
let md_files: Vec<_> = walkdir::WalkDir::new(vault)
|
||||
let md_files: Vec<_> = scanned_files(vault)?
|
||||
.into_iter()
|
||||
.filter_map(|e| e.ok())
|
||||
.filter(|e| {
|
||||
let p = e.path();
|
||||
p.is_file()
|
||||
&& p.extension().and_then(|x| x.to_str()) == Some("md")
|
||||
&& !p.to_string_lossy().contains("/.helixnotes/")
|
||||
&& !p.to_string_lossy().contains("/.trash/")
|
||||
})
|
||||
.map(|e| e.path().to_path_buf())
|
||||
.filter(|p| p.extension().and_then(|x| x.to_str()) == Some("md"))
|
||||
.collect();
|
||||
|
||||
let wiki_embed_re =
|
||||
@@ -46,10 +41,8 @@ pub fn import(vault_path: &str) -> Result<ImportResult, String> {
|
||||
};
|
||||
|
||||
for path in &md_files {
|
||||
let raw = match std::fs::read_to_string(path) {
|
||||
Ok(c) => c,
|
||||
Err(_) => continue,
|
||||
};
|
||||
let raw = std::fs::read_to_string(path)
|
||||
.map_err(|e| format!("Reading {}: {e}", path.display()))?;
|
||||
let note_dir = path.parent().unwrap_or(Path::new(""));
|
||||
|
||||
let mut content = raw.clone();
|
||||
@@ -193,7 +186,8 @@ pub fn import(vault_path: &str) -> Result<ImportResult, String> {
|
||||
}
|
||||
|
||||
if changed {
|
||||
let _ = std::fs::write(path, &content);
|
||||
replace_file_atomically(path, content.as_bytes())
|
||||
.map_err(|e| format!("Writing {}: {e}", path.display()))?;
|
||||
result.files_converted += 1;
|
||||
}
|
||||
}
|
||||
@@ -203,30 +197,65 @@ pub fn import(vault_path: &str) -> Result<ImportResult, String> {
|
||||
|
||||
if !moved.is_empty() {
|
||||
rewrite_attachment_refs(vault, &moved)?;
|
||||
for old_rel in moved.keys() {
|
||||
let src_path = vault.join(old_rel);
|
||||
std::fs::remove_file(&src_path)
|
||||
.map_err(|e| format!("Removing {} after copying: {e}", src_path.display()))?;
|
||||
}
|
||||
}
|
||||
|
||||
cleanup_empty_dirs(vault);
|
||||
cleanup_empty_dirs(vault)?;
|
||||
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
fn build_file_index(vault: &Path) -> HashMap<String, String> {
|
||||
let mut index = HashMap::new();
|
||||
for entry in walkdir::WalkDir::new(vault)
|
||||
fn is_excluded_dir(path: &Path) -> bool {
|
||||
matches!(
|
||||
path.file_name().and_then(|name| name.to_str()),
|
||||
Some(".helixnotes" | ".obsidian" | ".trash" | ".stfolder" | ".claude")
|
||||
)
|
||||
}
|
||||
|
||||
fn vault_entries(
|
||||
vault: &Path,
|
||||
) -> impl Iterator<Item = Result<walkdir::DirEntry, walkdir::Error>> + '_ {
|
||||
walkdir::WalkDir::new(vault)
|
||||
.into_iter()
|
||||
.filter_map(|e| e.ok())
|
||||
{
|
||||
let path = entry.path();
|
||||
if !path.is_file() {
|
||||
.filter_entry(|entry| {
|
||||
entry.depth() == 0 || !entry.file_type().is_dir() || !is_excluded_dir(entry.path())
|
||||
})
|
||||
}
|
||||
|
||||
fn scanned_files(vault: &Path) -> Result<Vec<PathBuf>, String> {
|
||||
vault_entries(vault)
|
||||
.filter_map(|entry| match entry {
|
||||
Ok(entry) if entry.file_type().is_file() => Some(Ok(entry.into_path())),
|
||||
Ok(_) => None,
|
||||
Err(e) => Some(Err(e)),
|
||||
})
|
||||
.collect::<Result<Vec<_>, _>>()
|
||||
.map_err(|e| format!("Scanning {}: {e}", vault.display()))
|
||||
}
|
||||
|
||||
fn vault_relative(path: &Path, vault: &Path) -> Result<String, String> {
|
||||
path.strip_prefix(vault)
|
||||
.map(|rel| rel.to_string_lossy().replace('\\', "/"))
|
||||
.map_err(|e| format!("Relativizing {}: {e}", path.display()))
|
||||
}
|
||||
|
||||
fn build_file_index(vault: &Path) -> Result<HashMap<String, String>, String> {
|
||||
let mut index = HashMap::new();
|
||||
for entry in vault_entries(vault) {
|
||||
let entry = entry.map_err(|e| format!("Scanning {}: {e}", vault.display()))?;
|
||||
if !entry.file_type().is_file() {
|
||||
continue;
|
||||
}
|
||||
let path = entry.path();
|
||||
if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
|
||||
if let Ok(rel) = path.strip_prefix(vault) {
|
||||
index.insert(name.to_string(), rel.to_string_lossy().to_string());
|
||||
}
|
||||
index.insert(name.to_string(), vault_relative(path, vault)?);
|
||||
}
|
||||
}
|
||||
index
|
||||
Ok(index)
|
||||
}
|
||||
|
||||
fn rename_deprecated_properties(raw: &str) -> String {
|
||||
@@ -565,52 +594,102 @@ fn fix_md_link_refs(
|
||||
.to_string()
|
||||
}
|
||||
|
||||
fn ensure_attachment_parent(
|
||||
vault: &Path,
|
||||
canonical_vault: &Path,
|
||||
parent: &Path,
|
||||
) -> Result<(), String> {
|
||||
let relative = parent
|
||||
.strip_prefix(vault)
|
||||
.map_err(|e| format!("Invalid attachment destination {}: {e}", parent.display()))?;
|
||||
let mut current = vault.to_path_buf();
|
||||
let mut relative_path = PathBuf::new();
|
||||
for component in relative.components() {
|
||||
current.push(component);
|
||||
relative_path.push(component);
|
||||
match std::fs::create_dir(¤t) {
|
||||
Ok(()) => {}
|
||||
Err(e) if e.kind() == io::ErrorKind::AlreadyExists => {}
|
||||
Err(e) => return Err(format!("Creating {}: {e}", current.display())),
|
||||
}
|
||||
let canonical = std::fs::canonicalize(¤t)
|
||||
.map_err(|e| format!("Resolving {}: {e}", current.display()))?;
|
||||
if !current.is_dir() || canonical != canonical_vault.join(&relative_path) {
|
||||
return Err(format!(
|
||||
"Attachment destination escapes vault: {}",
|
||||
current.display()
|
||||
));
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn move_attachments(vault: &Path) -> Result<HashMap<String, String>, String> {
|
||||
let attachments_dir = vault.join(".helixnotes").join("attachments");
|
||||
let _ = std::fs::create_dir_all(&attachments_dir);
|
||||
|
||||
let attachment_files: Vec<_> = walkdir::WalkDir::new(vault)
|
||||
let attachment_files: Vec<_> = scanned_files(vault)?
|
||||
.into_iter()
|
||||
.filter_map(|e| e.ok())
|
||||
.filter(|e| {
|
||||
let p = e.path();
|
||||
if !p.is_file() {
|
||||
return false;
|
||||
}
|
||||
if p.extension().and_then(|x| x.to_str()) == Some("md") {
|
||||
return false;
|
||||
}
|
||||
let path_str = p.to_string_lossy();
|
||||
!path_str.contains("/.helixnotes/")
|
||||
&& !path_str.contains("/.obsidian/")
|
||||
&& !path_str.contains("/.trash/")
|
||||
&& !path_str.contains("/.stfolder")
|
||||
&& !path_str.contains("/.claude/")
|
||||
})
|
||||
.map(|e| e.path().to_path_buf())
|
||||
.filter(|p| p.extension().and_then(|x| x.to_str()) != Some("md"))
|
||||
.collect();
|
||||
let canonical_vault =
|
||||
std::fs::canonicalize(vault).map_err(|e| format!("Resolving {}: {e}", vault.display()))?;
|
||||
|
||||
let mut moved: HashMap<String, String> = HashMap::new();
|
||||
let mut moved = HashMap::new();
|
||||
for src_path in attachment_files {
|
||||
let old_rel = vault_relative(&src_path, vault)?;
|
||||
let preferred = attachments_dir.join(&old_rel);
|
||||
let parent = preferred.parent().expect("attachment has a parent");
|
||||
ensure_attachment_parent(vault, &canonical_vault, parent)?;
|
||||
|
||||
for src_path in &attachment_files {
|
||||
let old_rel = match src_path.strip_prefix(vault) {
|
||||
Ok(r) => r.to_string_lossy().to_string(),
|
||||
Err(_) => continue,
|
||||
// Reserve the destination atomically: neither rename nor std::fs::copy protects
|
||||
// a pre-existing attachment (or one created concurrently) from replacement.
|
||||
let mut suffix = 0u64;
|
||||
let (dest_path, mut dest) = loop {
|
||||
let candidate = if suffix == 0 {
|
||||
preferred.clone()
|
||||
} else {
|
||||
let stem = preferred.file_stem().unwrap_or_default().to_string_lossy();
|
||||
let ext = preferred
|
||||
.extension()
|
||||
.map(|ext| format!(".{}", ext.to_string_lossy()))
|
||||
.unwrap_or_default();
|
||||
preferred.with_file_name(format!("{stem}-{suffix}{ext}"))
|
||||
};
|
||||
match OpenOptions::new()
|
||||
.write(true)
|
||||
.create_new(true)
|
||||
.open(&candidate)
|
||||
{
|
||||
Ok(file) => break (candidate, file),
|
||||
Err(e) if e.kind() == io::ErrorKind::AlreadyExists => {
|
||||
suffix = suffix
|
||||
.checked_add(1)
|
||||
.ok_or("Too many attachment collisions")?;
|
||||
}
|
||||
Err(e) => return Err(format!("Creating {}: {e}", candidate.display())),
|
||||
}
|
||||
};
|
||||
let new_rel = format!(".helixnotes/attachments/{}", old_rel);
|
||||
let dest_path = vault.join(&new_rel);
|
||||
|
||||
if let Some(parent) = dest_path.parent() {
|
||||
let _ = std::fs::create_dir_all(parent);
|
||||
}
|
||||
|
||||
if std::fs::rename(src_path, &dest_path).is_ok()
|
||||
|| std::fs::copy(src_path, &dest_path)
|
||||
.and_then(|_| std::fs::remove_file(src_path))
|
||||
.is_ok()
|
||||
{
|
||||
moved.insert(old_rel, new_rel);
|
||||
let copied = (|| -> io::Result<()> {
|
||||
let mut src = std::fs::File::open(&src_path)?;
|
||||
io::copy(&mut src, &mut dest)?;
|
||||
dest.sync_all()?;
|
||||
Ok(())
|
||||
})();
|
||||
drop(dest);
|
||||
if let Err(e) = copied {
|
||||
std::fs::remove_file(&dest_path).map_err(|cleanup| {
|
||||
format!(
|
||||
"Copying {} to {}: {e}; removing incomplete copy: {cleanup}",
|
||||
src_path.display(),
|
||||
dest_path.display()
|
||||
)
|
||||
})?;
|
||||
return Err(format!(
|
||||
"Copying {} to {}: {e}",
|
||||
src_path.display(),
|
||||
dest_path.display()
|
||||
));
|
||||
}
|
||||
moved.insert(old_rel, vault_relative(&dest_path, vault)?);
|
||||
}
|
||||
Ok(moved)
|
||||
}
|
||||
@@ -618,24 +697,14 @@ fn move_attachments(vault: &Path) -> Result<HashMap<String, String>, String> {
|
||||
fn rewrite_attachment_refs(vault: &Path, moved: &HashMap<String, String>) -> Result<(), String> {
|
||||
let md_ref = Regex::new(r"(!?\[[^\]]*\])\(([^)]+)\)").map_err(|e| e.to_string())?;
|
||||
|
||||
let md_files: Vec<_> = walkdir::WalkDir::new(vault)
|
||||
let md_files: Vec<_> = scanned_files(vault)?
|
||||
.into_iter()
|
||||
.filter_map(|e| e.ok())
|
||||
.filter(|e| {
|
||||
let p = e.path();
|
||||
p.is_file()
|
||||
&& p.extension().and_then(|x| x.to_str()) == Some("md")
|
||||
&& !p.to_string_lossy().contains("/.helixnotes/")
|
||||
&& !p.to_string_lossy().contains("/.trash/")
|
||||
})
|
||||
.map(|e| e.path().to_path_buf())
|
||||
.filter(|p| p.extension().and_then(|x| x.to_str()) == Some("md"))
|
||||
.collect();
|
||||
|
||||
for path in &md_files {
|
||||
let content = match std::fs::read_to_string(path) {
|
||||
Ok(c) => c,
|
||||
Err(_) => continue,
|
||||
};
|
||||
let content = std::fs::read_to_string(path)
|
||||
.map_err(|e| format!("Reading {}: {e}", path.display()))?;
|
||||
let note_dir = path.parent().unwrap_or(Path::new(""));
|
||||
|
||||
let new_content = md_ref
|
||||
@@ -643,28 +712,29 @@ fn rewrite_attachment_refs(vault: &Path, moved: &HashMap<String, String>) -> Res
|
||||
let prefix = &caps[1];
|
||||
let href = &caps[2];
|
||||
let decoded_href = percent_decode(href);
|
||||
let (reference, suffix) = decoded_href
|
||||
.find(['#', '?'])
|
||||
.map(|index| decoded_href.split_at(index))
|
||||
.unwrap_or((&decoded_href, ""));
|
||||
|
||||
if decoded_href.starts_with("http") || decoded_href.starts_with("data:") {
|
||||
if reference.starts_with("http")
|
||||
|| reference.starts_with("data:")
|
||||
|| reference.starts_with('/')
|
||||
{
|
||||
return format!("{}({})", prefix, href);
|
||||
}
|
||||
|
||||
let abs_from_note = note_dir.join(&decoded_href);
|
||||
let rel_from_note = abs_from_note
|
||||
let rel_from_note = note_dir
|
||||
.strip_prefix(vault)
|
||||
.ok()
|
||||
.map(|r| r.to_string_lossy().to_string());
|
||||
let rel_from_vault = decoded_href.clone();
|
||||
|
||||
.and_then(|base| resolve_relative_ref(base, reference));
|
||||
let old_vault_rel = rel_from_note
|
||||
.as_ref()
|
||||
.filter(|r| moved.contains_key(r.as_str()))
|
||||
.cloned()
|
||||
.or_else(|| {
|
||||
if moved.contains_key(&rel_from_vault) {
|
||||
Some(rel_from_vault)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
resolve_relative_ref(Path::new(""), reference)
|
||||
.filter(|r| moved.contains_key(r.as_str()))
|
||||
});
|
||||
|
||||
if let Some(old_rel) = old_vault_rel {
|
||||
@@ -675,7 +745,12 @@ fn rewrite_attachment_refs(vault: &Path, moved: &HashMap<String, String>) -> Res
|
||||
note_dir.to_str().unwrap_or(""),
|
||||
)
|
||||
.unwrap_or(new_rel.clone());
|
||||
return format!("{}({})", prefix, new_note_rel.replace(' ', "%20"));
|
||||
return format!(
|
||||
"{}({}{})",
|
||||
prefix,
|
||||
new_note_rel.replace('\\', "/").replace(' ', "%20"),
|
||||
suffix
|
||||
);
|
||||
}
|
||||
}
|
||||
format!("{}({})", prefix, href)
|
||||
@@ -683,33 +758,59 @@ fn rewrite_attachment_refs(vault: &Path, moved: &HashMap<String, String>) -> Res
|
||||
.to_string();
|
||||
|
||||
if new_content != content {
|
||||
let _ = std::fs::write(path, new_content);
|
||||
replace_file_atomically(path, new_content.as_bytes())
|
||||
.map_err(|e| format!("Writing {}: {e}", path.display()))?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn cleanup_empty_dirs(root: &Path) {
|
||||
let mut dirs: Vec<_> = walkdir::WalkDir::new(root)
|
||||
.into_iter()
|
||||
.filter_map(|e| e.ok())
|
||||
.filter(|e| e.path().is_dir())
|
||||
.map(|e| e.path().to_path_buf())
|
||||
.collect();
|
||||
fn resolve_relative_ref(base: &Path, reference: &str) -> Option<String> {
|
||||
let mut rel = base.to_path_buf();
|
||||
for component in Path::new(&reference.replace('\\', "/")).components() {
|
||||
match component {
|
||||
std::path::Component::Normal(name) => rel.push(name),
|
||||
std::path::Component::ParentDir => {
|
||||
if !rel.pop() {
|
||||
return None;
|
||||
}
|
||||
}
|
||||
std::path::Component::CurDir => {}
|
||||
_ => return None,
|
||||
}
|
||||
}
|
||||
Some(rel.to_string_lossy().replace('\\', "/"))
|
||||
}
|
||||
|
||||
fn cleanup_empty_dirs(root: &Path) -> Result<(), String> {
|
||||
let mut dirs: Vec<_> = vault_entries(root)
|
||||
.filter_map(|entry| match entry {
|
||||
Ok(entry) if entry.file_type().is_dir() => Some(Ok(entry.into_path())),
|
||||
Ok(_) => None,
|
||||
Err(e) => Some(Err(e)),
|
||||
})
|
||||
.collect::<Result<Vec<_>, _>>()
|
||||
.map_err(|e| format!("Scanning {}: {e}", root.display()))?;
|
||||
|
||||
dirs.sort_by_key(|path| std::cmp::Reverse(path.components().count()));
|
||||
|
||||
for dir in dirs {
|
||||
let dir_str = dir.to_string_lossy();
|
||||
if dir_str.contains("/.helixnotes") || dir_str.contains("/.obsidian") || dir == root {
|
||||
if dir == root {
|
||||
continue;
|
||||
}
|
||||
if let Ok(mut entries) = std::fs::read_dir(&dir) {
|
||||
if entries.next().is_none() {
|
||||
let _ = std::fs::remove_dir(&dir);
|
||||
}
|
||||
let mut entries =
|
||||
std::fs::read_dir(&dir).map_err(|e| format!("Reading {}: {e}", dir.display()))?;
|
||||
if entries
|
||||
.next()
|
||||
.transpose()
|
||||
.map_err(|e| format!("Reading {}: {e}", dir.display()))?
|
||||
.is_none()
|
||||
{
|
||||
std::fs::remove_dir(&dir)
|
||||
.map_err(|e| format!("Removing empty directory {}: {e}", dir.display()))?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn split_anchor(reference: &str) -> (&str, Option<&str>) {
|
||||
@@ -778,7 +879,7 @@ fn pathdiff(target: &str, base: &str) -> Result<String, ()> {
|
||||
for component in &target_components[common..] {
|
||||
result.push(component);
|
||||
}
|
||||
Ok(result.to_string_lossy().to_string())
|
||||
Ok(result.to_string_lossy().replace('\\', "/"))
|
||||
}
|
||||
|
||||
fn percent_decode(s: &str) -> String {
|
||||
@@ -1013,6 +1114,131 @@ mod tests {
|
||||
assert_eq!(result, raw);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn import_keeps_colliding_attachments_and_rewrites_note_relative_links() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let root = vault.path();
|
||||
let note_dir = root.join("Notes");
|
||||
let stored = root.join(".helixnotes/attachments/Notes");
|
||||
std::fs::create_dir_all(¬e_dir).unwrap();
|
||||
std::fs::create_dir_all(&stored).unwrap();
|
||||
std::fs::write(note_dir.join("pic.png"), b"NEW").unwrap();
|
||||
std::fs::write(stored.join("pic.png"), b"OLD").unwrap();
|
||||
std::fs::write(stored.join("pic-1.png"), b"OLDER").unwrap();
|
||||
std::fs::write(
|
||||
note_dir.join("Entry.md"),
|
||||
"# Entry\n\n [picture](./pic.png#preview)",
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
let result = import(root.to_str().unwrap()).unwrap();
|
||||
|
||||
assert_eq!(result.attachments_moved, 1);
|
||||
assert_eq!(std::fs::read(stored.join("pic.png")).unwrap(), b"OLD");
|
||||
assert_eq!(std::fs::read(stored.join("pic-1.png")).unwrap(), b"OLDER");
|
||||
assert_eq!(std::fs::read(stored.join("pic-2.png")).unwrap(), b"NEW");
|
||||
assert!(!note_dir.join("pic.png").exists());
|
||||
let note = std::fs::read_to_string(note_dir.join("Entry.md")).unwrap();
|
||||
assert!(note.contains(""));
|
||||
assert!(note.contains("[picture](../.helixnotes/attachments/Notes/pic-2.png#preview)"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn import_prunes_metadata_directories_at_every_depth() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let root = vault.path();
|
||||
for hidden in [".helixnotes", ".obsidian", ".trash", ".stfolder", ".claude"] {
|
||||
for base in [root.to_path_buf(), root.join("Notebook")] {
|
||||
let hidden_dir = base.join(hidden).join("history");
|
||||
std::fs::create_dir_all(&hidden_dir).unwrap();
|
||||
std::fs::write(hidden_dir.join("Secret.md"), "==untouched==").unwrap();
|
||||
std::fs::write(hidden_dir.join("asset.bin"), b"untouched").unwrap();
|
||||
}
|
||||
}
|
||||
let visible_dir = root.join("Notebook/stfolder-visible");
|
||||
std::fs::create_dir_all(&visible_dir).unwrap();
|
||||
std::fs::write(visible_dir.join("asset.bin"), b"visible").unwrap();
|
||||
std::fs::write(
|
||||
root.join("Note.md"),
|
||||
"# Note\n\n",
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
let result = import(root.to_str().unwrap()).unwrap();
|
||||
|
||||
assert_eq!(result.attachments_moved, 1);
|
||||
assert_eq!(
|
||||
std::fs::read(root.join(".helixnotes/attachments/Notebook/stfolder-visible/asset.bin"))
|
||||
.unwrap(),
|
||||
b"visible"
|
||||
);
|
||||
for hidden in [".helixnotes", ".obsidian", ".trash", ".stfolder", ".claude"] {
|
||||
for base in [root.to_path_buf(), root.join("Notebook")] {
|
||||
let hidden_dir = base.join(hidden).join("history");
|
||||
assert_eq!(
|
||||
std::fs::read_to_string(hidden_dir.join("Secret.md")).unwrap(),
|
||||
"==untouched=="
|
||||
);
|
||||
assert_eq!(
|
||||
std::fs::read(hidden_dir.join("asset.bin")).unwrap(),
|
||||
b"untouched"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn destination_io_failure_leaves_original_attachment_in_place() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let root = vault.path();
|
||||
std::fs::create_dir(root.join(".helixnotes")).unwrap();
|
||||
std::fs::write(root.join(".helixnotes/attachments"), b"existing metadata").unwrap();
|
||||
std::fs::write(root.join("asset.bin"), b"original").unwrap();
|
||||
|
||||
assert!(import(root.to_str().unwrap()).is_err());
|
||||
assert_eq!(std::fs::read(root.join("asset.bin")).unwrap(), b"original");
|
||||
assert_eq!(
|
||||
std::fs::read(root.join(".helixnotes/attachments")).unwrap(),
|
||||
b"existing metadata"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn readonly_note_does_not_lose_original_or_attachment() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let root = vault.path();
|
||||
let note = root.join("Note.md");
|
||||
let original = "# Note\n\n";
|
||||
std::fs::write(¬e, original).unwrap();
|
||||
std::fs::write(root.join("asset.bin"), b"original").unwrap();
|
||||
let original_permissions = std::fs::metadata(¬e).unwrap().permissions();
|
||||
let mut permissions = original_permissions.clone();
|
||||
permissions.set_readonly(true);
|
||||
std::fs::set_permissions(¬e, permissions).unwrap();
|
||||
|
||||
let result = import(root.to_str().unwrap());
|
||||
|
||||
assert!(result.is_err());
|
||||
assert_eq!(std::fs::read_to_string(¬e).unwrap(), original);
|
||||
assert_eq!(std::fs::read(root.join("asset.bin")).unwrap(), b"original");
|
||||
std::fs::set_permissions(¬e, original_permissions).unwrap();
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn attachment_directory_symlink_cannot_escape_vault() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let outside = tempfile::tempdir().unwrap();
|
||||
let root = vault.path();
|
||||
std::fs::create_dir(root.join(".helixnotes")).unwrap();
|
||||
std::os::unix::fs::symlink(outside.path(), root.join(".helixnotes/attachments")).unwrap();
|
||||
std::fs::write(root.join("asset.bin"), b"original").unwrap();
|
||||
|
||||
assert!(import(root.to_str().unwrap()).is_err());
|
||||
assert_eq!(std::fs::read(root.join("asset.bin")).unwrap(), b"original");
|
||||
assert!(!outside.path().join("asset.bin").exists());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_split_anchor_same_note() {
|
||||
let (file, anchor) = split_anchor("#Heading");
|
||||
|
||||
+1565
-122
File diff suppressed because it is too large.
Load diff
+276
-52
@@ -1,15 +1,18 @@
|
||||
use notify::{Config, EventKind, PollWatcher, RecommendedWatcher, RecursiveMode, Watcher};
|
||||
use std::path::Path;
|
||||
use notify::event::{CreateKind, ModifyKind, RemoveKind, RenameMode};
|
||||
use notify::{Config, Event, EventKind, PollWatcher, RecommendedWatcher, RecursiveMode, Watcher};
|
||||
use std::collections::HashMap;
|
||||
use std::path::{Component, Path, PathBuf};
|
||||
use std::sync::mpsc;
|
||||
use std::time::Duration;
|
||||
use std::time::{Duration, Instant};
|
||||
use tauri::{AppHandle, Emitter, Manager};
|
||||
|
||||
use crate::state::AppState;
|
||||
use crate::types::FileEvent;
|
||||
use crate::vault::operations::helixnotes_dir;
|
||||
use crate::vault::operations::{is_hidden, read_note_entry_fast};
|
||||
|
||||
const IOS_POLL_INTERVAL: Duration = Duration::from_secs(10);
|
||||
const NATIVE_POLL_INTERVAL: Duration = Duration::from_secs(1);
|
||||
const EVENT_BATCH_INTERVAL: Duration = Duration::from_millis(50);
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
enum WatcherBackend {
|
||||
@@ -46,6 +49,69 @@ impl VaultWatcher {
|
||||
}
|
||||
}
|
||||
|
||||
fn collect_changes(event: Event, vault_root: &Path, changes: &mut HashMap<PathBuf, &'static str>) {
|
||||
let (default_type, may_be_directory) = match event.kind {
|
||||
EventKind::Create(kind) => ("create", kind != CreateKind::File),
|
||||
EventKind::Remove(kind) => ("remove", kind != RemoveKind::File),
|
||||
EventKind::Modify(ModifyKind::Name(_)) => ("modify", true),
|
||||
EventKind::Modify(_) => ("modify", false),
|
||||
_ => return,
|
||||
};
|
||||
for (index, path) in event.paths.into_iter().enumerate() {
|
||||
let Ok(relative) = path.strip_prefix(vault_root) else {
|
||||
continue;
|
||||
};
|
||||
if !relative.components().all(|component| match component {
|
||||
Component::Normal(name) => !is_hidden(Path::new(name)),
|
||||
Component::CurDir => true,
|
||||
_ => false,
|
||||
}) {
|
||||
continue;
|
||||
}
|
||||
// Removed/renamed directories no longer pass is_dir(). Retain unknown
|
||||
// missing paths so external notebook changes still reach the UI.
|
||||
if path.extension().and_then(|extension| extension.to_str()) != Some("md")
|
||||
&& !path.is_dir()
|
||||
&& !(may_be_directory && !path.exists())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
let event_type = match event.kind {
|
||||
EventKind::Modify(ModifyKind::Name(RenameMode::From)) => "remove",
|
||||
EventKind::Modify(ModifyKind::Name(RenameMode::Both)) if index == 0 => "remove",
|
||||
_ => default_type,
|
||||
};
|
||||
changes.insert(path, event_type);
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn changed_entry(path: PathBuf, event_type: &str, vault_root: &Path) -> FileEvent {
|
||||
let is_note =
|
||||
path.extension().and_then(|extension| extension.to_str()) == Some("md") && path.is_file();
|
||||
let note = if is_note {
|
||||
read_note_entry_fast(&path, vault_root).ok()
|
||||
} else {
|
||||
None
|
||||
};
|
||||
// Atomic replacement may also report removal of the old destination. The
|
||||
// final filesystem state, not the platform's rename spelling, is authoritative.
|
||||
let event_type = if path.exists() {
|
||||
if event_type == "remove" {
|
||||
"modify"
|
||||
} else {
|
||||
event_type
|
||||
}
|
||||
} else {
|
||||
"remove"
|
||||
};
|
||||
FileEvent {
|
||||
vault_path: vault_root.to_string_lossy().to_string(),
|
||||
event_type: event_type.to_string(),
|
||||
path: path.to_string_lossy().to_string(),
|
||||
note,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn start_watcher(app: AppHandle, vault_path: String) -> Result<VaultWatcher, String> {
|
||||
let (tx, rx) = mpsc::channel();
|
||||
|
||||
@@ -64,58 +130,84 @@ pub fn start_watcher(app: AppHandle, vault_path: String) -> Result<VaultWatcher,
|
||||
.watch(Path::new(&vault_path), RecursiveMode::Recursive)
|
||||
.map_err(|e| e.to_string())?;
|
||||
|
||||
let hn_dir = helixnotes_dir(&vault_path);
|
||||
|
||||
std::thread::spawn(move || {
|
||||
while let Ok(result) = rx.recv() {
|
||||
match result {
|
||||
Ok(event) => {
|
||||
// Skip all file events while importing
|
||||
let state = app.state::<AppState>();
|
||||
if state.importing.load(std::sync::atomic::Ordering::Relaxed) {
|
||||
let vault_root = Path::new(&vault_path);
|
||||
let mut changes = HashMap::new();
|
||||
let mut search = None;
|
||||
loop {
|
||||
let first = if changes.is_empty() {
|
||||
match rx.recv() {
|
||||
Ok(event) => Some(event),
|
||||
Err(_) => return,
|
||||
}
|
||||
} else {
|
||||
match rx.recv_timeout(EVENT_BATCH_INTERVAL) {
|
||||
Ok(event) => Some(event),
|
||||
Err(mpsc::RecvTimeoutError::Timeout) => None,
|
||||
Err(mpsc::RecvTimeoutError::Disconnected) => return,
|
||||
}
|
||||
};
|
||||
let deadline = Instant::now() + EVENT_BATCH_INTERVAL;
|
||||
let mut next = first;
|
||||
while let Some(result) = next {
|
||||
match result {
|
||||
Ok(event) => {
|
||||
collect_changes(event, vault_root, &mut changes);
|
||||
}
|
||||
Err(error) => log::error!("File watcher error: {error}"),
|
||||
}
|
||||
let remaining = deadline.saturating_duration_since(Instant::now());
|
||||
if remaining.is_zero() {
|
||||
break;
|
||||
}
|
||||
next = rx.recv_timeout(remaining).ok();
|
||||
}
|
||||
let state = app.state::<AppState>();
|
||||
// Native note mutations hold note_save through their path event.
|
||||
// Read and emit only after they finish, so the watcher cannot
|
||||
// publish an intermediate rename or stale note contents.
|
||||
let _save_guard = state.note_save.blocking_lock();
|
||||
// Keep the batch while muted, rather than losing concurrent external
|
||||
// edits. Nothing is indexed or emitted until local imports finish.
|
||||
if state.importing.load(std::sync::atomic::Ordering::Relaxed) {
|
||||
continue;
|
||||
}
|
||||
// Each watcher belongs to its own vault. A detached note window may
|
||||
// still need changes from a vault that is no longer active; never
|
||||
// index those changes into the main window's active search index.
|
||||
if state.validate_vault(&vault_path).is_err() {
|
||||
continue;
|
||||
}
|
||||
if search.is_none() {
|
||||
match state.vault_snapshot(&vault_path) {
|
||||
Ok(index) => search = index,
|
||||
Err(error) => {
|
||||
log::error!("Could not open search index for watched vault: {error}");
|
||||
continue;
|
||||
}
|
||||
// Skip .helixnotes directory events
|
||||
let dominated_by_hn = event.paths.iter().all(|p| p.starts_with(&hn_dir));
|
||||
if dominated_by_hn {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Only care about .md file events
|
||||
let has_md = event.paths.iter().any(|p| {
|
||||
p.extension().and_then(|x| x.to_str()) == Some("md") || p.is_dir()
|
||||
});
|
||||
|
||||
if !has_md {
|
||||
continue;
|
||||
}
|
||||
|
||||
let event_type = match event.kind {
|
||||
EventKind::Create(_) => "create",
|
||||
EventKind::Modify(_) => "modify",
|
||||
EventKind::Remove(_) => "remove",
|
||||
_ => continue,
|
||||
};
|
||||
|
||||
for path in &event.paths {
|
||||
let fe = FileEvent {
|
||||
event_type: event_type.to_string(),
|
||||
path: path.to_string_lossy().to_string(),
|
||||
};
|
||||
let _ = app.emit("file-changed", &fe);
|
||||
}
|
||||
|
||||
// On mobile, throttle event emission to prevent IPC flooding
|
||||
// on FUSE filesystems where Syncthing/other apps generate
|
||||
// constant file activity that blocks the Tauri command channel.
|
||||
#[cfg(mobile)]
|
||||
{
|
||||
std::thread::sleep(Duration::from_secs(2));
|
||||
while rx.try_recv().is_ok() {}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("File watcher error: {}", e);
|
||||
}
|
||||
let mut refresh_vault = false;
|
||||
for (path, event_type) in changes.drain() {
|
||||
if path.extension().and_then(|extension| extension.to_str()) == Some("md")
|
||||
&& !path.is_dir()
|
||||
{
|
||||
if let Some(search) = &search {
|
||||
if let Err(error) = search.queue_index_note(&path.to_string_lossy()) {
|
||||
log::error!("Could not queue external note for search: {error}");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
refresh_vault = true;
|
||||
}
|
||||
let event = changed_entry(path, event_type, vault_root);
|
||||
let _ = app.emit("file-changed", &event);
|
||||
}
|
||||
if refresh_vault {
|
||||
if let Some(search) = &search {
|
||||
if let Err(error) = search.queue_vault_refresh(&vault_path) {
|
||||
log::error!("Could not queue notebook search refresh: {error}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -152,4 +244,136 @@ mod tests {
|
||||
Duration::from_secs(1)
|
||||
);
|
||||
}
|
||||
|
||||
fn mapped_events(events: Vec<Event>, vault_root: &Path) -> Vec<FileEvent> {
|
||||
let mut changes = HashMap::new();
|
||||
for event in events {
|
||||
collect_changes(event, vault_root, &mut changes);
|
||||
}
|
||||
changes
|
||||
.into_iter()
|
||||
.map(|(path, event_type)| changed_entry(path, event_type, vault_root))
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn atomic_replace_emits_only_enriched_destination() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let target = vault.path().join("Note.md");
|
||||
let temporary = vault.path().join(".helixnotes-save-123");
|
||||
std::fs::write(&target, "---\ntitle: New title\n---\nUpdated preview.").unwrap();
|
||||
let events = mapped_events(
|
||||
vec![
|
||||
Event::new(EventKind::Modify(ModifyKind::Name(RenameMode::Both)))
|
||||
.add_path(temporary)
|
||||
.add_path(target.clone()),
|
||||
Event::new(EventKind::Remove(RemoveKind::File)).add_path(target.clone()),
|
||||
Event::new(EventKind::Create(CreateKind::File))
|
||||
.add_path(vault.path().join(".helixnotes/history/snapshot.md")),
|
||||
Event::new(EventKind::Create(CreateKind::File))
|
||||
.add_path(vault.path().join(".hidden/secret.md")),
|
||||
],
|
||||
vault.path(),
|
||||
);
|
||||
|
||||
assert_eq!(events.len(), 1);
|
||||
assert_eq!(events[0].path, target.to_string_lossy());
|
||||
assert_eq!(events[0].event_type, "modify");
|
||||
let note = events[0].note.as_ref().unwrap();
|
||||
assert_eq!(note.meta.title, "New title");
|
||||
assert_eq!(note.relative_path, "Note.md");
|
||||
assert_eq!(note.preview, "Updated preview.");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn external_note_and_directory_renames_keep_both_sides() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let old_note = vault.path().join("Before.md");
|
||||
let new_note = vault.path().join("After.md");
|
||||
let old_directory = vault.path().join("Old.notebook");
|
||||
let new_directory = vault.path().join("New.notebook");
|
||||
std::fs::write(&new_note, "renamed note").unwrap();
|
||||
std::fs::create_dir(&new_directory).unwrap();
|
||||
let events = mapped_events(
|
||||
vec![
|
||||
Event::new(EventKind::Modify(ModifyKind::Name(RenameMode::Both)))
|
||||
.add_path(old_note.clone())
|
||||
.add_path(new_note.clone()),
|
||||
Event::new(EventKind::Modify(ModifyKind::Name(RenameMode::Both)))
|
||||
.add_path(old_directory.clone())
|
||||
.add_path(new_directory.clone()),
|
||||
],
|
||||
vault.path(),
|
||||
);
|
||||
|
||||
for removed in [old_note, old_directory] {
|
||||
let event = events
|
||||
.iter()
|
||||
.find(|event| event.path == removed.to_string_lossy())
|
||||
.unwrap();
|
||||
assert_eq!(event.event_type, "remove");
|
||||
assert!(event.note.is_none());
|
||||
}
|
||||
let note = events
|
||||
.iter()
|
||||
.find(|event| event.path == new_note.to_string_lossy())
|
||||
.unwrap();
|
||||
assert_eq!(note.event_type, "modify");
|
||||
assert!(note.note.is_some());
|
||||
let directory = events
|
||||
.iter()
|
||||
.find(|event| event.path == new_directory.to_string_lossy())
|
||||
.unwrap();
|
||||
assert_eq!(directory.event_type, "modify");
|
||||
assert!(directory.note.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn batching_keeps_distinct_external_changes_and_deleted_directories() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let first = vault.path().join("First.md");
|
||||
let second = vault.path().join("Second.md");
|
||||
let removed = vault.path().join("Removed.notebook");
|
||||
std::fs::write(&first, "first external change").unwrap();
|
||||
std::fs::write(&second, "second external change").unwrap();
|
||||
let events = mapped_events(
|
||||
vec![
|
||||
Event::new(EventKind::Create(CreateKind::File)).add_path(first.clone()),
|
||||
Event::new(EventKind::Modify(ModifyKind::Any)).add_path(first.clone()),
|
||||
Event::new(EventKind::Create(CreateKind::File)).add_path(second.clone()),
|
||||
Event::new(EventKind::Remove(RemoveKind::Folder)).add_path(removed.clone()),
|
||||
],
|
||||
vault.path(),
|
||||
);
|
||||
|
||||
let first_event = events
|
||||
.iter()
|
||||
.find(|event| event.path == first.to_string_lossy())
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
first_event.note.as_ref().unwrap().preview,
|
||||
"first external change"
|
||||
);
|
||||
let second_event = events
|
||||
.iter()
|
||||
.find(|event| event.path == second.to_string_lossy())
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
second_event.note.as_ref().unwrap().preview,
|
||||
"second external change"
|
||||
);
|
||||
let removed_event = events
|
||||
.iter()
|
||||
.find(|event| event.path == removed.to_string_lossy())
|
||||
.unwrap();
|
||||
assert_eq!(removed_event.event_type, "remove");
|
||||
assert!(removed_event.note.is_none());
|
||||
assert_eq!(
|
||||
events
|
||||
.iter()
|
||||
.filter(|event| event.path == first.to_string_lossy())
|
||||
.count(),
|
||||
1
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||
"productName": "HelixNotes",
|
||||
"version": "1.3.5",
|
||||
"version": "1.3.6",
|
||||
"identifier": "com.helixnotes.app",
|
||||
"build": {
|
||||
"frontendDist": "../build",
|
||||
|
||||
@@ -2,7 +2,15 @@
|
||||
"app": {
|
||||
"windows": [
|
||||
{
|
||||
"title": "HelixNotes",
|
||||
"label": "main",
|
||||
"width": 1200,
|
||||
"height": 800,
|
||||
"minWidth": 800,
|
||||
"minHeight": 500,
|
||||
"resizable": true,
|
||||
"fullscreen": false,
|
||||
"decorations": false,
|
||||
"visible": false
|
||||
}
|
||||
]
|
||||
|
||||
+137
-70
@@ -7,16 +7,20 @@ import type {
|
||||
NoteMeta,
|
||||
NotebookEntry,
|
||||
NoteTitleEntry,
|
||||
SearchResult,
|
||||
SearchPage,
|
||||
TrashContents,
|
||||
VaultState,
|
||||
VaultStats,
|
||||
TagStyle,
|
||||
TagStyleChange,
|
||||
ImportResult,
|
||||
BackupEntry,
|
||||
VersionEntry,
|
||||
TaskItem,
|
||||
ExternalVaultResult,
|
||||
StartupView,
|
||||
ToolbarLayout,
|
||||
PendingOpenFile,
|
||||
} from "./types";
|
||||
|
||||
export async function openVault(path: string): Promise<void> {
|
||||
@@ -39,6 +43,14 @@ export async function getAppConfig(): Promise<AppConfig> {
|
||||
return invoke("get_app_config");
|
||||
}
|
||||
|
||||
export async function completeWindowClose(): Promise<void> {
|
||||
return invoke("complete_window_close");
|
||||
}
|
||||
|
||||
export async function cancelWindowClose(): Promise<void> {
|
||||
return invoke("cancel_window_close");
|
||||
}
|
||||
|
||||
export async function setTheme(theme: string): Promise<void> {
|
||||
return invoke("set_theme", { theme });
|
||||
}
|
||||
@@ -75,6 +87,10 @@ export async function setScrollToChangeFontSize(enabled: boolean): Promise<void>
|
||||
return invoke("set_scroll_to_change_font_size", { enabled });
|
||||
}
|
||||
|
||||
export async function setToolbarLayout(layout: ToolbarLayout | null): Promise<void> {
|
||||
return invoke("set_toolbar_layout", { layout });
|
||||
}
|
||||
|
||||
export async function setFontFamily(family: string): Promise<void> {
|
||||
return invoke("set_font_family", { family });
|
||||
}
|
||||
@@ -100,28 +116,31 @@ export async function countRootNotes(): Promise<number> {
|
||||
}
|
||||
|
||||
export async function createNotebook(
|
||||
vaultPath: string,
|
||||
parentRelative: string | null,
|
||||
name: string,
|
||||
): Promise<NotebookEntry> {
|
||||
return invoke("create_notebook", { parentRelative, name });
|
||||
return invoke("create_notebook", { vaultPath, parentRelative, name });
|
||||
}
|
||||
|
||||
export async function renameNotebook(
|
||||
vaultPath: string,
|
||||
path: string,
|
||||
newName: string,
|
||||
): Promise<string> {
|
||||
return invoke("rename_notebook", { path, newName });
|
||||
return invoke("rename_notebook", { vaultPath, path, newName });
|
||||
}
|
||||
|
||||
export async function deleteNotebook(path: string): Promise<void> {
|
||||
return invoke("delete_notebook", { path });
|
||||
export async function deleteNotebook(vaultPath: string, path: string): Promise<void> {
|
||||
return invoke("delete_notebook", { vaultPath, path });
|
||||
}
|
||||
|
||||
export async function moveNotebook(
|
||||
vaultPath: string,
|
||||
notebookPath: string,
|
||||
destParent: string,
|
||||
): Promise<string> {
|
||||
return invoke("move_notebook", { notebookPath, destParent });
|
||||
return invoke("move_notebook", { vaultPath, notebookPath, destParent });
|
||||
}
|
||||
|
||||
export async function getNotes(
|
||||
@@ -130,57 +149,62 @@ export async function getNotes(
|
||||
return invoke("get_notes", { notebookPath });
|
||||
}
|
||||
|
||||
export async function readNote(path: string): Promise<NoteContent> {
|
||||
return invoke("read_note", { path });
|
||||
export async function readNote(vaultPath: string, path: string): Promise<NoteContent> {
|
||||
return invoke("read_note", { vaultPath, path });
|
||||
}
|
||||
|
||||
export async function saveNote(
|
||||
vaultPath: string,
|
||||
path: string,
|
||||
meta: NoteMeta,
|
||||
body: string,
|
||||
): Promise<void> {
|
||||
return invoke("save_note", { path, meta, body });
|
||||
expectedRaw: string,
|
||||
): Promise<NoteContent> {
|
||||
return invoke("save_note", { vaultPath, path, meta, body, expectedRaw });
|
||||
}
|
||||
|
||||
export async function createNote(
|
||||
vaultPath: string,
|
||||
notebookRelative: string | null,
|
||||
title: string,
|
||||
): Promise<NoteEntry> {
|
||||
return invoke("create_note", { notebookRelative, title });
|
||||
return invoke("create_note", { vaultPath, notebookRelative, title });
|
||||
}
|
||||
|
||||
export async function duplicateNote(path: string): Promise<NoteEntry> {
|
||||
return invoke("duplicate_note", { path });
|
||||
export async function duplicateNote(vaultPath: string, path: string): Promise<NoteEntry> {
|
||||
return invoke("duplicate_note", { vaultPath, path });
|
||||
}
|
||||
|
||||
export async function createDailyNote(date?: string): Promise<NoteEntry> {
|
||||
return invoke("create_daily_note", { date: date ?? null });
|
||||
export async function createDailyNote(vaultPath: string, date?: string): Promise<NoteEntry> {
|
||||
return invoke("create_daily_note", { vaultPath, date: date ?? null });
|
||||
}
|
||||
|
||||
export async function renameNote(
|
||||
vaultPath: string,
|
||||
path: string,
|
||||
newTitle: string,
|
||||
): Promise<string> {
|
||||
return invoke("rename_note", { path, newTitle });
|
||||
return invoke("rename_note", { vaultPath, path, newTitle });
|
||||
}
|
||||
|
||||
export async function deleteNote(path: string): Promise<void> {
|
||||
return invoke("delete_note", { path });
|
||||
export async function deleteNote(vaultPath: string, path: string): Promise<void> {
|
||||
return invoke("delete_note", { vaultPath, path });
|
||||
}
|
||||
|
||||
export async function moveNote(
|
||||
vaultPath: string,
|
||||
notePath: string,
|
||||
destNotebook: string,
|
||||
): Promise<string> {
|
||||
return invoke("move_note", { notePath, destNotebook });
|
||||
return invoke("move_note", { vaultPath, notePath, destNotebook });
|
||||
}
|
||||
|
||||
export async function getAllTags(): Promise<[string, number][]> {
|
||||
return invoke("get_all_tags");
|
||||
}
|
||||
|
||||
export async function getAllNoteTitles(): Promise<NoteTitleEntry[]> {
|
||||
return invoke("get_all_note_titles");
|
||||
export async function getAllNoteTitles(vaultPath: string): Promise<NoteTitleEntry[]> {
|
||||
return invoke("get_all_note_titles", { vaultPath });
|
||||
}
|
||||
|
||||
export async function getNoteSwitcherTitles(
|
||||
@@ -189,15 +213,16 @@ export async function getNoteSwitcherTitles(
|
||||
return invoke("get_note_switcher_titles", { recentPaths });
|
||||
}
|
||||
|
||||
export async function getGraphData(): Promise<{ nodes: { title: string; path: string }[]; edges: { source: number; target: number; bidirectional: boolean }[] }> {
|
||||
return invoke("get_graph_data");
|
||||
export async function getGraphData(vaultPath: string): Promise<{ nodes: { title: string; path: string }[]; edges: { source: number; target: number; bidirectional: boolean }[] }> {
|
||||
return invoke("get_graph_data", { vaultPath });
|
||||
}
|
||||
|
||||
export async function searchNotes(
|
||||
query: string,
|
||||
limit?: number,
|
||||
): Promise<SearchResult[]> {
|
||||
return invoke("search_notes", { query, limit });
|
||||
offset?: number,
|
||||
): Promise<SearchPage> {
|
||||
return invoke("search_notes", { query, limit, offset });
|
||||
}
|
||||
|
||||
export async function reindex(): Promise<void> {
|
||||
@@ -209,30 +234,31 @@ export async function getTrash(): Promise<TrashContents> {
|
||||
}
|
||||
|
||||
export async function restoreNote(
|
||||
vaultPath: string,
|
||||
trashPath: string,
|
||||
destNotebook: string | null,
|
||||
): Promise<string> {
|
||||
return invoke("restore_note", { trashPath, destNotebook });
|
||||
return invoke("restore_note", { vaultPath, trashPath, destNotebook });
|
||||
}
|
||||
|
||||
export async function restoreNotebook(trashPath: string): Promise<string> {
|
||||
return invoke("restore_notebook", { trashPath });
|
||||
export async function restoreNotebook(vaultPath: string, trashPath: string): Promise<string> {
|
||||
return invoke("restore_notebook", { vaultPath, trashPath });
|
||||
}
|
||||
|
||||
export async function permanentDelete(path: string): Promise<void> {
|
||||
return invoke("permanent_delete", { path });
|
||||
export async function permanentDelete(vaultPath: string, path: string): Promise<void> {
|
||||
return invoke("permanent_delete", { vaultPath, path });
|
||||
}
|
||||
|
||||
export async function emptyTrash(): Promise<void> {
|
||||
return invoke("empty_trash");
|
||||
export async function emptyTrash(vaultPath: string): Promise<void> {
|
||||
return invoke("empty_trash", { vaultPath });
|
||||
}
|
||||
|
||||
export async function loadVaultState(): Promise<VaultState> {
|
||||
return invoke("load_vault_state");
|
||||
export async function loadVaultState(vaultPath: string): Promise<VaultState> {
|
||||
return invoke("load_vault_state", { vaultPath });
|
||||
}
|
||||
|
||||
export async function saveVaultState(vaultState: VaultState): Promise<void> {
|
||||
return invoke("save_vault_state", { vaultState });
|
||||
export async function saveVaultState(vaultPath: string, vaultState: VaultState): Promise<void> {
|
||||
return invoke("save_vault_state", { vaultPath, vaultState });
|
||||
}
|
||||
|
||||
export async function copyTextToClipboard(text: string): Promise<void> {
|
||||
@@ -247,26 +273,58 @@ export async function copyImageToClipboard(path: string): Promise<void> {
|
||||
return invoke("copy_image_to_clipboard", { path });
|
||||
}
|
||||
|
||||
export async function saveImage(name: string, data: number[]): Promise<string> {
|
||||
return invoke("save_image", { name, data });
|
||||
export async function saveImage(vaultPath: string, name: string, data: number[]): Promise<string> {
|
||||
return invoke("save_image", { vaultPath, name, data });
|
||||
}
|
||||
|
||||
export async function saveAttachment(
|
||||
vaultPath: string,
|
||||
name: string,
|
||||
data: number[],
|
||||
): Promise<string> {
|
||||
return invoke("save_attachment", { name, data });
|
||||
return invoke("save_attachment", { vaultPath, name, data });
|
||||
}
|
||||
|
||||
export async function getNotebookIcons(): Promise<Record<string, string>> {
|
||||
return invoke("get_notebook_icons");
|
||||
export async function getNotebookIcons(vaultPath: string): Promise<Record<string, string>> {
|
||||
return invoke("get_notebook_icons", { vaultPath });
|
||||
}
|
||||
|
||||
export async function setNotebookIcon(
|
||||
vaultPath: string,
|
||||
notebookRelative: string,
|
||||
iconRelative: string | null,
|
||||
): Promise<void> {
|
||||
return invoke("set_notebook_icon", { notebookRelative, iconRelative });
|
||||
return invoke("set_notebook_icon", { vaultPath, notebookRelative, iconRelative });
|
||||
}
|
||||
|
||||
export async function getTagStyles(vaultPath: string): Promise<Record<string, TagStyle>> {
|
||||
return invoke("get_tag_styles", { vaultPath });
|
||||
}
|
||||
|
||||
export async function setTagStyle(
|
||||
vaultPath: string,
|
||||
tag: string,
|
||||
change: TagStyleChange,
|
||||
): Promise<TagStyle | null> {
|
||||
return invoke("set_tag_style", { vaultPath, tag, change });
|
||||
}
|
||||
|
||||
export async function importNotebookIcon(
|
||||
vaultPath: string,
|
||||
notebookRelative: string,
|
||||
name: string,
|
||||
data: number[],
|
||||
): Promise<string> {
|
||||
return invoke("import_notebook_icon", { vaultPath, notebookRelative, name, data });
|
||||
}
|
||||
|
||||
export async function importTagIcon(
|
||||
vaultPath: string,
|
||||
tag: string,
|
||||
name: string,
|
||||
data: number[],
|
||||
): Promise<TagStyle> {
|
||||
return invoke("import_tag_icon", { vaultPath, tag, name, data });
|
||||
}
|
||||
|
||||
export async function setGeneralSettings(
|
||||
@@ -327,16 +385,16 @@ export async function setGeneralSettings(
|
||||
});
|
||||
}
|
||||
|
||||
export async function getQuickAccess(): Promise<NoteEntry[]> {
|
||||
return invoke("get_quick_access");
|
||||
export async function getQuickAccess(vaultPath: string): Promise<NoteEntry[]> {
|
||||
return invoke("get_quick_access", { vaultPath });
|
||||
}
|
||||
|
||||
export async function addQuickAccess(noteRelative: string): Promise<void> {
|
||||
return invoke("add_quick_access", { noteRelative });
|
||||
export async function addQuickAccess(vaultPath: string, noteRelative: string): Promise<void> {
|
||||
return invoke("add_quick_access", { vaultPath, noteRelative });
|
||||
}
|
||||
|
||||
export async function removeQuickAccess(noteRelative: string): Promise<void> {
|
||||
return invoke("remove_quick_access", { noteRelative });
|
||||
export async function removeQuickAccess(vaultPath: string, noteRelative: string): Promise<void> {
|
||||
return invoke("remove_quick_access", { vaultPath, noteRelative });
|
||||
}
|
||||
|
||||
export async function reorderQuickAccess(paths: string[]): Promise<void> {
|
||||
@@ -352,12 +410,12 @@ export interface OrphanAttachment {
|
||||
size: number;
|
||||
}
|
||||
|
||||
export async function findOrphanedAttachments(): Promise<OrphanAttachment[]> {
|
||||
return invoke("find_orphaned_attachments");
|
||||
export async function findOrphanedAttachments(vaultPath: string): Promise<OrphanAttachment[]> {
|
||||
return invoke("find_orphaned_attachments", { vaultPath });
|
||||
}
|
||||
|
||||
export async function trashOrphanedAttachments(names: string[]): Promise<number> {
|
||||
return invoke("trash_orphaned_attachments", { names });
|
||||
export async function trashOrphanedAttachments(vaultPath: string, names: string[]): Promise<number> {
|
||||
return invoke("trash_orphaned_attachments", { vaultPath, names });
|
||||
}
|
||||
|
||||
export async function importObsidian(): Promise<void> {
|
||||
@@ -396,20 +454,20 @@ export async function copyPngToClipboard(data: Uint8Array): Promise<void> {
|
||||
|
||||
// ── Backup ──
|
||||
|
||||
export async function createBackup(): Promise<void> {
|
||||
return invoke("create_backup");
|
||||
export async function createBackup(vaultPath: string): Promise<void> {
|
||||
return invoke("create_backup", { vaultPath });
|
||||
}
|
||||
|
||||
export async function listBackups(): Promise<BackupEntry[]> {
|
||||
return invoke("list_backups");
|
||||
export async function listBackups(vaultPath: string): Promise<BackupEntry[]> {
|
||||
return invoke("list_backups", { vaultPath });
|
||||
}
|
||||
|
||||
export async function restoreBackup(backupPath: string): Promise<void> {
|
||||
return invoke("restore_backup", { backupPath });
|
||||
export async function restoreBackup(vaultPath: string, backupPath: string): Promise<void> {
|
||||
return invoke("restore_backup", { vaultPath, backupPath });
|
||||
}
|
||||
|
||||
export async function deleteBackup(backupPath: string): Promise<void> {
|
||||
return invoke("delete_backup", { backupPath });
|
||||
export async function deleteBackup(vaultPath: string, backupPath: string): Promise<void> {
|
||||
return invoke("delete_backup", { vaultPath, backupPath });
|
||||
}
|
||||
|
||||
export async function setBackupSettings(
|
||||
@@ -430,35 +488,38 @@ export async function setBackupSettings(
|
||||
|
||||
// ── Tasks ──
|
||||
|
||||
export async function getTasks(): Promise<TaskItem[]> {
|
||||
return invoke("get_tasks");
|
||||
export async function getTasks(notePath?: string): Promise<TaskItem[]> {
|
||||
return invoke("get_tasks", { notePath: notePath ?? null });
|
||||
}
|
||||
|
||||
export async function setTaskDone(
|
||||
vaultPath: string,
|
||||
notePath: string,
|
||||
line: number,
|
||||
rawLine: string,
|
||||
done: boolean,
|
||||
): Promise<void> {
|
||||
return invoke("set_task_done", { notePath, line, rawLine, done });
|
||||
return invoke("set_task_done", { vaultPath, notePath, line, rawLine, done });
|
||||
}
|
||||
|
||||
export async function setTaskPriority(
|
||||
vaultPath: string,
|
||||
notePath: string,
|
||||
line: number,
|
||||
rawLine: string,
|
||||
priority: string | null,
|
||||
): Promise<void> {
|
||||
return invoke("set_task_priority", { notePath, line, rawLine, priority });
|
||||
return invoke("set_task_priority", { vaultPath, notePath, line, rawLine, priority });
|
||||
}
|
||||
|
||||
export async function setTaskDue(
|
||||
vaultPath: string,
|
||||
notePath: string,
|
||||
line: number,
|
||||
rawLine: string,
|
||||
due: string | null,
|
||||
): Promise<void> {
|
||||
return invoke("set_task_due", { notePath, line, rawLine, due });
|
||||
return invoke("set_task_due", { vaultPath, notePath, line, rawLine, due });
|
||||
}
|
||||
|
||||
// ── Sync (WebDAV) ──
|
||||
@@ -485,22 +546,24 @@ export async function syncNow(): Promise<void> {
|
||||
|
||||
// ── Version History ──
|
||||
|
||||
export async function getNoteVersions(noteId: string): Promise<VersionEntry[]> {
|
||||
return invoke("get_note_versions", { noteId });
|
||||
export async function getNoteVersions(vaultPath: string, noteId: string): Promise<VersionEntry[]> {
|
||||
return invoke("get_note_versions", { vaultPath, noteId });
|
||||
}
|
||||
|
||||
export async function getNoteVersionContent(
|
||||
vaultPath: string,
|
||||
noteId: string,
|
||||
timestamp: string,
|
||||
): Promise<string> {
|
||||
return invoke("get_note_version_content", { noteId, timestamp });
|
||||
return invoke("get_note_version_content", { vaultPath, noteId, timestamp });
|
||||
}
|
||||
|
||||
export async function createVersion(
|
||||
vaultPath: string,
|
||||
path: string,
|
||||
noteId: string,
|
||||
): Promise<void> {
|
||||
return invoke("create_version", { path, noteId });
|
||||
return invoke("create_version", { vaultPath, path, noteId });
|
||||
}
|
||||
|
||||
// ── AI ──
|
||||
@@ -542,6 +605,10 @@ export async function isMobilePlatform(): Promise<boolean> {
|
||||
return invoke("is_mobile_platform");
|
||||
}
|
||||
|
||||
export async function getPendingOpenFile(): Promise<string | null> {
|
||||
export async function getPendingOpenFile(): Promise<PendingOpenFile | null> {
|
||||
return invoke("get_pending_open_file");
|
||||
}
|
||||
|
||||
export async function ackPendingOpenFile(id: number): Promise<void> {
|
||||
return invoke("ack_pending_open_file", { id });
|
||||
}
|
||||
+539
-239
File diff suppressed because it is too large.
Load diff
@@ -164,10 +164,15 @@
|
||||
}
|
||||
});
|
||||
|
||||
function handleEscape(e: KeyboardEvent) {
|
||||
if (e.key !== 'Escape') return;
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
$showCommandPalette = false;
|
||||
}
|
||||
|
||||
function handleKeydown(e: KeyboardEvent) {
|
||||
if (e.key === 'Escape') {
|
||||
$showCommandPalette = false;
|
||||
} else if (e.key === 'ArrowDown') {
|
||||
if (e.key === 'ArrowDown') {
|
||||
e.preventDefault();
|
||||
selectedIndex = Math.min(selectedIndex + 1, filteredCommands.length - 1);
|
||||
} else if (e.key === 'ArrowUp') {
|
||||
@@ -194,7 +199,7 @@
|
||||
|
||||
{#if $showCommandPalette}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="palette-overlay" onclick={() => ($showCommandPalette = false)} onkeydown={handleKeydown}>
|
||||
<div class="palette-overlay" onclick={() => ($showCommandPalette = false)} onkeydowncapture={handleEscape} onkeydown={handleKeydown}>
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="palette-panel" onclick={(e) => e.stopPropagation()} onkeydown={(e) => e.stopPropagation()}>
|
||||
<div class="palette-input-wrapper">
|
||||
|
||||
+2588
-1698
File diff suppressed because it is too large.
Load diff
@@ -1,8 +1,9 @@
|
||||
<script lang="ts">
|
||||
import { onDestroy } from 'svelte';
|
||||
import { onDestroy, untrack } from 'svelte';
|
||||
import { getGraphData } from '$lib/api';
|
||||
import { activeNotePath, appConfig } from '$lib/stores/app';
|
||||
import { isMobile } from '$lib/platform';
|
||||
import { applyGraphRepulsion } from '$lib/utils/graph-layout';
|
||||
|
||||
let { onclose, onnavigate }: {
|
||||
onclose: () => void;
|
||||
@@ -14,7 +15,7 @@
|
||||
let searchQuery = $state('');
|
||||
let localMode = $state(true); // default: show only active note's neighborhood
|
||||
|
||||
const dataPromise = getGraphData();
|
||||
const dataPromise = getGraphData($appConfig!.active_vault!);
|
||||
|
||||
interface GraphNode { id: string; title: string; path: string; x: number; y: number; vx: number; vy: number; }
|
||||
interface GraphEdge { sourceIdx: number; targetIdx: number; bidirectional: boolean; }
|
||||
@@ -39,14 +40,15 @@
|
||||
let hoveredIdx = -1;
|
||||
let hoveredNeighborSet: Set<number> = new Set();
|
||||
let hoveredEdgeSet: Set<number> = new Set();
|
||||
let glowPhase = 0;
|
||||
let activeNodeIdx = $state(-1);
|
||||
let navigatedFromGraph = false;
|
||||
|
||||
// Combined animation loop
|
||||
// Physics runs in short yielded batches; the completed graph is static.
|
||||
let physicsRemaining = 0;
|
||||
let animFrameId = 0;
|
||||
let lastGlowTs = 0;
|
||||
let physicsStep: Generator<void> | null = null;
|
||||
const layoutChannel = new MessageChannel();
|
||||
let layoutScheduled = false;
|
||||
let disposed = false;
|
||||
|
||||
// DPI fix
|
||||
let dpr = 1;
|
||||
@@ -156,6 +158,7 @@
|
||||
loading = true;
|
||||
try {
|
||||
const data = await dataPromise;
|
||||
if (disposed) return;
|
||||
const w = canvasW || 800;
|
||||
const h = canvasH || 600;
|
||||
|
||||
@@ -188,7 +191,6 @@
|
||||
} catch (e) {
|
||||
console.error('Failed to build graph:', e);
|
||||
}
|
||||
loading = false;
|
||||
startSimulation();
|
||||
}
|
||||
|
||||
@@ -232,83 +234,60 @@
|
||||
}
|
||||
|
||||
function startSimulation() {
|
||||
// Initial settle - enough for a rough layout, camera set after full physics
|
||||
for (let i = 0; i < 80; i++) simulate();
|
||||
|
||||
// Show the full graph while physics finishes settling
|
||||
fitToView();
|
||||
draw();
|
||||
|
||||
// Queue remaining physics - camera will snap to active note when done
|
||||
physicsRemaining = Math.min(400, Math.max(150, nodes.length * 3));
|
||||
startAnimLoop();
|
||||
// Keep the original initial layout; omit the animated settling tail.
|
||||
physicsRemaining = nodes.length > 0 ? 80 : 0;
|
||||
physicsStep = null;
|
||||
if (physicsRemaining === 0) {
|
||||
loading = false;
|
||||
draw();
|
||||
} else {
|
||||
startLayoutLoop();
|
||||
}
|
||||
}
|
||||
|
||||
function startAnimLoop() {
|
||||
if (animFrameId) cancelAnimationFrame(animFrameId);
|
||||
lastGlowTs = 0;
|
||||
function startLayoutLoop() {
|
||||
if (disposed || layoutScheduled || physicsRemaining === 0) return;
|
||||
|
||||
function loop(ts: number) {
|
||||
let needsDraw = false;
|
||||
|
||||
// Physics batch
|
||||
if (physicsRemaining > 0) {
|
||||
const batch = Math.min(20, physicsRemaining);
|
||||
for (let i = 0; i < batch; i++) simulate();
|
||||
physicsRemaining -= batch;
|
||||
// When physics is fully settled, snap camera to active note
|
||||
if (physicsRemaining === 0) {
|
||||
if (activeNodeIdx >= 0) centerOnActiveNote(); else fitToView();
|
||||
function loop() {
|
||||
layoutScheduled = false;
|
||||
if (disposed) return;
|
||||
// Yield between repulsion rows, including within a large physics step.
|
||||
const deadline = performance.now() + 8;
|
||||
do {
|
||||
physicsStep ??= simulate();
|
||||
if (physicsStep.next().done) {
|
||||
physicsStep = null;
|
||||
physicsRemaining--;
|
||||
}
|
||||
needsDraw = true;
|
||||
}
|
||||
} while (physicsRemaining > 0 && performance.now() < deadline);
|
||||
|
||||
// Glow pulse for active node - throttled to ~30fps
|
||||
if (activeNodeIdx >= 0) {
|
||||
const elapsed = lastGlowTs > 0 ? Math.min(ts - lastGlowTs, 100) : 16.67;
|
||||
if (lastGlowTs === 0 || ts - lastGlowTs >= 33) {
|
||||
glowPhase += 0.04 * (elapsed / 16.67);
|
||||
lastGlowTs = ts;
|
||||
needsDraw = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (needsDraw) draw();
|
||||
|
||||
if (physicsRemaining > 0 || activeNodeIdx >= 0) {
|
||||
animFrameId = requestAnimationFrame(loop);
|
||||
if (physicsRemaining === 0) {
|
||||
loading = false;
|
||||
if (activeNodeIdx >= 0) centerOnActiveNote(); else fitToView();
|
||||
draw();
|
||||
} else {
|
||||
animFrameId = 0;
|
||||
layoutScheduled = true;
|
||||
layoutChannel.port2.postMessage(null);
|
||||
}
|
||||
}
|
||||
animFrameId = requestAnimationFrame(loop);
|
||||
// A queued task yields to input without waiting for a display frame or timer clamp.
|
||||
layoutChannel.port1.onmessage = loop;
|
||||
layoutScheduled = true;
|
||||
layoutChannel.port2.postMessage(null);
|
||||
}
|
||||
|
||||
function simulate() {
|
||||
const nodeCount = nodes.length;
|
||||
function* simulate(): Generator<void> {
|
||||
const graphNodes = nodes;
|
||||
const nodeCount = graphNodes.length;
|
||||
if (nodeCount === 0) return;
|
||||
const w = canvasW || 800, h = canvasH || 600;
|
||||
const centerX = w / 2, centerY = h / 2;
|
||||
|
||||
// Repulsion
|
||||
for (let i = 0; i < nodeCount; i++) {
|
||||
const a = nodes[i];
|
||||
for (let j = i + 1; j < nodeCount; j++) {
|
||||
const b = nodes[j];
|
||||
const dx = b.x - a.x, dy = b.y - a.y;
|
||||
const distSq = dx * dx + dy * dy;
|
||||
if (distSq > 360000) continue;
|
||||
const d = distSq || 1;
|
||||
const force = 1500 / d;
|
||||
const dist = Math.sqrt(d);
|
||||
const fx = (dx / dist) * force, fy = (dy / dist) * force;
|
||||
a.vx -= fx; a.vy -= fy; b.vx += fx; b.vy += fy;
|
||||
}
|
||||
}
|
||||
yield* applyGraphRepulsion(graphNodes);
|
||||
|
||||
// Spring attraction along edges
|
||||
for (const edge of edges) {
|
||||
const a = nodes[edge.sourceIdx], b = nodes[edge.targetIdx];
|
||||
const a = graphNodes[edge.sourceIdx], b = graphNodes[edge.targetIdx];
|
||||
const dx = b.x - a.x, dy = b.y - a.y;
|
||||
const dist = Math.sqrt(dx * dx + dy * dy) || 1;
|
||||
const force = (dist - 130) * 0.012;
|
||||
@@ -318,14 +297,14 @@
|
||||
|
||||
// Center gravity - weaker for isolated nodes so they spread instead of clustering
|
||||
for (let i = 0; i < nodeCount; i++) {
|
||||
const node = nodes[i];
|
||||
const node = graphNodes[i];
|
||||
const gravity = (nodeDegree[i] || 0) === 0 ? 0.0002 : 0.0008;
|
||||
node.vx += (centerX - node.x) * gravity;
|
||||
node.vy += (centerY - node.y) * gravity;
|
||||
}
|
||||
|
||||
// Damping + integration
|
||||
for (const node of nodes) {
|
||||
for (const node of graphNodes) {
|
||||
if (node === dragging) continue;
|
||||
node.vx *= 0.85; node.vy *= 0.85;
|
||||
node.x += node.vx; node.y += node.vy;
|
||||
@@ -333,7 +312,7 @@
|
||||
}
|
||||
|
||||
function draw() {
|
||||
if (!canvas) return;
|
||||
if (!canvas || loading) return;
|
||||
const ctx = canvas.getContext('2d');
|
||||
if (!ctx) return;
|
||||
|
||||
@@ -345,7 +324,6 @@
|
||||
|
||||
const { border: borderColor, text: textColor, textSec, accent, bg: bgColor } = getStyles();
|
||||
const activePath = $activeNotePath || '';
|
||||
const pulse = 0.5 + 0.5 * Math.sin(glowPhase);
|
||||
const isHovering = hoveredIdx >= 0;
|
||||
const isSearching = searchMatchSet !== null;
|
||||
|
||||
@@ -497,12 +475,11 @@
|
||||
|
||||
const radius = getNodeRadius(i, isActive);
|
||||
|
||||
// Active glow ring - opacity pulse, no radius change
|
||||
// Keep the active note highlighted without redrawing an idle graph.
|
||||
if (isActive) {
|
||||
const glowR = radius + 12;
|
||||
const glow = ctx.createRadialGradient(node.x, node.y, radius, node.x, node.y, glowR);
|
||||
const glowAlpha = Math.round((0.25 + pulse * 0.45) * 255).toString(16).padStart(2, '0');
|
||||
glow.addColorStop(0, accent + glowAlpha);
|
||||
glow.addColorStop(0, accent + '80');
|
||||
glow.addColorStop(1, accent + '00');
|
||||
ctx.globalAlpha = 1;
|
||||
ctx.beginPath();
|
||||
@@ -524,9 +501,9 @@
|
||||
}
|
||||
ctx.fill();
|
||||
|
||||
// Active outer ring - static, alpha pulse only
|
||||
// Static active outer ring.
|
||||
if (isActive) {
|
||||
ctx.globalAlpha = 0.35 + pulse * 0.3;
|
||||
ctx.globalAlpha = 0.5;
|
||||
ctx.beginPath();
|
||||
ctx.arc(node.x, node.y, radius + 3, 0, Math.PI * 2);
|
||||
ctx.strokeStyle = accent;
|
||||
@@ -587,7 +564,7 @@
|
||||
}
|
||||
|
||||
function getNodeAt(clientX: number, clientY: number): GraphNode | null {
|
||||
if (!canvas) return null;
|
||||
if (!canvas || loading) return null;
|
||||
const rect = canvas.getBoundingClientRect();
|
||||
const x = (clientX - rect.left - pan.x) / zoom;
|
||||
const y = (clientY - rect.top - pan.y) / zoom;
|
||||
@@ -627,8 +604,7 @@
|
||||
if (node !== hoveredNode) {
|
||||
updateHoveredState(node);
|
||||
if (canvas) canvas.style.cursor = node ? 'pointer' : 'grab';
|
||||
// Restart loop if it stopped (for immediate hover redraws)
|
||||
if (!animFrameId) draw();
|
||||
if (!layoutScheduled) draw();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -754,20 +730,21 @@
|
||||
navigatedFromGraph = false;
|
||||
centerOnActiveNote();
|
||||
}
|
||||
if (newIdx >= 0 && !animFrameId && canvas) startAnimLoop();
|
||||
else if (newIdx < 0 && !animFrameId && canvas) draw(); // remove stale glow immediately
|
||||
if (!layoutScheduled && canvas) untrack(draw);
|
||||
});
|
||||
|
||||
// React to search query changes
|
||||
$effect(() => {
|
||||
const _q = searchQuery; // track
|
||||
updateSearchMatch();
|
||||
if (canvas && !animFrameId) draw();
|
||||
if (activeNodeIdx >= 0 && !animFrameId && canvas) startAnimLoop();
|
||||
if (canvas && !layoutScheduled) untrack(draw);
|
||||
});
|
||||
|
||||
onDestroy(() => {
|
||||
if (animFrameId) cancelAnimationFrame(animFrameId);
|
||||
disposed = true;
|
||||
layoutChannel.port1.onmessage = null;
|
||||
layoutChannel.port1.close();
|
||||
layoutChannel.port2.close();
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
@@ -236,6 +236,7 @@
|
||||
<img
|
||||
bind:this={imageElement}
|
||||
class:interacting
|
||||
crossorigin="anonymous"
|
||||
src={src}
|
||||
alt={alt}
|
||||
draggable="false"
|
||||
|
||||
@@ -95,6 +95,13 @@
|
||||
if (event.target === event.currentTarget) close();
|
||||
}
|
||||
|
||||
function handleEscape(event: KeyboardEvent) {
|
||||
if (event.key !== 'Escape') return;
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
close();
|
||||
}
|
||||
|
||||
function openLink(url: string) {
|
||||
openUrl(url).catch(console.error);
|
||||
}
|
||||
@@ -104,7 +111,7 @@
|
||||
|
||||
{#if $showInfo}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="info-overlay" onclick={closeFromOverlay} onkeydown={(e) => { if (e.key === 'Escape') close(); }}>
|
||||
<div class="info-overlay" onclick={closeFromOverlay} onkeydowncapture={handleEscape} onkeydown={handleEscape}>
|
||||
<div class="info-panel">
|
||||
<div class="info-header">
|
||||
<h2>Info</h2>
|
||||
|
||||
+431
-224
File diff suppressed because it is too large.
Load diff
@@ -82,7 +82,7 @@
|
||||
const requestPaths = buildNoteSwitcherRequestPaths($activeNotePath, $navHistory.stack);
|
||||
const [titlesResult, quickAccessResult] = await Promise.allSettled([
|
||||
getNoteSwitcherTitles(requestPaths),
|
||||
getQuickAccess()
|
||||
getQuickAccess(vaultPath)
|
||||
]);
|
||||
if (!open || generation !== loadGeneration) return;
|
||||
|
||||
@@ -270,7 +270,7 @@
|
||||
type="button"
|
||||
aria-label={`Open ${row.title} in new window`}
|
||||
title={`Open ${row.title} in new window`}
|
||||
onclick={() => openNoteWindow(row.path, row.title)}
|
||||
onclick={() => { if (loadedVaultPath) void openNoteWindow(loadedVaultPath, row.path, row.title); }}
|
||||
>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
|
||||
<rect x="4" y="4" width="13" height="13" rx="2" />
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { onMount, onDestroy } from 'svelte';
|
||||
import { onMount, onDestroy, untrack } from 'svelte';
|
||||
import { listen } from '@tauri-apps/api/event';
|
||||
import { getCurrentWebview } from '@tauri-apps/api/webview';
|
||||
import { getCurrentWindow } from '@tauri-apps/api/window';
|
||||
@@ -10,13 +10,18 @@
|
||||
activeNotePath,
|
||||
editorDirty,
|
||||
readOnly,
|
||||
sourceMode
|
||||
sourceMode,
|
||||
tagStyles
|
||||
} from '$lib/stores/app';
|
||||
import { readNote } from '$lib/api';
|
||||
import { completeWindowClose, cancelWindowClose, getTagStyles, readNote } from '$lib/api';
|
||||
import { keybindings, matchAction } from '$lib/keybindings';
|
||||
import { isMobile } from '$lib/platform';
|
||||
import type { FileEvent } from '$lib/types';
|
||||
import { isCurrentVaultEvent } from '$lib/utils/note-list-updates';
|
||||
import { beginNoteNavigation, isCurrentNoteNavigation, cancelNoteNavigation } from '$lib/utils/note-navigation';
|
||||
|
||||
let { notePath }: { notePath: string } = $props();
|
||||
let { notePath, vaultPath }: { notePath: string; vaultPath: string | null } = $props();
|
||||
const ownerVault = untrack(() => vaultPath);
|
||||
|
||||
const appWindow = getCurrentWindow();
|
||||
const appWebview = getCurrentWebview();
|
||||
@@ -24,11 +29,19 @@
|
||||
let editor = $state<Editor>(null!);
|
||||
let unlistenFileChange: (() => void) | null = null;
|
||||
let unlistenUiScale: (() => void) | null = null;
|
||||
let unlistenClose: (() => void) | null = null;
|
||||
let unlistenVaultRestored: (() => void) | null = null;
|
||||
let removeMobileFlushListeners: (() => void) | null = null;
|
||||
let maximized = $state(false);
|
||||
let loadError = $state<string | null>(null);
|
||||
let disposed = false;
|
||||
let initialNavigationToken: number | null = null;
|
||||
let initialLoadTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
let fileRefreshRequest = 0;
|
||||
|
||||
async function checkMaximized() {
|
||||
maximized = await appWindow.isMaximized();
|
||||
const value = await appWindow.isMaximized();
|
||||
if (!disposed) maximized = value;
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
@@ -36,6 +49,11 @@
|
||||
const unlisten = appWindow.onResized(() => checkMaximized());
|
||||
return () => { unlisten.then(fn => fn()); };
|
||||
});
|
||||
$effect(() => {
|
||||
const title = $activeNote?.meta.title;
|
||||
if (title && !disposed) void appWindow.setTitle(`${title} - HelixNotes`);
|
||||
});
|
||||
|
||||
|
||||
let lastMouseDown = 0;
|
||||
const RESIZE_EDGE = 6;
|
||||
@@ -79,44 +97,150 @@
|
||||
}
|
||||
}
|
||||
|
||||
onMount(async () => {
|
||||
unlistenUiScale = await listen<number>('ui-scale-changed', (event) => {
|
||||
void applyUiScale(event.payload);
|
||||
});
|
||||
await applyUiScale($appConfig?.ui_scale ?? 1);
|
||||
|
||||
try {
|
||||
const content = await readNote(notePath);
|
||||
$activeNote = content;
|
||||
$activeNotePath = notePath;
|
||||
$editorDirty = false;
|
||||
setTimeout(() => {
|
||||
editor?.loadNote(notePath, content.content);
|
||||
appWindow.setTitle(`${content.meta.title} - HelixNotes`);
|
||||
}, 50);
|
||||
} catch (e) {
|
||||
loadError = String(e);
|
||||
onMount(() => {
|
||||
const vault = ownerVault;
|
||||
const path = notePath;
|
||||
const token = beginNoteNavigation();
|
||||
initialNavigationToken = token;
|
||||
const isCurrentOwner = () => !disposed && (vault === null || vault === $appConfig?.active_vault);
|
||||
if (isMobile) {
|
||||
const flush = () => {
|
||||
if (isCurrentOwner()) void editor?.flushSave();
|
||||
};
|
||||
const onVisibilityChange = () => {
|
||||
if (document.visibilityState === 'hidden') flush();
|
||||
};
|
||||
document.addEventListener('visibilitychange', onVisibilityChange);
|
||||
window.addEventListener('pagehide', flush);
|
||||
window.addEventListener('app-lifecycle-flush', flush);
|
||||
removeMobileFlushListeners = () => {
|
||||
document.removeEventListener('visibilitychange', onVisibilityChange);
|
||||
window.removeEventListener('pagehide', flush);
|
||||
window.removeEventListener('app-lifecycle-flush', flush);
|
||||
};
|
||||
}
|
||||
|
||||
unlistenFileChange = await listen<FileEvent>('file-changed', async (event) => {
|
||||
if (event.payload.path === notePath && event.payload.event_type === 'modify') {
|
||||
if (!$editorDirty) {
|
||||
async function initialize() {
|
||||
if (!isMobile) {
|
||||
const closeListener = await appWindow.onCloseRequested(async (event) => {
|
||||
event.preventDefault();
|
||||
if (!isCurrentOwner()) { await cancelWindowClose(); return; }
|
||||
try {
|
||||
const content = await readNote(notePath);
|
||||
// Ignore the file-watcher echo of our own save; only reload genuine external edits.
|
||||
if (content.content.trim() !== (editor?.getCurrentBody() ?? '').trim()) {
|
||||
$activeNote = content;
|
||||
editor?.loadNote(notePath, content.content);
|
||||
}
|
||||
} catch (_) {}
|
||||
if (editor && !(await editor.flushSave())) { await cancelWindowClose(); return; }
|
||||
if (!isCurrentOwner()) { await cancelWindowClose(); return; }
|
||||
await completeWindowClose();
|
||||
} catch (error) {
|
||||
console.error('Failed to close window:', error);
|
||||
try { await cancelWindowClose(); } catch (cancelError) { console.error('Failed to cancel window close:', cancelError); }
|
||||
}
|
||||
});
|
||||
if (!isCurrentOwner()) {
|
||||
closeListener();
|
||||
return;
|
||||
}
|
||||
unlistenClose = closeListener;
|
||||
}
|
||||
if (!ownerVault) {
|
||||
loadError = 'This note window has no valid originating vault.';
|
||||
return;
|
||||
}
|
||||
|
||||
const scaleListener = await listen<number>('ui-scale-changed', (event) => {
|
||||
if (isCurrentOwner()) void applyUiScale(event.payload);
|
||||
});
|
||||
if (!isCurrentOwner()) {
|
||||
scaleListener();
|
||||
return;
|
||||
}
|
||||
unlistenUiScale = scaleListener;
|
||||
await applyUiScale($appConfig?.ui_scale ?? 1);
|
||||
if (!isCurrentOwner()) return;
|
||||
|
||||
try {
|
||||
const styles = await getTagStyles(ownerVault!);
|
||||
if (!isCurrentOwner()) return;
|
||||
$tagStyles = styles;
|
||||
} catch (e) {
|
||||
console.error('Failed to load tag styles:', e);
|
||||
}
|
||||
if (!isCurrentOwner()) return;
|
||||
|
||||
if (isCurrentNoteNavigation(token)) {
|
||||
try {
|
||||
const content = await readNote(ownerVault!, path);
|
||||
if (!isCurrentOwner()) return;
|
||||
if (isCurrentNoteNavigation(token)) {
|
||||
$activeNote = content;
|
||||
$activeNotePath = path;
|
||||
$editorDirty = false;
|
||||
initialLoadTimer = setTimeout(() => {
|
||||
initialLoadTimer = null;
|
||||
if (!isCurrentOwner() || !isCurrentNoteNavigation(token)
|
||||
|| $activeNotePath !== path || $activeNote !== content || $editorDirty) return;
|
||||
editor?.loadNote(path, content.content);
|
||||
}, 50);
|
||||
}
|
||||
} catch (e) {
|
||||
if (isCurrentOwner() && isCurrentNoteNavigation(token)) loadError = String(e);
|
||||
}
|
||||
}
|
||||
if (!isCurrentOwner()) return;
|
||||
|
||||
async function refreshOpenNote(restored = false) {
|
||||
const path = $activeNotePath;
|
||||
const openingNote = $activeNote;
|
||||
if (!path || !openingNote) return;
|
||||
const request = ++fileRefreshRequest;
|
||||
try {
|
||||
const content = await readNote(ownerVault!, path);
|
||||
if (!isCurrentOwner() || request !== fileRefreshRequest || $activeNotePath !== path) return;
|
||||
if ($editorDirty) {
|
||||
if (restored && content.raw !== editor?.getAcceptedRaw()) editor?.flagExternalConflict();
|
||||
return;
|
||||
}
|
||||
if ($activeNote !== openingNote || openingNote.raw === content.raw) return;
|
||||
$activeNote = content;
|
||||
editor?.loadNote(path, content.content);
|
||||
} catch (error) {
|
||||
if (restored && isCurrentOwner() && request === fileRefreshRequest && $activeNotePath === path) {
|
||||
if ($editorDirty) editor?.flagExternalConflict();
|
||||
else {
|
||||
$activeNote = null;
|
||||
$activeNotePath = null;
|
||||
loadError = 'This note was removed by the vault restore.';
|
||||
}
|
||||
} else if (!restored) console.error('Failed to refresh note window:', error);
|
||||
}
|
||||
}
|
||||
const fileListener = await listen<FileEvent>('file-changed', (event) => {
|
||||
if (!isCurrentOwner() || !isCurrentVaultEvent(event.payload, vault ?? null)) return;
|
||||
if (event.payload.note?.path === $activeNotePath) void refreshOpenNote();
|
||||
});
|
||||
if (!isCurrentOwner()) {
|
||||
fileListener();
|
||||
return;
|
||||
}
|
||||
unlistenFileChange = fileListener;
|
||||
unlistenVaultRestored = await listen<{ vault_path: string }>('vault-restored', ({ payload }) => {
|
||||
if (isCurrentOwner() && payload.vault_path === vault) void refreshOpenNote(true);
|
||||
});
|
||||
if (!isCurrentOwner()) { unlistenVaultRestored(); return; }
|
||||
}
|
||||
|
||||
void initialize().catch(error => {
|
||||
if (isCurrentOwner()) console.error('Failed to initialize note window:', error);
|
||||
});
|
||||
});
|
||||
|
||||
onDestroy(() => {
|
||||
disposed = true;
|
||||
if (initialNavigationToken !== null) cancelNoteNavigation(initialNavigationToken);
|
||||
if (initialLoadTimer !== null) clearTimeout(initialLoadTimer);
|
||||
unlistenFileChange?.();
|
||||
unlistenVaultRestored?.();
|
||||
removeMobileFlushListeners?.();
|
||||
unlistenUiScale?.();
|
||||
unlistenClose?.();
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
@@ -1,92 +1,160 @@
|
||||
<script lang="ts">
|
||||
import { showSearch, activeNote, activeNotePath, editorDirty, appConfig, mobileView, notebooks, activeNotebook, activeTag, viewMode } from '$lib/stores/app';
|
||||
import { searchNotes, readNote } from '$lib/api';
|
||||
import { debounce } from '$lib/utils/debounce';
|
||||
import type { SearchResult, NotebookEntry } from '$lib/types';
|
||||
import { tick } from 'svelte';
|
||||
import { showSearch, appConfig, notebooks } from '$lib/stores/app';
|
||||
import { searchNotes } from '$lib/api';
|
||||
import { relativePath } from '$lib/utils/paths';
|
||||
import type { SearchResult, SearchMatch, NotebookEntry } from '$lib/types';
|
||||
import { isMobile } from '$lib/platform';
|
||||
|
||||
let { onSelectNote }: {
|
||||
onSelectNote: (result: SearchResult, notebook: NotebookEntry | null, isCurrent: () => boolean) => Promise<boolean>;
|
||||
} = $props();
|
||||
|
||||
const PAGE_SIZE = 20;
|
||||
const currentVault = $derived($appConfig?.active_vault ?? null);
|
||||
let query = $state('');
|
||||
let results = $state<SearchResult[]>([]);
|
||||
let results = $state.raw<SearchResult[]>([]);
|
||||
let total = $state(0);
|
||||
let offset = $state(0);
|
||||
let loading = $state(false);
|
||||
let opening = $state(false);
|
||||
let error = $state('');
|
||||
let composing = $state(false);
|
||||
let selectedIndex = $state(0);
|
||||
let inputEl = $state<HTMLInputElement>(null!);
|
||||
let resultsEl = $state<HTMLDivElement>(null!);
|
||||
let requestGeneration = 0;
|
||||
let searchTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
const rows = $derived(results.map(result => ({
|
||||
result,
|
||||
title: textParts(result.title, result.title_matches),
|
||||
snippet: textParts(result.snippet, result.snippet_matches),
|
||||
})));
|
||||
|
||||
const doSearch = debounce(async (q: string) => {
|
||||
if (!q.trim()) {
|
||||
results = [];
|
||||
return;
|
||||
}
|
||||
function cancelSearch() {
|
||||
requestGeneration++;
|
||||
if (searchTimer !== null) clearTimeout(searchTimer);
|
||||
searchTimer = null;
|
||||
}
|
||||
|
||||
function isCurrent(generation: number, vault: string | null) {
|
||||
return generation === requestGeneration && $showSearch && vault === currentVault;
|
||||
}
|
||||
|
||||
async function runSearch(q: string, pageOffset: number, generation: number, vault: string | null) {
|
||||
searchTimer = null;
|
||||
if (!isCurrent(generation, vault)) return;
|
||||
try {
|
||||
results = await searchNotes(q, 20);
|
||||
const page = await searchNotes(q, PAGE_SIZE, pageOffset);
|
||||
if (!isCurrent(generation, vault)) return;
|
||||
results = page.results;
|
||||
total = page.total;
|
||||
selectedIndex = 0;
|
||||
} catch (e) {
|
||||
console.error('Search failed:', e);
|
||||
results = [];
|
||||
await tick();
|
||||
if (isCurrent(generation, vault) && resultsEl) resultsEl.scrollTop = 0;
|
||||
} catch (cause) {
|
||||
if (!isCurrent(generation, vault)) return;
|
||||
error = cause instanceof Error ? cause.message : String(cause);
|
||||
} finally {
|
||||
if (isCurrent(generation, vault)) loading = false;
|
||||
}
|
||||
}, 150);
|
||||
}
|
||||
|
||||
function startSearch(value: string, pageOffset = 0, immediate = false) {
|
||||
cancelSearch();
|
||||
query = value;
|
||||
results = [];
|
||||
selectedIndex = 0;
|
||||
error = '';
|
||||
opening = false;
|
||||
offset = pageOffset;
|
||||
if (pageOffset === 0) total = 0;
|
||||
const q = value.trim();
|
||||
loading = !!q && !composing;
|
||||
if (!loading) return;
|
||||
const generation = requestGeneration;
|
||||
const vault = currentVault;
|
||||
if (immediate) void runSearch(q, pageOffset, generation, vault);
|
||||
else searchTimer = setTimeout(() => void runSearch(q, pageOffset, generation, vault), 150);
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
if ($showSearch && inputEl) {
|
||||
query = '';
|
||||
results = [];
|
||||
selectedIndex = 0;
|
||||
setTimeout(() => inputEl?.focus(), 50);
|
||||
const open = $showSearch;
|
||||
const vault = currentVault;
|
||||
const input = inputEl;
|
||||
cancelSearch();
|
||||
query = '';
|
||||
results = [];
|
||||
total = 0;
|
||||
offset = 0;
|
||||
selectedIndex = 0;
|
||||
loading = false;
|
||||
opening = false;
|
||||
composing = false;
|
||||
error = '';
|
||||
if (open && input) {
|
||||
const generation = requestGeneration;
|
||||
void tick().then(() => { if (isCurrent(generation, vault)) input.focus(); });
|
||||
}
|
||||
return cancelSearch;
|
||||
});
|
||||
|
||||
function handleInput() {
|
||||
doSearch(query);
|
||||
function handleInput(event: Event) {
|
||||
if ((event as InputEvent).isComposing) composing = true;
|
||||
startSearch((event.currentTarget as HTMLInputElement).value);
|
||||
}
|
||||
|
||||
function scrollToSelected() {
|
||||
if (!resultsEl) return;
|
||||
const item = resultsEl.children[selectedIndex] as HTMLElement;
|
||||
if (item) item.scrollIntoView({ block: 'nearest' });
|
||||
void tick().then(() => {
|
||||
const item = resultsEl?.children[selectedIndex] as HTMLElement | undefined;
|
||||
item?.scrollIntoView({ block: 'nearest' });
|
||||
});
|
||||
}
|
||||
|
||||
function handleEscape(e: KeyboardEvent) {
|
||||
if (e.key !== 'Escape' || e.isComposing) return;
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
close();
|
||||
}
|
||||
|
||||
function handleKeydown(e: KeyboardEvent) {
|
||||
if (e.key === 'Escape') {
|
||||
$showSearch = false;
|
||||
} else if (e.key === 'ArrowDown') {
|
||||
e.stopPropagation();
|
||||
if (e.isComposing || composing || loading || opening) return;
|
||||
if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
|
||||
e.preventDefault();
|
||||
selectedIndex = Math.min(selectedIndex + 1, results.length - 1);
|
||||
if (!results.length) return;
|
||||
selectedIndex = Math.max(0, Math.min(results.length - 1, selectedIndex + (e.key === 'ArrowDown' ? 1 : -1)));
|
||||
inputEl?.focus({ preventScroll: true });
|
||||
scrollToSelected();
|
||||
} else if (e.key === 'ArrowUp') {
|
||||
} else if (e.key === 'Enter' && e.target === inputEl && results[selectedIndex]) {
|
||||
e.preventDefault();
|
||||
selectedIndex = Math.max(selectedIndex - 1, 0);
|
||||
scrollToSelected();
|
||||
} else if (e.key === 'Enter' && results.length > 0) {
|
||||
openResult(results[selectedIndex]);
|
||||
void openResult(results[selectedIndex]);
|
||||
}
|
||||
}
|
||||
|
||||
function getNotebook(path: string): string {
|
||||
const vault = $appConfig?.active_vault;
|
||||
if (!vault) return '';
|
||||
let rel = path;
|
||||
if (rel.startsWith(vault + '/')) rel = rel.substring(vault.length + 1);
|
||||
if (!currentVault) return '';
|
||||
const rel = relativePath(currentVault, path);
|
||||
const lastSlash = rel.lastIndexOf('/');
|
||||
if (lastSlash <= 0) return '';
|
||||
return rel.substring(0, lastSlash);
|
||||
return lastSlash > 0 ? rel.substring(0, lastSlash) : '';
|
||||
}
|
||||
|
||||
function highlightSnippet(snippet: string, q: string): string {
|
||||
if (!q.trim() || !snippet) return escapeHtml(snippet);
|
||||
const words = q.trim().split(/\s+/).filter(w => w.length > 1);
|
||||
if (words.length === 0) return escapeHtml(snippet);
|
||||
const escaped = escapeHtml(snippet);
|
||||
const pattern = words.map(w => w.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|');
|
||||
const re = new RegExp(`(${pattern})`, 'gi');
|
||||
return escaped.replace(re, '<mark>$1</mark>');
|
||||
}
|
||||
|
||||
function escapeHtml(str: string): string {
|
||||
return str.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>');
|
||||
function textParts(text: string, matches: SearchMatch[]) {
|
||||
const parts: { text: string; matched: boolean }[] = [];
|
||||
let cursor = 0;
|
||||
for (const { start, end } of matches) {
|
||||
if (start > cursor) parts.push({ text: text.slice(cursor, start), matched: false });
|
||||
parts.push({ text: text.slice(start, end), matched: true });
|
||||
cursor = end;
|
||||
}
|
||||
if (cursor < text.length) parts.push({ text: text.slice(cursor), matched: false });
|
||||
return parts;
|
||||
}
|
||||
|
||||
function findNotebookByPath(nbs: NotebookEntry[], target: string): NotebookEntry | null {
|
||||
for (const nb of nbs) {
|
||||
if (nb.path === target) return nb;
|
||||
if (relativePath(nb.path, target) === '.') return nb;
|
||||
if (nb.children.length) {
|
||||
const found = findNotebookByPath(nb.children, target);
|
||||
if (found) return found;
|
||||
@@ -96,41 +164,43 @@
|
||||
}
|
||||
|
||||
async function openResult(result: SearchResult) {
|
||||
if (loading || opening || !$showSearch || !results.includes(result)) return;
|
||||
const generation = requestGeneration;
|
||||
const vault = currentVault;
|
||||
opening = true;
|
||||
error = '';
|
||||
try {
|
||||
const content = await readNote(result.path);
|
||||
$activeNote = content;
|
||||
$activeNotePath = result.path;
|
||||
$editorDirty = false;
|
||||
$showSearch = false;
|
||||
// Reveal the note in the notes list: switch to its notebook (or All Notes).
|
||||
const sep = result.path.includes('\\') ? '\\' : '/';
|
||||
const parentDir = result.path.slice(0, result.path.lastIndexOf(sep));
|
||||
const nb = parentDir ? findNotebookByPath($notebooks, parentDir) : null;
|
||||
if (nb) {
|
||||
$activeNotebook = nb;
|
||||
$activeTag = null;
|
||||
$viewMode = 'notebook';
|
||||
} else {
|
||||
$activeNotebook = null;
|
||||
$activeTag = null;
|
||||
$viewMode = 'all';
|
||||
const normalized = result.path.replace(/\\/g, '/');
|
||||
const parentDir = normalized.slice(0, normalized.lastIndexOf('/'));
|
||||
const notebook = parentDir ? findNotebookByPath($notebooks, parentDir) : null;
|
||||
const opened = await onSelectNote(result, notebook, () => isCurrent(generation, vault));
|
||||
if (!isCurrent(generation, vault)) return;
|
||||
if (!opened) {
|
||||
error = 'Could not open this note.';
|
||||
return;
|
||||
}
|
||||
if (isMobile) $mobileView = 'editor';
|
||||
} catch (e) {
|
||||
console.error('Failed to open search result:', e);
|
||||
close();
|
||||
} catch (cause) {
|
||||
if (isCurrent(generation, vault)) error = cause instanceof Error ? cause.message : String(cause);
|
||||
} finally {
|
||||
if (isCurrent(generation, vault)) opening = false;
|
||||
}
|
||||
}
|
||||
|
||||
function previousPage() {
|
||||
const lastPage = Math.max(0, Math.floor((total - 1) / PAGE_SIZE) * PAGE_SIZE);
|
||||
startSearch(query, Math.max(0, Math.min(offset - PAGE_SIZE, lastPage)), true);
|
||||
}
|
||||
|
||||
function close() {
|
||||
cancelSearch();
|
||||
$showSearch = false;
|
||||
}
|
||||
</script>
|
||||
|
||||
{#if $showSearch}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="search-overlay" onclick={close} onkeydown={handleKeydown}>
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="search-panel" onclick={(e) => e.stopPropagation()} onkeydown={(e) => e.stopPropagation()}>
|
||||
<div class="search-overlay" role="presentation" onclick={close} onkeydowncapture={handleEscape}>
|
||||
<div class="search-panel" role="dialog" aria-modal="true" aria-label="Search notes" tabindex="-1" onclick={(e) => e.stopPropagation()} onkeydown={handleKeydown}>
|
||||
<div class="search-input-wrapper">
|
||||
<svg class="search-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="11" cy="11" r="8" />
|
||||
@@ -140,18 +210,36 @@
|
||||
bind:this={inputEl}
|
||||
type="text"
|
||||
placeholder="Search notes..."
|
||||
role="combobox"
|
||||
aria-label="Search notes"
|
||||
aria-controls="global-search-results"
|
||||
aria-expanded={results.length > 0}
|
||||
aria-autocomplete="list"
|
||||
aria-activedescendant={results.length ? `global-search-result-${selectedIndex}` : undefined}
|
||||
bind:value={query}
|
||||
oninput={handleInput}
|
||||
onkeydown={handleKeydown}
|
||||
oncompositionstart={() => { composing = true; cancelSearch(); results = []; total = 0; error = ''; loading = false; }}
|
||||
oncompositionend={(e) => { composing = false; startSearch(e.currentTarget.value); }}
|
||||
/>
|
||||
{#if !isMobile}<kbd class="search-esc">Esc</kbd>{/if}
|
||||
</div>
|
||||
|
||||
{#if results.length > 0}
|
||||
<div class="search-results" bind:this={resultsEl}>
|
||||
{#each results as result, i}
|
||||
{#if error}<div class="search-error" role="alert">{error}</div>{/if}
|
||||
{#if composing}
|
||||
<div class="search-empty">Type to search across all notes</div>
|
||||
{:else if loading}
|
||||
<div class="search-empty" role="status">Searching…</div>
|
||||
{:else if results.length > 0}
|
||||
<div class="search-results" id="global-search-results" role="listbox" aria-label="Search results" bind:this={resultsEl}>
|
||||
{#each rows as row, i (row.result.path)}
|
||||
{@const result = row.result}
|
||||
<button
|
||||
class="result-item"
|
||||
id={`global-search-result-${i}`}
|
||||
role="option"
|
||||
aria-selected={i === selectedIndex}
|
||||
tabindex="-1"
|
||||
disabled={opening}
|
||||
class:selected={i === selectedIndex}
|
||||
onclick={() => openResult(result)}
|
||||
onmouseenter={() => (selectedIndex = i)}
|
||||
@@ -163,25 +251,18 @@
|
||||
<line x1="16" y1="13" x2="8" y2="13" />
|
||||
<line x1="16" y1="17" x2="8" y2="17" />
|
||||
</svg>
|
||||
<span class="result-title">{result.title}</span>
|
||||
<span class="result-title">{#each row.title as part}{#if part.matched}<mark>{part.text}</mark>{:else}{part.text}{/if}{/each}</span>
|
||||
{#if getNotebook(result.path)}
|
||||
<span class="result-notebook">{getNotebook(result.path)}</span>
|
||||
{/if}
|
||||
</div>
|
||||
{#if result.snippet}
|
||||
<span class="result-snippet">{@html highlightSnippet(result.snippet, query)}</span>
|
||||
<span class="result-snippet">{#each row.snippet as part}{#if part.matched}<mark>{part.text}</mark>{:else}{part.text}{/if}{/each}</span>
|
||||
{/if}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
<div class="search-footer">
|
||||
<span class="search-count">{results.length} result{results.length !== 1 ? 's' : ''}</span>
|
||||
<span class="search-hints">
|
||||
<kbd>↑</kbd><kbd>↓</kbd> navigate
|
||||
<kbd>↵</kbd> open
|
||||
</span>
|
||||
</div>
|
||||
{:else if query.trim()}
|
||||
{:else if query.trim() && !error}
|
||||
<div class="no-results">
|
||||
<svg width="40" height="40" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" opacity="0.3">
|
||||
<circle cx="11" cy="11" r="8" />
|
||||
@@ -189,13 +270,29 @@
|
||||
<line x1="8" y1="8" x2="14" y2="14" />
|
||||
<line x1="14" y1="8" x2="8" y2="14" />
|
||||
</svg>
|
||||
<span>No results for "{query}"</span>
|
||||
<span>{total > 0 ? 'Results changed. Choose an earlier page.' : `No results for "${query}"`}</span>
|
||||
</div>
|
||||
{:else}
|
||||
{:else if !error}
|
||||
<div class="search-empty">
|
||||
<span>Type to search across all notes</span>
|
||||
</div>
|
||||
{/if}
|
||||
{#if total > 0}
|
||||
<div class="search-footer">
|
||||
<span class="search-count" role="status">
|
||||
{#if results.length}{offset + 1}–{offset + results.length} of {total}{:else}{total} result{total !== 1 ? 's' : ''}{/if}
|
||||
</span>
|
||||
{#if total > PAGE_SIZE || offset > 0}
|
||||
<div class="search-pages" aria-label="Result pages">
|
||||
<button onclick={previousPage} disabled={loading || opening || offset === 0} aria-label="Previous results page">Previous</button>
|
||||
<button onclick={() => startSearch(query, offset + PAGE_SIZE, true)} disabled={loading || opening || offset + PAGE_SIZE >= total} aria-label="Next results page">Next</button>
|
||||
</div>
|
||||
{/if}
|
||||
{#if !isMobile}
|
||||
<span class="search-hints"><kbd>↑</kbd><kbd>↓</kbd> navigate <kbd>↵</kbd> open</span>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
@@ -230,8 +327,8 @@
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 14px;
|
||||
box-shadow: 0 16px 48px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(255, 255, 255, 0.05) inset;
|
||||
width: 620px;
|
||||
max-height: 460px;
|
||||
width: min(620px, calc(100vw - 32px));
|
||||
max-height: min(460px, calc(85dvh - 24px));
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -257,6 +354,7 @@
|
||||
|
||||
.search-input-wrapper input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
border: none;
|
||||
background: none;
|
||||
color: var(--text-primary);
|
||||
@@ -339,18 +437,23 @@
|
||||
}
|
||||
|
||||
.result-snippet {
|
||||
display: block;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
font-size: 12px;
|
||||
color: var(--text-tertiary);
|
||||
margin-top: 4px;
|
||||
margin-left: 24px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
white-space: normal;
|
||||
overflow-wrap: anywhere;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.result-snippet :global(mark) {
|
||||
.result-title mark,
|
||||
.result-snippet mark {
|
||||
background: color-mix(in srgb, var(--accent) 25%, transparent);
|
||||
color: var(--text-accent);
|
||||
border-radius: 2px;
|
||||
@@ -359,6 +462,8 @@
|
||||
|
||||
.search-footer {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 8px 18px;
|
||||
@@ -406,4 +511,32 @@
|
||||
color: var(--text-tertiary);
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.search-error {
|
||||
padding: 12px 18px;
|
||||
color: var(--text-primary);
|
||||
font-size: 13px;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.search-pages {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.search-pages button {
|
||||
padding: 4px 8px;
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 4px;
|
||||
background: var(--bg-secondary);
|
||||
color: var(--text-primary);
|
||||
font: inherit;
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.search-pages button:disabled {
|
||||
opacity: 0.45;
|
||||
cursor: default;
|
||||
}
|
||||
</style>
|
||||
@@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { showSettings, theme, resolvedTheme, appConfig, platformIsMobile, activeVaultConfig, updateAvailable as globalUpdateAvailable, updateObj as globalUpdateObj, installType, settingsTab, vaultReady, androidApkUrl, checkForUpdateMobile, notebookSortMode, isManagedInstall, customThemes } from '$lib/stores/app';
|
||||
import { setTheme, setSystemThemes, setAccentColor, setFontSize, setScrollToChangeFontSize, setFontFamily, setLineHeight, setUiScale, setContentWidth, setGeneralSettings, importObsidian, createBackup, listBackups, restoreBackup, deleteBackup, setBackupSettings, setAiSettings, testAiConnection, setSyncSettings, testSyncConnection, syncNow, getAppConfig, saveCustomTheme, deleteCustomTheme, exportCustomTheme, importCustomThemes, getVaultStats, findOrphanedAttachments, trashOrphanedAttachments } from '$lib/api';
|
||||
import { setTheme, setSystemThemes, setAccentColor, setFontSize, setScrollToChangeFontSize, setFontFamily, setLineHeight, setUiScale, setContentWidth, setGeneralSettings, importObsidian, createBackup, listBackups, restoreBackup, deleteBackup, setBackupSettings, setAiSettings, testAiConnection, setSyncSettings, testSyncConnection, syncNow, saveCustomTheme, deleteCustomTheme, exportCustomTheme, importCustomThemes, getVaultStats, findOrphanedAttachments, trashOrphanedAttachments } from '$lib/api';
|
||||
import { darkThemes, isMobile, isAndroid } from '$lib/platform';
|
||||
import { open as openDialog, save as saveDialog } from '@tauri-apps/plugin-dialog';
|
||||
import { listen } from '@tauri-apps/api/event';
|
||||
@@ -11,6 +11,8 @@
|
||||
import type { ImportResult, BackupEntry, CustomTheme, CustomThemeColors, StartupView, VaultStats } from '$lib/types';
|
||||
import { normalizeStartupView } from '$lib/utils/startup-view';
|
||||
|
||||
let { onBeforeVaultSwitch }: { onBeforeVaultSwitch: () => Promise<boolean> } = $props();
|
||||
|
||||
const modKey = navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl';
|
||||
|
||||
type Tab = 'general' | 'editor' | 'styling' | 'import' | 'backup' | 'maintenance' | 'ai' | 'sync' | 'updates';
|
||||
@@ -123,9 +125,20 @@
|
||||
let orphanedAttachments = $state<OrphanAttachment[] | null>(null);
|
||||
let scanningOrphanedAttachments = $state(false);
|
||||
let trashingOrphanedAttachments = $state(false);
|
||||
let orphanedVault: string | null = null;
|
||||
let orphanError = $state('');
|
||||
let cleanupRequest = 0;
|
||||
const maintenanceVault = $derived($appConfig?.active_vault ?? null);
|
||||
const orphanedAttachmentTotal = $derived((orphanedAttachments ?? []).reduce((total, attachment) => total + attachment.size, 0));
|
||||
|
||||
$effect(() => {
|
||||
void maintenanceVault;
|
||||
cleanupRequest++;
|
||||
orphanedAttachments = null;
|
||||
orphanedVault = null;
|
||||
orphanError = '';
|
||||
scanningOrphanedAttachments = false;
|
||||
trashingOrphanedAttachments = false;
|
||||
if (!$showSettings) {
|
||||
vaultStats = null;
|
||||
vaultStatsError = false;
|
||||
@@ -136,10 +149,13 @@
|
||||
});
|
||||
|
||||
async function loadVaultStats() {
|
||||
const vault = maintenanceVault;
|
||||
vaultStatsError = false;
|
||||
try {
|
||||
vaultStats = await getVaultStats();
|
||||
const stats = await getVaultStats();
|
||||
if ($showSettings && maintenanceVault === vault) vaultStats = stats;
|
||||
} catch (error) {
|
||||
if (!$showSettings || maintenanceVault !== vault) return;
|
||||
vaultStats = null;
|
||||
vaultStatsError = true;
|
||||
console.error('Failed to load vault statistics:', error);
|
||||
@@ -154,27 +170,46 @@
|
||||
}
|
||||
|
||||
async function scanOrphanedAttachments() {
|
||||
const vault = maintenanceVault;
|
||||
if (!vault) return;
|
||||
const request = ++cleanupRequest;
|
||||
const current = () => request === cleanupRequest && $showSettings && maintenanceVault === vault;
|
||||
scanningOrphanedAttachments = true;
|
||||
orphanError = '';
|
||||
try {
|
||||
orphanedAttachments = await findOrphanedAttachments();
|
||||
if (!(await onBeforeVaultSwitch())) throw new Error('Save the current note before scanning attachments.');
|
||||
if (!current()) return;
|
||||
const found = await findOrphanedAttachments(vault);
|
||||
if (!current()) return;
|
||||
orphanedVault = vault;
|
||||
orphanedAttachments = found;
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
if (current()) orphanError = String(error);
|
||||
} finally {
|
||||
scanningOrphanedAttachments = false;
|
||||
if (current()) scanningOrphanedAttachments = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function trashFoundOrphanedAttachments() {
|
||||
if (!orphanedAttachments || orphanedAttachments.length === 0) return;
|
||||
const vault = orphanedVault;
|
||||
if (!vault || vault !== maintenanceVault || !orphanedAttachments?.length) return;
|
||||
const names = orphanedAttachments.map(attachment => attachment.name);
|
||||
const request = ++cleanupRequest;
|
||||
const current = () => request === cleanupRequest && $showSettings && maintenanceVault === vault;
|
||||
trashingOrphanedAttachments = true;
|
||||
orphanError = '';
|
||||
try {
|
||||
await trashOrphanedAttachments(orphanedAttachments.map((attachment) => attachment.name));
|
||||
if (!(await onBeforeVaultSwitch())) throw new Error('Save the current note before cleaning attachments.');
|
||||
if (!current()) return;
|
||||
await trashOrphanedAttachments(vault, names);
|
||||
if (!current()) return;
|
||||
orphanedAttachments = null;
|
||||
orphanedVault = null;
|
||||
void loadVaultStats();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
if (current()) orphanError = String(error);
|
||||
} finally {
|
||||
trashingOrphanedAttachments = false;
|
||||
if (current()) trashingOrphanedAttachments = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -183,68 +218,127 @@
|
||||
let backupLoading = $state(false);
|
||||
let backupMessage = $state<{ type: 'success' | 'error'; text: string } | null>(null);
|
||||
let restoreConfirm = $state<BackupEntry | null>(null);
|
||||
let backupRequest = 0;
|
||||
let backupReadRequest = 0;
|
||||
let backupUnlisten: (() => void) | null = null;
|
||||
const lastBackupTime = $derived(activeVaultConfig($appConfig)?.last_backup_time ?? null);
|
||||
|
||||
$effect(() => {
|
||||
void maintenanceVault;
|
||||
void $showSettings;
|
||||
backupRequest++;
|
||||
backupReadRequest++;
|
||||
backupUnlisten?.();
|
||||
backupUnlisten = null;
|
||||
backupLoading = false;
|
||||
return () => {
|
||||
backupRequest++;
|
||||
backupReadRequest++;
|
||||
backupUnlisten?.();
|
||||
backupUnlisten = null;
|
||||
};
|
||||
});
|
||||
|
||||
async function loadBackups() {
|
||||
const vault = maintenanceVault;
|
||||
if (!vault) return;
|
||||
const request = ++backupReadRequest;
|
||||
try {
|
||||
backups = await listBackups();
|
||||
const loaded = await listBackups(vault);
|
||||
if (request === backupReadRequest && maintenanceVault === vault && $showSettings) backups = loaded;
|
||||
} catch (e) {
|
||||
console.error('Failed to load backups:', e);
|
||||
}
|
||||
}
|
||||
|
||||
async function handleBackupNow() {
|
||||
const vault = maintenanceVault;
|
||||
if (!vault || backupLoading) return;
|
||||
const request = ++backupRequest;
|
||||
const current = () => request === backupRequest && maintenanceVault === vault && $showSettings;
|
||||
backupLoading = true;
|
||||
backupMessage = null;
|
||||
const unlisten = await listen<{ success: boolean; entry?: BackupEntry; error?: string }>('backup-done', async (event) => {
|
||||
const data = event.payload;
|
||||
if (data.success) {
|
||||
backupMessage = { type: 'success', text: 'Backup created successfully' };
|
||||
await loadBackups();
|
||||
if ($appConfig) {
|
||||
$appConfig = { ...$appConfig, last_backup_time: new Date().toISOString() };
|
||||
}
|
||||
} else {
|
||||
backupMessage = { type: 'error', text: `Backup failed: ${data.error}` };
|
||||
}
|
||||
backupLoading = false;
|
||||
unlisten();
|
||||
});
|
||||
let stop: (() => void) | undefined;
|
||||
let finished = false;
|
||||
try {
|
||||
await createBackup();
|
||||
if (!(await onBeforeVaultSwitch())) throw new Error('Save the current note before creating a backup.');
|
||||
if (!current()) return;
|
||||
stop = await listen<{ vault_path: string; success: boolean; entry?: BackupEntry; error?: string }>('backup-done', (event) => {
|
||||
const data = event.payload;
|
||||
if (data.vault_path !== vault || !current()) return;
|
||||
finished = true;
|
||||
stop?.();
|
||||
backupUnlisten = null;
|
||||
backupLoading = false;
|
||||
if (data.success) {
|
||||
backupMessage = { type: 'success', text: 'Backup created successfully' };
|
||||
const timestamp = data.entry?.created;
|
||||
const currentVault = activeVaultConfig($appConfig);
|
||||
if (timestamp && currentVault && $appConfig) {
|
||||
$appConfig = { ...$appConfig, vaults: $appConfig.vaults.map(item =>
|
||||
item === currentVault ? { ...item, last_backup_time: timestamp } : item) };
|
||||
}
|
||||
void loadBackups();
|
||||
} else {
|
||||
backupMessage = { type: 'error', text: `Backup failed: ${data.error}` };
|
||||
}
|
||||
});
|
||||
if (!current() || finished) { stop(); return; }
|
||||
backupUnlisten = stop;
|
||||
await createBackup(vault);
|
||||
} catch (e) {
|
||||
backupMessage = { type: 'error', text: `Backup failed: ${e}` };
|
||||
backupLoading = false;
|
||||
unlisten();
|
||||
stop?.();
|
||||
if (current()) {
|
||||
backupUnlisten = null;
|
||||
backupMessage = { type: 'error', text: `Backup failed: ${e}` };
|
||||
backupLoading = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function handleRestore(entry: BackupEntry) {
|
||||
const vault = maintenanceVault;
|
||||
if (!vault || backupLoading) return;
|
||||
const request = ++backupRequest;
|
||||
const current = () => request === backupRequest && maintenanceVault === vault && $showSettings;
|
||||
restoreConfirm = null;
|
||||
backupLoading = true;
|
||||
backupMessage = null;
|
||||
const unlisten = await listen<{ success: boolean; error?: string }>('restore-done', (event) => {
|
||||
const data = event.payload;
|
||||
if (data.success) {
|
||||
backupMessage = { type: 'success', text: 'Backup restored. Restart the app to see changes.' };
|
||||
} else {
|
||||
backupMessage = { type: 'error', text: `Restore failed: ${data.error}` };
|
||||
}
|
||||
backupLoading = false;
|
||||
unlisten();
|
||||
});
|
||||
let stop: (() => void) | undefined;
|
||||
let finished = false;
|
||||
try {
|
||||
await restoreBackup(entry.path);
|
||||
if (!(await onBeforeVaultSwitch())) throw new Error('Save the current note before restoring a backup.');
|
||||
if (!current()) return;
|
||||
stop = await listen<{ vault_path: string; success: boolean; error?: string }>('restore-done', (event) => {
|
||||
const data = event.payload;
|
||||
if (data.vault_path !== vault || !current()) return;
|
||||
finished = true;
|
||||
stop?.();
|
||||
backupUnlisten = null;
|
||||
backupMessage = data.success
|
||||
? { type: 'success', text: 'Backup restored successfully.' }
|
||||
: { type: 'error', text: `Restore failed: ${data.error}` };
|
||||
backupLoading = false;
|
||||
});
|
||||
if (!current() || finished) { stop(); return; }
|
||||
backupUnlisten = stop;
|
||||
await restoreBackup(vault, entry.path);
|
||||
} catch (e) {
|
||||
backupMessage = { type: 'error', text: `Restore failed: ${e}` };
|
||||
backupLoading = false;
|
||||
unlisten();
|
||||
stop?.();
|
||||
if (current()) {
|
||||
backupUnlisten = null;
|
||||
backupMessage = { type: 'error', text: `Restore failed: ${e}` };
|
||||
backupLoading = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function handleDeleteBackup(entry: BackupEntry) {
|
||||
const vault = maintenanceVault;
|
||||
if (!vault) return;
|
||||
try {
|
||||
await deleteBackup(entry.path);
|
||||
backups = backups.filter(b => b.path !== entry.path);
|
||||
await deleteBackup(vault, entry.path);
|
||||
if (maintenanceVault === vault) backups = backups.filter(b => b.path !== entry.path);
|
||||
} catch (e) {
|
||||
console.error('Failed to delete backup:', e);
|
||||
}
|
||||
@@ -293,7 +387,7 @@
|
||||
let _ollamaApiKey = $state($appConfig?.ollama_api_key ?? '');
|
||||
let _openaiCompatibleBaseUrl = $state($appConfig?.openai_compatible_base_url ?? '');
|
||||
let _openaiCompatibleKey = $state($appConfig?.openai_compatible_api_key ?? '');
|
||||
let aiModel = $state($appConfig?.ai_model ?? 'claude-sonnet-4-6');
|
||||
let aiModel = $state($appConfig?.ai_model ?? 'claude-sonnet-5');
|
||||
let aiWritingStyle = $state($appConfig?.ai_writing_style ?? '');
|
||||
let aiShowKey = $state(false);
|
||||
let aiShowCompatibleKey = $state(false);
|
||||
@@ -301,16 +395,17 @@
|
||||
let aiTestLoading = $state(false);
|
||||
let aiTestMessage = $state<{ type: 'success' | 'error'; text: string } | null>(null);
|
||||
|
||||
// General-purpose text models verified against provider catalogs on 2026-09-27.
|
||||
const anthropicModels = [
|
||||
{ value: 'claude-sonnet-4-6', label: 'Claude Sonnet 4.6', desc: 'Balanced' },
|
||||
{ value: 'claude-opus-4-8', label: 'Claude Opus 4.8', desc: 'Most capable' },
|
||||
{ value: 'claude-sonnet-5', label: 'Claude Sonnet 5', desc: 'Balanced' },
|
||||
{ value: 'claude-opus-5-5', label: 'Claude Opus 5.5', desc: 'Complex work' },
|
||||
{ value: 'claude-fable-5-1', label: 'Claude Fable 5.1', desc: 'Deep reasoning' },
|
||||
{ value: 'claude-haiku-4-5-20251001', label: 'Claude Haiku 4.5', desc: 'Fast' },
|
||||
];
|
||||
const openaiModels = [
|
||||
{ value: 'gpt-5.5', label: 'GPT-5.5', desc: 'Most capable' },
|
||||
{ value: 'gpt-5.4', label: 'GPT-5.4', desc: 'Balanced' },
|
||||
{ value: 'gpt-5-mini', label: 'GPT-5 Mini', desc: 'Fast' },
|
||||
{ value: 'gpt-5.2', label: 'GPT-5.2', desc: 'Previous gen' },
|
||||
{ value: 'gpt-6-sol', label: 'GPT-6 Sol', desc: 'Balanced' },
|
||||
{ value: 'gpt-6-astra', label: 'GPT-6 Astra', desc: 'Deep reasoning' },
|
||||
{ value: 'gpt-6-luna', label: 'GPT-6 Luna', desc: 'Fast' },
|
||||
];
|
||||
let aiModels = $derived(aiProvider === 'openai' ? openaiModels : anthropicModels);
|
||||
|
||||
@@ -443,11 +538,15 @@
|
||||
}
|
||||
|
||||
async function handleSyncNow() {
|
||||
const vault = maintenanceVault;
|
||||
if (!vault || syncRunning) return;
|
||||
syncRunning = true;
|
||||
syncMessage = null;
|
||||
const unlisteners: Array<() => void> = [];
|
||||
const cleanup = () => { unlisteners.forEach((u) => u()); };
|
||||
unlisteners.push(await listen<{ success: boolean; summary?: { uploaded?: number; downloaded?: number; deleted_local?: number; deleted_remote?: number; conflicts?: number }; last_sync_time?: string }>('sync-done', async (event) => {
|
||||
unlisteners.push(await listen<{ vault_path: string; success: boolean; summary?: { uploaded?: number; downloaded?: number; deleted_local?: number; deleted_remote?: number; conflicts?: number }; last_sync_time?: string }>('sync-done', (event) => {
|
||||
if (event.payload.vault_path !== vault) return;
|
||||
if (!$showSettings || maintenanceVault !== vault) { cleanup(); return; }
|
||||
const s = event.payload.summary ?? {};
|
||||
const parts: string[] = [];
|
||||
if (s.uploaded) parts.push(`${s.uploaded} uploaded`);
|
||||
@@ -457,14 +556,17 @@
|
||||
if (s.conflicts) parts.push(`${s.conflicts} conflict copies`);
|
||||
syncMessage = { type: 'success', text: parts.length ? `Synced: ${parts.join(', ')}.` : 'Already up to date.' };
|
||||
syncRunning = false;
|
||||
if (event.payload.last_sync_time) {
|
||||
try {
|
||||
$appConfig = await getAppConfig();
|
||||
} catch {}
|
||||
const timestamp = event.payload.last_sync_time;
|
||||
const currentVault = activeVaultConfig($appConfig);
|
||||
if (timestamp && currentVault && $appConfig) {
|
||||
$appConfig = { ...$appConfig, vaults: $appConfig.vaults.map(item =>
|
||||
item === currentVault ? { ...item, last_sync_time: timestamp } : item) };
|
||||
}
|
||||
cleanup();
|
||||
}));
|
||||
unlisteners.push(await listen<{ error?: string }>('sync-error', (event) => {
|
||||
unlisteners.push(await listen<{ vault_path: string; error?: string }>('sync-error', (event) => {
|
||||
if (event.payload.vault_path !== vault) return;
|
||||
if (!$showSettings || maintenanceVault !== vault) { cleanup(); return; }
|
||||
syncMessage = { type: 'error', text: event.payload.error ?? 'Sync failed' };
|
||||
syncRunning = false;
|
||||
cleanup();
|
||||
@@ -521,6 +623,17 @@
|
||||
{ id: 'one-dark', label: 'One Dark', bg: '#282c34', sidebar: '#21252b', accent: '#61afef' },
|
||||
];
|
||||
|
||||
// Keep the default themes pinned at the top and sort the rest alphabetically.
|
||||
const priorityThemeIds = ['system', 'light', 'dark'];
|
||||
themePresets.sort((a, b) => {
|
||||
const pa = priorityThemeIds.indexOf(a.id);
|
||||
const pb = priorityThemeIds.indexOf(b.id);
|
||||
if (pa !== -1 && pb !== -1) return pa - pb;
|
||||
if (pa !== -1) return -1;
|
||||
if (pb !== -1) return 1;
|
||||
return a.label.localeCompare(b.label);
|
||||
});
|
||||
|
||||
const accentPresets = [
|
||||
{ name: 'Indigo', light: '#5b6abf', dark: '#7b9bd4' },
|
||||
{ name: 'Rose', light: '#e11d48', dark: '#d4768a' },
|
||||
@@ -1068,6 +1181,15 @@
|
||||
if (event.target === event.currentTarget) close();
|
||||
}
|
||||
|
||||
function handleEscape(event: KeyboardEvent) {
|
||||
if (event.key !== 'Escape') return;
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
if (restoreConfirm) restoreConfirm = null;
|
||||
else if (customThemeEditorOpen) cancelCustomThemeEditor();
|
||||
else close();
|
||||
}
|
||||
|
||||
function dismissRestoreConfirm(event: MouseEvent) {
|
||||
if (event.target === event.currentTarget) restoreConfirm = null;
|
||||
}
|
||||
@@ -1148,7 +1270,7 @@
|
||||
|
||||
{#if $showSettings}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="settings-overlay" class:mobile={isMobile} onclick={closeSettingsFromOverlay} onkeydown={(e) => { if (e.key === 'Escape') close(); }}>
|
||||
<div class="settings-overlay" class:mobile={isMobile} onclick={closeSettingsFromOverlay} onkeydowncapture={handleEscape} onkeydown={handleEscape}>
|
||||
<div class="settings-panel" class:mobile={isMobile} role="dialog" aria-modal="true" aria-labelledby="settings-title" tabindex="-1">
|
||||
<div class="settings-header">
|
||||
<h2 id="settings-title">Settings</h2>
|
||||
@@ -1370,7 +1492,7 @@
|
||||
<div class="settings-section">
|
||||
<h3>Vault</h3>
|
||||
<p class="setting-desc" style="margin-bottom: 12px; color: var(--text-tertiary); font-size: 13px;">Current: <strong style="color: var(--text-primary);">{$appConfig?.active_vault?.split('/').pop() ?? 'Unknown'}</strong></p>
|
||||
<button class="import-btn" onclick={() => { $showSettings = false; $vaultReady = false; }}>
|
||||
<button class="import-btn" onclick={async () => { if (!(await onBeforeVaultSwitch())) return; $showSettings = false; $vaultReady = false; }}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M22 19a2 2 0 01-2 2H4a2 2 0 01-2-2V5a2 2 0 012-2h5l2 3h9a2 2 0 012 2z"/>
|
||||
</svg>
|
||||
@@ -1418,7 +1540,7 @@
|
||||
<label class="setting-toggle">
|
||||
<span class="setting-label">
|
||||
<span class="setting-name">Close to tray</span>
|
||||
<span class="setting-desc">Minimize to tray instead of quitting when closing the window (requires restart)</span>
|
||||
<span class="setting-desc">Minimize to tray instead of quitting when closing the window</span>
|
||||
</span>
|
||||
<button class="toggle-switch" class:on={closeToTray} role="switch" aria-checked={closeToTray} aria-label="Close to tray" onclick={() => { closeToTray = !closeToTray; saveGeneralSettings(); }}>
|
||||
<span class="toggle-knob"></span>
|
||||
@@ -1465,7 +1587,8 @@
|
||||
<div class="settings-section">
|
||||
<h3>Orphaned Attachments</h3>
|
||||
<div class="vault-maintenance">
|
||||
<p class="setting-desc">Find files in the vault's attachments folder that are not referenced by any note.</p>
|
||||
<p class="setting-desc">Review attachment files not referenced by saved notes or icon settings. Save changes in other note windows before scanning.</p>
|
||||
{#if orphanError}<p class="cleanup-message" role="alert">{orphanError}</p>{/if}
|
||||
{#if orphanedAttachments === null}
|
||||
<button class="import-btn cleanup-action" onclick={scanOrphanedAttachments} disabled={scanningOrphanedAttachments}>
|
||||
{#if scanningOrphanedAttachments}
|
||||
@@ -1813,7 +1936,7 @@
|
||||
<!-- Custom Theme Editor Modal -->
|
||||
{#if customThemeEditorOpen && customThemeEditing}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="custom-theme-modal-overlay" onclick={cancelCustomThemeFromOverlay} onkeydown={(e) => e.key === 'Escape' && cancelCustomThemeEditor()}>
|
||||
<div class="custom-theme-modal-overlay" onclick={cancelCustomThemeFromOverlay} onkeydown={handleEscape}>
|
||||
<div class="custom-theme-modal" role="dialog" aria-modal="true" aria-labelledby="custom-theme-title" tabindex="-1">
|
||||
<div class="custom-theme-modal-header">
|
||||
<h3 id="custom-theme-title">{customThemeEditing.id.startsWith('custom-') && $customThemes.some(c => c.id === customThemeEditing!.id) ? 'Edit Theme' : 'New Custom Theme'}</h3>
|
||||
@@ -2068,8 +2191,8 @@
|
||||
</div>
|
||||
|
||||
<p class="backup-last-time">
|
||||
{#if $appConfig?.last_backup_time}
|
||||
Last backup: {formatBackupDate($appConfig.last_backup_time)}
|
||||
{#if lastBackupTime}
|
||||
Last backup: {formatBackupDate(lastBackupTime)}
|
||||
{:else}
|
||||
No backups yet
|
||||
{/if}
|
||||
@@ -2121,7 +2244,7 @@
|
||||
|
||||
{#if restoreConfirm}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="restore-confirm-overlay" onclick={dismissRestoreConfirm} onkeydown={(e) => { if (e.key === 'Escape') restoreConfirm = null; }}>
|
||||
<div class="restore-confirm-overlay" onclick={dismissRestoreConfirm} onkeydown={handleEscape}>
|
||||
<div class="restore-confirm" role="alertdialog" aria-modal="true" aria-labelledby="restore-confirm-title" tabindex="-1">
|
||||
<h4 id="restore-confirm-title">Restore Backup?</h4>
|
||||
<p>This will replace all notes in your vault with the backup from <strong>{formatBackupDate(restoreConfirm.created)}</strong>. This action cannot be undone.</p>
|
||||
@@ -2188,8 +2311,8 @@
|
||||
<div class="setting-options" style="flex-wrap: wrap;">
|
||||
<button class="option-btn" class:active={!aiProvider} onclick={() => { if (!aiProvider) return; aiProvider = null; aiTestMessage = null; saveAiSettings(); }}>Disabled</button>
|
||||
<button class="option-btn" class:active={aiProvider === 'ollama'} onclick={() => { if (aiProvider === 'ollama') return; aiProvider = 'ollama'; aiModel = 'gemma3:4b'; aiTestMessage = null; saveAiSettings(); }}>Ollama</button>
|
||||
<button class="option-btn" class:active={aiProvider === 'anthropic'} onclick={() => { if (aiProvider === 'anthropic') return; aiProvider = 'anthropic'; aiModel = 'claude-sonnet-4-6'; aiTestMessage = null; saveAiSettings(); }}>Anthropic</button>
|
||||
<button class="option-btn" class:active={aiProvider === 'openai'} onclick={() => { if (aiProvider === 'openai') return; aiProvider = 'openai'; aiModel = 'gpt-5.5'; aiTestMessage = null; saveAiSettings(); }}>OpenAI</button>
|
||||
<button class="option-btn" class:active={aiProvider === 'anthropic'} onclick={() => { if (aiProvider === 'anthropic') return; aiProvider = 'anthropic'; aiModel = 'claude-sonnet-5'; aiTestMessage = null; saveAiSettings(); }}>Anthropic</button>
|
||||
<button class="option-btn" class:active={aiProvider === 'openai'} onclick={() => { if (aiProvider === 'openai') return; aiProvider = 'openai'; aiModel = 'gpt-6-sol'; aiTestMessage = null; saveAiSettings(); }}>OpenAI</button>
|
||||
<button class="option-btn" class:active={aiProvider === 'openai_compatible'} onclick={() => { if (aiProvider === 'openai_compatible') return; aiProvider = 'openai_compatible'; aiModel = ''; aiTestMessage = null; saveAiSettings(); }}>OpenAI Compatible</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -2320,6 +2443,9 @@
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
{#if aiModel && !aiModels.some(model => model.value === aiModel)}
|
||||
<p class="setting-hint">Saved model: <code>{aiModel}</code>. It remains selected until you choose another model.</p>
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
|
||||
+296
-160
@@ -1,5 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { tick } from 'svelte';
|
||||
import { onDestroy, tick } from 'svelte';
|
||||
import { get } from 'svelte/store';
|
||||
import {
|
||||
notebooks,
|
||||
notes,
|
||||
@@ -7,6 +8,7 @@
|
||||
viewMode,
|
||||
activeNotebook,
|
||||
activeNotePath,
|
||||
editorDirty,
|
||||
activeNote,
|
||||
activeTag,
|
||||
showSearch,
|
||||
@@ -14,21 +16,26 @@
|
||||
showSettings,
|
||||
showInfo,
|
||||
notebookIcons,
|
||||
tagStyles,
|
||||
appConfig,
|
||||
quickAccessPaths,
|
||||
collapsedNotebooks,
|
||||
rootNoteCount,
|
||||
notebookSortMode,
|
||||
notebookOrder
|
||||
notebookOrder,
|
||||
noteOrder
|
||||
} from '$lib/stores/app';
|
||||
import { getNotebooks, getAllTags, createNotebook, deleteNotebook, renameNotebook, moveNotebook, getNotebookIcons, setNotebookIcon, saveAttachment, getQuickAccess, addQuickAccess, removeQuickAccess, emptyTrash, moveNote, readNote, countRootNotes } from '$lib/api';
|
||||
import { getNotebooks, getAllTags, createNotebook, deleteNotebook, renameNotebook, moveNotebook, getNotebookIcons, setNotebookIcon, getTagStyles, importNotebookIcon, getQuickAccess, addQuickAccess, removeQuickAccess, emptyTrash, moveNote, countRootNotes } from '$lib/api';
|
||||
import { open as openDialog } from '@tauri-apps/plugin-dialog';
|
||||
import { readFile } from '@tauri-apps/plugin-fs';
|
||||
import { convertFileSrc } from '@tauri-apps/api/core';
|
||||
import type { NotebookEntry } from '$lib/types';
|
||||
import { isMobile } from '$lib/platform';
|
||||
import { decodeNoteDragPaths } from '$lib/utils/note-drag';
|
||||
import { notebookAppearance, tagAppearance } from '$lib/utils/appearance-mutations';
|
||||
import NotebookGlyph from './NotebookGlyph.svelte';
|
||||
import TagLabel from './TagLabel.svelte';
|
||||
import TagStylePicker from './TagStylePicker.svelte';
|
||||
import {
|
||||
NOTEBOOK_ICON_OPTIONS,
|
||||
decodeBuiltinNotebookIcon,
|
||||
@@ -37,11 +44,28 @@
|
||||
type NotebookIconId
|
||||
} from '$lib/utils/notebook-icons';
|
||||
|
||||
let { onViewChanged = () => {} }: {
|
||||
let { onViewChanged = () => {}, onBeforeNoteChange = async () => true, onBeforePathMutation = async () => null, onPathsMoved = async (_old: string, _next: string) => {} }: {
|
||||
onViewChanged?: () => void;
|
||||
onBeforeNoteChange?: () => Promise<boolean>;
|
||||
onBeforePathMutation?: () => Promise<(() => void) | null>;
|
||||
onPathsMoved?: (oldPath: string, nextPath: string) => Promise<void>;
|
||||
} = $props();
|
||||
|
||||
const modKey = navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl';
|
||||
const ownerVault = get(appConfig)?.active_vault ?? null;
|
||||
let disposed = false;
|
||||
let refreshRequest = 0;
|
||||
let tagRefreshRequest = 0;
|
||||
|
||||
function ownerIsCurrent() {
|
||||
return !disposed && (get(appConfig)?.active_vault ?? null) === ownerVault;
|
||||
}
|
||||
|
||||
onDestroy(() => {
|
||||
disposed = true;
|
||||
refreshRequest++;
|
||||
nbStopDragListeners();
|
||||
});
|
||||
|
||||
// Whether any top nav item (All Notes, Quick Access, Tasks, Daily Notes, Trash) is visible.
|
||||
// When all are hidden we drop the empty <nav> and its divider so the tree sits flush.
|
||||
@@ -58,6 +82,7 @@
|
||||
let renameInput: HTMLInputElement | null = $state(null);
|
||||
let newNotebookName = $state('');
|
||||
let showNewNotebook = $state(false);
|
||||
let iconError = $state('');
|
||||
let newNotebookInput: HTMLInputElement | null = $state(null);
|
||||
let dropTargetPath = $state<string | null>(null);
|
||||
let dropPosition = $state<'above' | 'into' | 'below' | null>(null);
|
||||
@@ -72,6 +97,26 @@
|
||||
const joinPath = (parent: string, name: string) => parent + (parent.includes('\\') ? '\\' : '/') + name;
|
||||
const isDescendant = (child: string, anc: string) => child.startsWith(anc + '/') || child.startsWith(anc + '\\');
|
||||
|
||||
function migratePaths(oldPath: string, newPath: string) {
|
||||
const replace = (path: string) => path === oldPath ? newPath
|
||||
: isDescendant(path, oldPath) ? newPath + path.slice(oldPath.length) : path;
|
||||
$collapsedNotebooks = $collapsedNotebooks.map(replace);
|
||||
$notebookOrder = Object.fromEntries(Object.entries($notebookOrder).map(([path, index]) => [replace(path), index]));
|
||||
$noteOrder = Object.fromEntries(Object.entries($noteOrder).map(([path, index]) => [replace(path), index]));
|
||||
if ($activeNotebook && replace($activeNotebook.path) !== $activeNotebook.path) {
|
||||
const path = replace($activeNotebook.path);
|
||||
$activeNotebook = {
|
||||
...$activeNotebook, path,
|
||||
relative_path: path.slice(ownerVault!.length + 1).replace(/\\/g, '/'),
|
||||
name: baseOf(path)
|
||||
};
|
||||
}
|
||||
$notes = $notes.map(note => {
|
||||
const path = replace(note.path);
|
||||
return path === note.path ? note : { ...note, path, relative_path: path.slice(ownerVault!.length + 1).replace(/\\/g, '/') };
|
||||
});
|
||||
}
|
||||
|
||||
// Apply manual ordering recursively when in 'manual' sort mode.
|
||||
// In 'alphabetical' mode the Rust scanner already sorts, so we pass through unchanged.
|
||||
function sortNotebooksTree(tree: NotebookEntry[]): NotebookEntry[] {
|
||||
@@ -91,6 +136,8 @@
|
||||
let iconPickerElement = $state<HTMLDivElement | null>(null);
|
||||
let trashContextMenu = $state<{ x: number; y: number } | null>(null);
|
||||
let tagsCollapsed = $state(true);
|
||||
let tagContextMenu = $state<{ x: number; y: number; tag: string } | null>(null);
|
||||
let stylePickerTag = $state<string | null>(null);
|
||||
let deleteConfirm = $state<NotebookEntry | null>(null);
|
||||
function toggleCollapse(nb: NotebookEntry, e: Event) {
|
||||
e.stopPropagation();
|
||||
@@ -118,29 +165,46 @@
|
||||
}
|
||||
|
||||
|
||||
export async function refresh() {
|
||||
export async function refreshTags() {
|
||||
if (!ownerIsCurrent()) return;
|
||||
const request = ++tagRefreshRequest;
|
||||
try {
|
||||
if (isMobile) {
|
||||
// On mobile, parallelize and skip getAllTags (derive from $notes instead)
|
||||
const [nbs, icons, qaNotes, rootCount] = await Promise.all([
|
||||
getNotebooks(),
|
||||
getNotebookIcons(),
|
||||
getQuickAccess(),
|
||||
countRootNotes(),
|
||||
]);
|
||||
$notebooks = nbs;
|
||||
$notebookIcons = icons;
|
||||
$quickAccessPaths = qaNotes.map(n => n.relative_path);
|
||||
$rootNoteCount = rootCount;
|
||||
} else {
|
||||
const [nbs, rootCount] = await Promise.all([getNotebooks(), countRootNotes()]);
|
||||
$notebooks = nbs;
|
||||
$rootNoteCount = rootCount;
|
||||
$tags = await getAllTags();
|
||||
$notebookIcons = await getNotebookIcons();
|
||||
const qaNotes = await getQuickAccess();
|
||||
$quickAccessPaths = qaNotes.map(n => n.relative_path);
|
||||
const nextTags = await getAllTags();
|
||||
if (ownerIsCurrent() && request === tagRefreshRequest) $tags = nextTags;
|
||||
} catch (error) {
|
||||
console.error('Failed to refresh tags:', error);
|
||||
}
|
||||
}
|
||||
|
||||
export async function refresh() {
|
||||
if (!ownerIsCurrent()) return;
|
||||
const request = ++refreshRequest;
|
||||
const tagRequest = isMobile ? tagRefreshRequest : ++tagRefreshRequest;
|
||||
const iconRevision = notebookAppearance.snapshot(ownerVault!);
|
||||
const styleRevision = tagAppearance.snapshot(ownerVault!);
|
||||
try {
|
||||
// Mobile derives tags from notes instead of issuing another full-vault scan.
|
||||
const [nbs, appearances, qaNotes, rootCount, nextTags] = await Promise.all([
|
||||
getNotebooks(),
|
||||
Promise.allSettled([getNotebookIcons(ownerVault!), getTagStyles(ownerVault!)]),
|
||||
getQuickAccess(ownerVault!),
|
||||
countRootNotes(),
|
||||
isMobile ? Promise.resolve(null) : getAllTags(),
|
||||
]);
|
||||
if (!ownerIsCurrent() || request !== refreshRequest) return;
|
||||
$notebooks = nbs;
|
||||
const [icons, styles] = appearances;
|
||||
if (notebookAppearance.acceptsSnapshot(ownerVault!, iconRevision)) {
|
||||
if (icons.status === 'fulfilled') $notebookIcons = icons.value;
|
||||
else iconError = `Could not read notebook icons: ${String(icons.reason)}`;
|
||||
}
|
||||
if (tagAppearance.acceptsSnapshot(ownerVault!, styleRevision)) {
|
||||
if (styles.status === 'fulfilled') $tagStyles = styles.value;
|
||||
else iconError = `Could not read tag appearances: ${String(styles.reason)}`;
|
||||
}
|
||||
$quickAccessPaths = qaNotes.map(n => n.relative_path);
|
||||
$rootNoteCount = rootCount;
|
||||
if (nextTags && tagRequest === tagRefreshRequest) $tags = nextTags;
|
||||
} catch (e) {
|
||||
console.error('Failed to refresh sidebar:', e);
|
||||
}
|
||||
@@ -233,6 +297,7 @@
|
||||
|
||||
async function focusNewNotebookInput() {
|
||||
await tick();
|
||||
if (!ownerIsCurrent()) return;
|
||||
newNotebookInput?.focus();
|
||||
}
|
||||
|
||||
@@ -268,7 +333,8 @@
|
||||
const name = parentRel ? trimmedName : getNotebookNameSegments(trimmedName)?.join('/');
|
||||
if (!name) return;
|
||||
|
||||
await createNotebook(parentRel, name);
|
||||
await createNotebook(ownerVault!, parentRel, name);
|
||||
if (!ownerIsCurrent()) return;
|
||||
newNotebookName = '';
|
||||
showNewNotebook = false;
|
||||
newNotebookParent = null;
|
||||
@@ -312,12 +378,21 @@
|
||||
editingNotebook = null;
|
||||
return;
|
||||
}
|
||||
const release = await onBeforePathMutation();
|
||||
if (!release) return;
|
||||
try {
|
||||
await renameNotebook(nb.path, editValue.trim());
|
||||
if (!ownerIsCurrent()) return;
|
||||
const newPath = await renameNotebook(ownerVault!, nb.path, editValue.trim());
|
||||
if (!ownerIsCurrent()) return;
|
||||
migratePaths(nb.path, newPath);
|
||||
await onPathsMoved(nb.path, newPath);
|
||||
if (!ownerIsCurrent()) return;
|
||||
editingNotebook = null;
|
||||
await refresh();
|
||||
} catch (e) {
|
||||
console.error('Failed to rename:', e);
|
||||
} finally {
|
||||
release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -342,7 +417,10 @@
|
||||
async function confirmDelete(nb: NotebookEntry) {
|
||||
deleteConfirm = null;
|
||||
try {
|
||||
await deleteNotebook(nb.path);
|
||||
if (!(await onBeforeNoteChange())) return;
|
||||
if (!ownerIsCurrent()) return;
|
||||
await deleteNotebook(ownerVault!, nb.path);
|
||||
if (!ownerIsCurrent()) return;
|
||||
if ($activeNotebook?.path === nb.path) {
|
||||
selectAllNotes();
|
||||
}
|
||||
@@ -359,28 +437,24 @@
|
||||
const notePaths = [...new Set(decodeNoteDragPaths(payload))]
|
||||
.filter((path) => norm(parentOf(path)) !== norm(nb.path));
|
||||
if (notePaths.length === 0) return;
|
||||
|
||||
const movedPaths = new Map<string, string>();
|
||||
for (const notePath of notePaths) {
|
||||
try {
|
||||
movedPaths.set(notePath, await moveNote(notePath, nb.path));
|
||||
} catch (e) {
|
||||
console.error('Failed to move note:', notePath, e);
|
||||
const release = await onBeforePathMutation();
|
||||
if (!release) return;
|
||||
try {
|
||||
if (!ownerIsCurrent()) return;
|
||||
for (const notePath of notePaths) {
|
||||
try {
|
||||
const newPath = await moveNote(ownerVault!, notePath, nb.path);
|
||||
if (!ownerIsCurrent()) return;
|
||||
migratePaths(notePath, newPath);
|
||||
await onPathsMoved(notePath, newPath);
|
||||
} catch (error) {
|
||||
console.error('Failed to move note:', notePath, error);
|
||||
}
|
||||
}
|
||||
if (ownerIsCurrent()) await refresh();
|
||||
} finally {
|
||||
release();
|
||||
}
|
||||
if (movedPaths.size === 0) return;
|
||||
|
||||
$notes = $notes.filter((note) => !movedPaths.has(note.path));
|
||||
const activeNewPath = $activeNotePath ? movedPaths.get($activeNotePath) : undefined;
|
||||
if (activeNewPath) {
|
||||
$activeNotePath = activeNewPath;
|
||||
try {
|
||||
$activeNote = await readNote(activeNewPath);
|
||||
} catch (e) {
|
||||
console.error('Failed to reload moved note:', e);
|
||||
}
|
||||
}
|
||||
await refresh();
|
||||
}
|
||||
|
||||
async function handleNotebookDrop(e: DragEvent, destPath: string) {
|
||||
@@ -398,32 +472,23 @@
|
||||
// Don't move if already in that parent
|
||||
const parentDir = parentOf(srcPath);
|
||||
if (parentDir === destPath) return;
|
||||
const release = await onBeforePathMutation();
|
||||
if (!release) return;
|
||||
try {
|
||||
const oldName = baseOf(srcPath);
|
||||
const newBasePath = joinPath(destPath, oldName);
|
||||
await moveNotebook(srcPath, destPath);
|
||||
// Update collapsedNotebooks paths
|
||||
$collapsedNotebooks = $collapsedNotebooks.map(p => {
|
||||
if (p === srcPath) return newBasePath;
|
||||
if (isDescendant(p, srcPath)) return newBasePath + p.slice(srcPath.length);
|
||||
return p;
|
||||
});
|
||||
// Update active notebook/note if inside the moved notebook
|
||||
if ($activeNotebook?.path === srcPath || isDescendant($activeNotebook?.path ?? '', srcPath)) {
|
||||
selectAllNotes();
|
||||
}
|
||||
if ($activeNotePath && isDescendant($activeNotePath, srcPath)) {
|
||||
const newNotePath = newBasePath + $activeNotePath.slice(srcPath.length);
|
||||
$activeNotePath = newNotePath;
|
||||
$activeNote = await readNote(newNotePath);
|
||||
}
|
||||
$notebookIcons = await getNotebookIcons();
|
||||
await refresh();
|
||||
} catch (e) {
|
||||
console.error('Failed to move notebook:', e);
|
||||
if (!ownerIsCurrent()) return;
|
||||
const newPath = await moveNotebook(ownerVault!, srcPath, destPath);
|
||||
if (!ownerIsCurrent()) return;
|
||||
migratePaths(srcPath, newPath);
|
||||
await onPathsMoved(srcPath, newPath);
|
||||
if (ownerIsCurrent()) await refresh();
|
||||
} catch (error) {
|
||||
console.error('Failed to move notebook:', error);
|
||||
} finally {
|
||||
release();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function nbStopDragListeners() {
|
||||
window.removeEventListener('pointermove', nbPointerMove);
|
||||
window.removeEventListener('pointerup', nbDragEnd);
|
||||
@@ -512,38 +577,18 @@
|
||||
const srcParent = parentOf(srcPath);
|
||||
const targetParent = parentOf(targetPath);
|
||||
let actualSrcPath = srcPath;
|
||||
|
||||
const release = srcParent !== targetParent ? await onBeforePathMutation() : () => {};
|
||||
if (!release) return;
|
||||
try {
|
||||
// Step 1: if different parents, move src into target's parent first
|
||||
if (srcParent !== targetParent) {
|
||||
const oldName = baseOf(srcPath);
|
||||
const newPath = joinPath(targetParent, oldName);
|
||||
await moveNotebook(srcPath, targetParent);
|
||||
// Migrate paths in collapsedNotebooks
|
||||
$collapsedNotebooks = $collapsedNotebooks.map(p => {
|
||||
if (p === srcPath) return newPath;
|
||||
if (isDescendant(p, srcPath)) return newPath + p.slice(srcPath.length);
|
||||
return p;
|
||||
});
|
||||
// Migrate paths in notebookOrder
|
||||
const migrated: Record<string, number> = {};
|
||||
for (const [p, v] of Object.entries($notebookOrder)) {
|
||||
if (p === srcPath) migrated[newPath] = v;
|
||||
else if (isDescendant(p, srcPath)) migrated[newPath + p.slice(srcPath.length)] = v;
|
||||
else migrated[p] = v;
|
||||
}
|
||||
$notebookOrder = migrated;
|
||||
// Update active notebook/note
|
||||
if ($activeNotebook?.path === srcPath || isDescendant($activeNotebook?.path ?? '', srcPath)) {
|
||||
selectAllNotes();
|
||||
}
|
||||
if ($activeNotePath && isDescendant($activeNotePath, srcPath)) {
|
||||
const newNotePath = newPath + $activeNotePath.slice(srcPath.length);
|
||||
$activeNotePath = newNotePath;
|
||||
$activeNote = await readNote(newNotePath);
|
||||
}
|
||||
$notebookIcons = await getNotebookIcons();
|
||||
if (!ownerIsCurrent()) return;
|
||||
const newPath = await moveNotebook(ownerVault!, srcPath, targetParent);
|
||||
if (!ownerIsCurrent()) return;
|
||||
migratePaths(srcPath, newPath);
|
||||
await onPathsMoved(srcPath, newPath);
|
||||
await refresh();
|
||||
if (!ownerIsCurrent()) return;
|
||||
actualSrcPath = newPath;
|
||||
}
|
||||
|
||||
@@ -571,6 +616,8 @@
|
||||
if ($notebookSortMode !== 'manual') $notebookSortMode = 'manual';
|
||||
} catch (e) {
|
||||
console.error('Failed to reorder notebook:', e);
|
||||
} finally {
|
||||
release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -579,6 +626,7 @@
|
||||
editingNotebook = nb.path;
|
||||
editValue = nb.name;
|
||||
await tick();
|
||||
if (!ownerIsCurrent()) return;
|
||||
renameInput?.focus();
|
||||
renameInput?.select();
|
||||
}
|
||||
@@ -587,52 +635,71 @@
|
||||
contextMenu = null;
|
||||
iconPickerNotebook = nb;
|
||||
await tick();
|
||||
if (!ownerIsCurrent()) return;
|
||||
iconPickerElement?.focus();
|
||||
}
|
||||
|
||||
function publishNotebookIcon(key: string, value: string | null) {
|
||||
if (get(appConfig)?.active_vault !== ownerVault) return;
|
||||
const icons = { ...get(notebookIcons) };
|
||||
if (value === null) delete icons[key];
|
||||
else icons[key] = value;
|
||||
notebookIcons.set(icons);
|
||||
}
|
||||
|
||||
async function handleBuiltinIcon(nb: NotebookEntry, icon: NotebookIconId) {
|
||||
if (!ownerVault || !ownerIsCurrent()) return;
|
||||
const key = normalizeNotebookIconKey(nb.relative_path);
|
||||
const latest = notebookAppearance.choose(ownerVault, key);
|
||||
const value = encodeBuiltinNotebookIcon(icon);
|
||||
iconError = '';
|
||||
try {
|
||||
const key = normalizeNotebookIconKey(nb.relative_path);
|
||||
const value = encodeBuiltinNotebookIcon(icon);
|
||||
await setNotebookIcon(key, value);
|
||||
$notebookIcons = { ...$notebookIcons, [key]: value };
|
||||
iconPickerNotebook = null;
|
||||
await notebookAppearance.run(ownerVault, key, latest,
|
||||
() => setNotebookIcon(ownerVault, key, value),
|
||||
() => publishNotebookIcon(key, value));
|
||||
if (ownerIsCurrent() && latest()) iconPickerNotebook = null;
|
||||
} catch (e) {
|
||||
console.error('Failed to set notebook icon:', e);
|
||||
if (ownerIsCurrent() && latest()) iconError = String(e);
|
||||
}
|
||||
}
|
||||
|
||||
async function handleCustomIcon(nb: NotebookEntry) {
|
||||
if (!ownerVault || !ownerIsCurrent()) return;
|
||||
const key = normalizeNotebookIconKey(nb.relative_path);
|
||||
const latest = notebookAppearance.choose(ownerVault, key);
|
||||
iconPickerNotebook = null;
|
||||
iconError = '';
|
||||
try {
|
||||
const selected = await openDialog({
|
||||
multiple: false,
|
||||
filters: [{ name: 'Images', extensions: ['png', 'jpg', 'jpeg', 'gif', 'svg', 'webp', 'ico'] }]
|
||||
});
|
||||
if (!selected) return;
|
||||
if (!selected || !ownerIsCurrent() || !latest()) return;
|
||||
const filePath = selected as string;
|
||||
const data = await readFile(filePath);
|
||||
if (!ownerIsCurrent() || !latest()) return;
|
||||
const fileName = baseOf(filePath) || 'icon.png';
|
||||
const iconRelative = await saveAttachment(`notebook-icon-${fileName}`, Array.from(data));
|
||||
const key = normalizeNotebookIconKey(nb.relative_path);
|
||||
await setNotebookIcon(key, iconRelative);
|
||||
$notebookIcons = { ...$notebookIcons, [key]: iconRelative };
|
||||
await notebookAppearance.run(ownerVault, key, latest,
|
||||
() => importNotebookIcon(ownerVault, key, `notebook-icon-${fileName}`, Array.from(data)),
|
||||
(value) => publishNotebookIcon(key, value));
|
||||
} catch (e) {
|
||||
console.error('Failed to set notebook icon:', e);
|
||||
if (ownerIsCurrent() && latest()) iconError = String(e);
|
||||
}
|
||||
}
|
||||
|
||||
async function handleRemoveIcon(nb: NotebookEntry) {
|
||||
if (!ownerVault || !ownerIsCurrent()) return;
|
||||
const key = normalizeNotebookIconKey(nb.relative_path);
|
||||
const latest = notebookAppearance.choose(ownerVault, key);
|
||||
contextMenu = null;
|
||||
iconPickerNotebook = null;
|
||||
iconError = '';
|
||||
try {
|
||||
const key = normalizeNotebookIconKey(nb.relative_path);
|
||||
await setNotebookIcon(key, null);
|
||||
const icons = { ...$notebookIcons };
|
||||
delete icons[key];
|
||||
$notebookIcons = icons;
|
||||
await notebookAppearance.run(ownerVault, key, latest,
|
||||
() => setNotebookIcon(ownerVault, key, null),
|
||||
() => publishNotebookIcon(key, null));
|
||||
} catch (e) {
|
||||
console.error('Failed to remove notebook icon:', e);
|
||||
if (ownerIsCurrent() && latest()) iconError = String(e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -670,6 +737,26 @@
|
||||
contextMenu = null;
|
||||
}
|
||||
|
||||
function onTagContextMenu(e: MouseEvent, tag: string) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
const { x, y } = clampMenu(e.clientX, e.clientY, 200, 80);
|
||||
tagContextMenu = { x, y, tag };
|
||||
}
|
||||
|
||||
function openTagMenu(e: Event, tag: string) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
const rect = (e.currentTarget as HTMLElement).getBoundingClientRect();
|
||||
const { x, y } = clampMenu(rect.right - 200, rect.bottom + 4, 200, 80);
|
||||
tagContextMenu = { x, y, tag };
|
||||
}
|
||||
|
||||
function openTagStylePicker(tag: string) {
|
||||
tagContextMenu = null;
|
||||
stylePickerTag = tag;
|
||||
}
|
||||
|
||||
function onTrashContextMenu(e: MouseEvent) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
@@ -679,11 +766,16 @@
|
||||
|
||||
async function handleEmptyTrash() {
|
||||
trashContextMenu = null;
|
||||
const previous = $activeNote;
|
||||
const path = $activeNotePath;
|
||||
try {
|
||||
await emptyTrash();
|
||||
await emptyTrash(ownerVault!);
|
||||
if (!ownerIsCurrent()) return;
|
||||
// Clear selection and refresh the list (with cache invalidation)
|
||||
$activeNote = null;
|
||||
$activeNotePath = '';
|
||||
if ($activeNotePath === path && $activeNote === previous) {
|
||||
$activeNote = null;
|
||||
$activeNotePath = '';
|
||||
}
|
||||
onViewChanged();
|
||||
} catch (e) {
|
||||
console.error('Failed to empty trash:', e);
|
||||
@@ -695,12 +787,13 @@
|
||||
function handleWindowClick() {
|
||||
if (contextMenu) contextMenu = null;
|
||||
if (trashContextMenu) trashContextMenu = null;
|
||||
if (tagContextMenu) tagContextMenu = null;
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:window onclick={handleWindowClick} onkeydown={(e) => { if (e.key === 'Escape') iconPickerNotebook = null; }} />
|
||||
<svelte:window onclick={handleWindowClick} onkeydown={(e) => { if (e.key === 'Escape') { iconPickerNotebook = null; tagContextMenu = null; } }} />
|
||||
|
||||
<aside class="sidebar" class:collapsed={$sidebarCollapsed} class:mobile={isMobile} class:nav-empty={!anyNavItem}>
|
||||
<aside class="sidebar" class:collapsed={!isMobile && $sidebarCollapsed} class:mobile={isMobile} class:nav-empty={!anyNavItem}>
|
||||
{#if !isMobile}
|
||||
<div class="sidebar-header">
|
||||
<button class="collapse-btn" onclick={() => ($sidebarCollapsed = !$sidebarCollapsed)} title="Toggle sidebar">
|
||||
@@ -721,7 +814,7 @@
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if !$sidebarCollapsed}
|
||||
{#if isMobile || !$sidebarCollapsed}
|
||||
{#if anyNavItem}
|
||||
<nav class="sidebar-nav">
|
||||
{#if $appConfig?.show_all_notes !== false}
|
||||
@@ -857,6 +950,7 @@
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if iconError}<div class="sidebar-error" role="alert">{iconError}</div>{/if}
|
||||
<div class="notebook-list">
|
||||
{#if $rootNoteCount > 0}
|
||||
<button
|
||||
@@ -866,10 +960,12 @@
|
||||
style="padding-left: 4px"
|
||||
>
|
||||
<span style="width:14px;flex-shrink:0"></span>
|
||||
<span class="notebook-icon-slot">
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="flex-shrink:0;opacity:0.6">
|
||||
<path d="M22 12h-6l-2 3h-4l-2-3H2" />
|
||||
<path d="M5.45 5.11 2 12v6a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2v-6l-3.45-6.89A2 2 0 0 0 16.76 4H7.24a2 2 0 0 0-1.79 1.11z" />
|
||||
</svg>
|
||||
</span>
|
||||
<span class="notebook-name">Unfiled Notes <span class="notebook-count">{$rootNoteCount}</span></span>
|
||||
</button>
|
||||
{/if}
|
||||
@@ -885,16 +981,8 @@
|
||||
</button>
|
||||
{#if !tagsCollapsed}
|
||||
<div class="tag-list">
|
||||
{#each $tags as [tag, count]}
|
||||
<button
|
||||
class="tag-item"
|
||||
class:active={$viewMode === 'tag' && $activeTag === tag}
|
||||
onclick={() => selectTag(tag)}
|
||||
>
|
||||
<span class="tag-hash">#</span>
|
||||
<span class="tag-name">{tag}</span>
|
||||
<span class="tag-count">{count}</span>
|
||||
</button>
|
||||
{#each $tags as [tag, count] (tag)}
|
||||
{@render tagRow(tag, count)}
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
@@ -910,16 +998,8 @@
|
||||
</button>
|
||||
{#if !tagsCollapsed}
|
||||
<div class="tag-list">
|
||||
{#each $tags as [tag, count]}
|
||||
<button
|
||||
class="tag-item"
|
||||
class:active={$viewMode === 'tag' && $activeTag === tag}
|
||||
onclick={() => selectTag(tag)}
|
||||
>
|
||||
<span class="tag-hash">#</span>
|
||||
<span class="tag-name">{tag}</span>
|
||||
<span class="tag-count">{count}</span>
|
||||
</button>
|
||||
{#each $tags as [tag, count] (tag)}
|
||||
{@render tagRow(tag, count)}
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
@@ -1016,6 +1096,23 @@
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if tagContextMenu}
|
||||
{#if isMobile}
|
||||
<button type="button" class="context-menu-backdrop" aria-label="Close tag actions" onclick={() => tagContextMenu = null}></button>
|
||||
{/if}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="context-menu" class:mobile={isMobile} style="left: {tagContextMenu.x}px; top: {tagContextMenu.y}px" onmousedown={(e) => e.stopPropagation()}>
|
||||
<button onclick={() => openTagStylePicker(tagContextMenu!.tag)}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10" /><path d="M8 14s1.5 2 4 2 4-2 4-2" /><line x1="9" y1="9" x2="9.01" y2="9" /><line x1="15" y1="9" x2="15.01" y2="9" /></svg>
|
||||
Customize...
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if stylePickerTag}
|
||||
<TagStylePicker tag={stylePickerTag} onclose={() => stylePickerTag = null} />
|
||||
{/if}
|
||||
|
||||
{#if trashContextMenu}
|
||||
{#if isMobile}
|
||||
<button type="button" class="context-menu-backdrop" aria-label="Close trash actions" onclick={() => trashContextMenu = null}></button>
|
||||
@@ -1045,6 +1142,32 @@
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#snippet tagRow(tag: string, count: number)}
|
||||
<div class="tag-row">
|
||||
<button
|
||||
class="tag-item"
|
||||
class:active={$viewMode === 'tag' && $activeTag === tag}
|
||||
onclick={() => selectTag(tag)}
|
||||
oncontextmenu={(e) => onTagContextMenu(e, tag)}
|
||||
>
|
||||
<span class="tag-label-slot">
|
||||
<TagLabel name={tag} size={isMobile ? 16 : 14} />
|
||||
</span>
|
||||
<span class="tag-count">{count}</span>
|
||||
</button>
|
||||
{#if isMobile}
|
||||
<button
|
||||
type="button"
|
||||
class="notebook-actions-btn"
|
||||
aria-label={`Customize ${tag}`}
|
||||
onclick={(e) => openTagMenu(e, tag)}
|
||||
>
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><circle cx="5" cy="12" r="1.8"/><circle cx="12" cy="12" r="1.8"/><circle cx="19" cy="12" r="1.8"/></svg>
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
{/snippet}
|
||||
|
||||
{#snippet notebookItem(nb: NotebookEntry, depth: number)}
|
||||
{@const hasChildren = nb.children.length > 0}
|
||||
{@const isCollapsed = $collapsedNotebooks.includes(nb.path)}
|
||||
@@ -1140,10 +1263,11 @@
|
||||
{:else}
|
||||
<span class="chevron-spacer"></span>
|
||||
{/if}
|
||||
<span class="notebook-icon-slot" class:notebook-builtin-icon={!!builtinIcon}>
|
||||
{#if builtinIcon}
|
||||
<span class="notebook-builtin-icon"><NotebookGlyph icon={builtinIcon} size={18} /></span>
|
||||
<NotebookGlyph icon={builtinIcon} size={18} />
|
||||
{:else if iconSrc}
|
||||
<img class="notebook-icon" src={iconSrc} alt="" />
|
||||
<img class="notebook-icon" crossorigin="anonymous" src={iconSrc} alt="" />
|
||||
{:else if isCollapsed || nb.children.length === 0}
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="opacity:0.6;flex-shrink:0">
|
||||
<path d="M2 6h4"/><path d="M2 10h4"/><path d="M2 14h4"/><path d="M2 18h4"/>
|
||||
@@ -1156,6 +1280,7 @@
|
||||
<path d="M10 9h8"/><path d="M10 13h8"/><path d="M10 17h5"/>
|
||||
</svg>
|
||||
{/if}
|
||||
</span>
|
||||
<span class="notebook-name">{nb.name} <span class="notebook-count">{nb.note_count}</span></span>
|
||||
{#if $notebookSortMode === 'manual'}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
@@ -1188,6 +1313,13 @@
|
||||
{/snippet}
|
||||
|
||||
<style>
|
||||
.sidebar-error {
|
||||
padding: 8px;
|
||||
font-size: 12px;
|
||||
color: var(--text-secondary);
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -1497,15 +1629,19 @@
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.notebook-builtin-icon {
|
||||
.notebook-icon-slot {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
display: grid;
|
||||
place-items: center;
|
||||
color: var(--text-secondary);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.notebook-builtin-icon {
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
|
||||
.notebook-name {
|
||||
flex: 1;
|
||||
text-align: left;
|
||||
@@ -1567,6 +1703,10 @@
|
||||
padding: 0 4px;
|
||||
}
|
||||
|
||||
.tag-row {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.tag-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -1582,6 +1722,12 @@
|
||||
transition: all 0.1s;
|
||||
}
|
||||
|
||||
.tag-label-slot {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.tag-item:hover {
|
||||
background: var(--bg-hover);
|
||||
}
|
||||
@@ -1591,16 +1737,6 @@
|
||||
color: var(--text-accent);
|
||||
}
|
||||
|
||||
.tag-hash {
|
||||
color: var(--text-tertiary);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.tag-name {
|
||||
flex: 1;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.tag-count {
|
||||
font-size: 11px;
|
||||
color: var(--text-tertiary);
|
||||
@@ -1994,7 +2130,7 @@
|
||||
height: 24px;
|
||||
}
|
||||
|
||||
.sidebar.mobile .notebook-builtin-icon {
|
||||
.sidebar.mobile .notebook-icon-slot {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
}
|
||||
@@ -2019,7 +2155,7 @@
|
||||
}
|
||||
|
||||
.sidebar.mobile .tag-item {
|
||||
padding: 10px 16px;
|
||||
padding: 10px 52px 10px 16px;
|
||||
min-height: 44px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import type { SourceController } from '$lib/editor/source/controller';
|
||||
|
||||
let { controller, readonly = false, numbers = false, visible = true, mobile = false }: {
|
||||
controller: SourceController;
|
||||
readonly?: boolean;
|
||||
numbers?: boolean;
|
||||
visible?: boolean;
|
||||
mobile?: boolean;
|
||||
} = $props();
|
||||
let host: HTMLDivElement;
|
||||
onMount(() => {
|
||||
const detach = controller.attach(host);
|
||||
const measure = () => controller.view?.requestMeasure();
|
||||
const appearance = new MutationObserver(measure);
|
||||
appearance.observe(document.documentElement, { attributes: true, attributeFilter: ['class', 'style'] });
|
||||
document.fonts.addEventListener('loadingdone', measure);
|
||||
return () => {
|
||||
appearance.disconnect();
|
||||
document.fonts.removeEventListener('loadingdone', measure);
|
||||
detach();
|
||||
};
|
||||
});
|
||||
$effect(() => { controller.configure(readonly, numbers); });
|
||||
$effect(() => { if (visible) controller.view?.requestMeasure(); });
|
||||
</script>
|
||||
|
||||
<div class="source-editor" class:mobile class:with-line-numbers={numbers} style:display={visible ? undefined : 'none'} bind:this={host}></div>
|
||||
|
||||
<style>
|
||||
.source-editor {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
min-height: 0;
|
||||
max-width: var(--editor-content-width, none);
|
||||
margin: 0 auto;
|
||||
user-select: text;
|
||||
}
|
||||
.source-editor.with-line-numbers { max-width: none; }
|
||||
.source-editor.mobile :global(.cm-editor) { font-size: var(--editor-font-size, 15px); }
|
||||
.source-editor.mobile :global(.cm-content) { padding: 8px 16px max(220px, var(--editor-scroll-past-end, 65vh)); }
|
||||
</style>
|
||||
@@ -0,0 +1,143 @@
|
||||
<script lang="ts">
|
||||
import { convertFileSrc } from '@tauri-apps/api/core';
|
||||
import { appConfig, tagStyles } from '$lib/stores/app';
|
||||
import NotebookGlyph from './NotebookGlyph.svelte';
|
||||
import { decodeBuiltinNotebookIcon } from '$lib/utils/notebook-icons';
|
||||
import { isValidTagColor, lookupTagStyle } from '$lib/utils/tag-styles';
|
||||
|
||||
let {
|
||||
name,
|
||||
size = 14,
|
||||
tone = 'none',
|
||||
showName = true
|
||||
}: {
|
||||
name: string;
|
||||
size?: number;
|
||||
tone?: 'none' | 'accent' | 'muted';
|
||||
showName?: boolean;
|
||||
} = $props();
|
||||
|
||||
const style = $derived(lookupTagStyle(name, $tagStyles));
|
||||
const color = $derived.by(() => {
|
||||
const value = style?.color;
|
||||
return isValidTagColor(value) ? value : null;
|
||||
});
|
||||
const builtinIcon = $derived(decodeBuiltinNotebookIcon(style?.icon));
|
||||
const imageSrc = $derived.by(() => {
|
||||
const icon = style?.icon;
|
||||
const vault = $appConfig?.active_vault;
|
||||
if (!icon || builtinIcon || icon.startsWith('builtin:') || !vault) return null;
|
||||
return convertFileSrc(`${vault}/${icon}`);
|
||||
});
|
||||
</script>
|
||||
|
||||
<span
|
||||
class={[
|
||||
'tag-label',
|
||||
`tone-${tone}`,
|
||||
{ 'has-color': !!color, 'has-icon': !!(builtinIcon || imageSrc) }
|
||||
]}
|
||||
style:--tag-color={color}
|
||||
title={`#${name}`}
|
||||
>
|
||||
<span class="tag-icon" style:width={`${size}px`} style:height={`${size}px`}>
|
||||
{#if builtinIcon}
|
||||
<NotebookGlyph icon={builtinIcon} {size} />
|
||||
{:else if imageSrc}
|
||||
<img class="tag-image" crossorigin="anonymous" src={imageSrc} alt="" width={size} height={size} />
|
||||
{:else}
|
||||
<span class="tag-hash">#</span>
|
||||
{/if}
|
||||
</span>
|
||||
{#if showName}<span class="tag-name">{name}</span>{/if}
|
||||
</span>
|
||||
|
||||
<style>
|
||||
.tag-label {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
color: inherit;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.tag-label.has-color {
|
||||
color: var(--tag-color);
|
||||
}
|
||||
|
||||
.tag-icon,
|
||||
.tag-image,
|
||||
.tag-hash {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.tag-icon {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
line-height: 1;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.tag-image {
|
||||
border-radius: 3px;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
.tag-hash {
|
||||
font-weight: 600;
|
||||
color: inherit;
|
||||
opacity: 0.72;
|
||||
}
|
||||
|
||||
.tag-label.has-color .tag-hash,
|
||||
.tag-label.has-icon .tag-hash,
|
||||
.tone-accent .tag-hash,
|
||||
.tone-muted .tag-hash {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.tag-name {
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.tone-accent {
|
||||
gap: 3px;
|
||||
padding: 1px 5px;
|
||||
border-radius: 3px;
|
||||
background: var(--accent-light);
|
||||
color: var(--text-accent);
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.tone-accent.has-color {
|
||||
color: var(--tag-color);
|
||||
background: color-mix(in srgb, var(--tag-color) 18%, transparent);
|
||||
}
|
||||
|
||||
.tone-muted {
|
||||
gap: 3px;
|
||||
padding: 1px 7px;
|
||||
border-radius: 10px;
|
||||
background: var(--bg-tertiary);
|
||||
color: var(--text-tertiary);
|
||||
font-size: 11px;
|
||||
letter-spacing: 0.01em;
|
||||
}
|
||||
|
||||
.tone-muted.has-color {
|
||||
color: var(--tag-color);
|
||||
background: color-mix(in srgb, var(--tag-color) 16%, var(--bg-tertiary));
|
||||
}
|
||||
|
||||
.tone-accent .tag-hash,
|
||||
.tone-muted .tag-hash {
|
||||
color: inherit;
|
||||
font-weight: 600;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,464 @@
|
||||
<script lang="ts">
|
||||
import { onMount, onDestroy } from 'svelte';
|
||||
import { open as openDialog } from '@tauri-apps/plugin-dialog';
|
||||
import { readFile } from '@tauri-apps/plugin-fs';
|
||||
import { get } from 'svelte/store';
|
||||
import { appConfig, tagStyles } from '$lib/stores/app';
|
||||
import { importTagIcon, setTagStyle } from '$lib/api';
|
||||
import type { TagStyle, TagStyleChange } from '$lib/types';
|
||||
import { tagAppearance } from '$lib/utils/appearance-mutations';
|
||||
import { isMobile } from '$lib/platform';
|
||||
import NotebookGlyph from './NotebookGlyph.svelte';
|
||||
import TagLabel from './TagLabel.svelte';
|
||||
import {
|
||||
NOTEBOOK_ICON_OPTIONS,
|
||||
encodeBuiltinNotebookIcon,
|
||||
type NotebookIconId
|
||||
} from '$lib/utils/notebook-icons';
|
||||
import {
|
||||
TAG_COLOR_PRESETS,
|
||||
applyCommittedTagStyle,
|
||||
lookupTagStyle,
|
||||
tagColor
|
||||
} from '$lib/utils/tag-styles';
|
||||
|
||||
let {
|
||||
tag,
|
||||
onclose
|
||||
}: {
|
||||
tag: string;
|
||||
onclose: () => void;
|
||||
} = $props();
|
||||
|
||||
let dialogEl = $state<HTMLDivElement | null>(null);
|
||||
const ownerVault = get(appConfig)?.active_vault ?? null;
|
||||
let disposed = false;
|
||||
let error = $state('');
|
||||
const ownerIsCurrent = () => !disposed && get(appConfig)?.active_vault === ownerVault;
|
||||
onDestroy(() => { disposed = true; });
|
||||
const current = $derived(lookupTagStyle(tag, $tagStyles));
|
||||
const activeIcon = $derived(current?.icon ?? null);
|
||||
const activeColor = $derived(tagColor(tag, $tagStyles));
|
||||
const colorInputValue = $derived(expandHex(activeColor) ?? '#5b6abf');
|
||||
const hasStyle = $derived(!!(activeIcon || activeColor));
|
||||
function publishStyle(target: string, next: TagStyle | null) {
|
||||
if (get(appConfig)?.active_vault !== ownerVault) return;
|
||||
tagStyles.update(styles => applyCommittedTagStyle(styles, target, next));
|
||||
}
|
||||
|
||||
onMount(() => dialogEl?.focus());
|
||||
|
||||
function expandHex(color: string | null): string | null {
|
||||
if (!color) return null;
|
||||
if (color.length === 4) {
|
||||
return `#${color[1]}${color[1]}${color[2]}${color[2]}${color[3]}${color[3]}`;
|
||||
}
|
||||
return color;
|
||||
}
|
||||
|
||||
function baseOf(path: string): string {
|
||||
return path.slice(Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\')) + 1);
|
||||
}
|
||||
|
||||
async function persist(change: TagStyleChange): Promise<boolean> {
|
||||
if (!ownerVault || !ownerIsCurrent()) return false;
|
||||
const target = tag;
|
||||
const key = target.trim().toLowerCase();
|
||||
let latest: () => boolean;
|
||||
if (change.kind === 'reset') {
|
||||
tagAppearance.choose(ownerVault, `${key}:icon`);
|
||||
tagAppearance.choose(ownerVault, `${key}:color`);
|
||||
latest = () => true;
|
||||
} else {
|
||||
latest = tagAppearance.choose(ownerVault, `${key}:${change.kind}`);
|
||||
}
|
||||
error = '';
|
||||
try {
|
||||
await tagAppearance.run(ownerVault, key, latest,
|
||||
() => setTagStyle(ownerVault, target, change),
|
||||
(next) => publishStyle(target, next));
|
||||
return true;
|
||||
} catch (cause) {
|
||||
if (ownerIsCurrent() && tag === target && latest()) error = String(cause);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function handleBuiltinIcon(icon: NotebookIconId) {
|
||||
void persist({ kind: 'icon', value: encodeBuiltinNotebookIcon(icon) });
|
||||
}
|
||||
|
||||
async function handleCustomIcon() {
|
||||
if (!ownerVault || !ownerIsCurrent()) return;
|
||||
const target = tag;
|
||||
const key = target.trim().toLowerCase();
|
||||
const latest = tagAppearance.choose(ownerVault, `${key}:icon`);
|
||||
error = '';
|
||||
try {
|
||||
const selected = await openDialog({
|
||||
multiple: false,
|
||||
filters: [{ name: 'Images', extensions: ['png', 'jpg', 'jpeg', 'gif', 'svg', 'webp', 'ico'] }]
|
||||
});
|
||||
if (!selected || !ownerIsCurrent() || tag !== target || !latest()) return;
|
||||
const filePath = selected as string;
|
||||
const data = await readFile(filePath);
|
||||
if (!ownerIsCurrent() || tag !== target || !latest()) return;
|
||||
const fileName = baseOf(filePath) || 'icon.png';
|
||||
await tagAppearance.run(ownerVault, key, latest,
|
||||
() => importTagIcon(ownerVault, target, `tag-icon-${fileName}`, Array.from(data)),
|
||||
(next) => publishStyle(target, next));
|
||||
} catch (cause) {
|
||||
if (ownerIsCurrent() && tag === target && latest()) error = String(cause);
|
||||
}
|
||||
}
|
||||
|
||||
async function handleReset() {
|
||||
const target = tag;
|
||||
if (await persist({ kind: 'reset' }) && ownerIsCurrent() && tag === target) onclose();
|
||||
}
|
||||
|
||||
function onColorInput(e: Event) {
|
||||
void persist({ kind: 'color', value: (e.currentTarget as HTMLInputElement).value });
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:window
|
||||
onkeydown={(e) => {
|
||||
if (e.key === 'Escape') {
|
||||
e.preventDefault();
|
||||
onclose();
|
||||
}
|
||||
}}
|
||||
/>
|
||||
|
||||
<div class="icon-picker-overlay" class:mobile={isMobile}>
|
||||
<button class="icon-picker-backdrop" aria-label="Close tag appearance picker" onclick={onclose}></button>
|
||||
<div
|
||||
bind:this={dialogEl}
|
||||
class="icon-picker"
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label={`Choose an icon and color for ${tag}`}
|
||||
tabindex="-1"
|
||||
>
|
||||
<header class="icon-picker-header">
|
||||
<div>
|
||||
<h3>Tag appearance</h3>
|
||||
<p>
|
||||
<TagLabel name={tag} size={14} />
|
||||
</p>
|
||||
</div>
|
||||
<button type="button" class="icon-picker-close" aria-label="Close tag appearance picker" onclick={onclose}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><path d="M18 6 6 18M6 6l12 12" /></svg>
|
||||
</button>
|
||||
</header>
|
||||
{#if error}<div class="picker-error" role="alert">{error}</div>{/if}
|
||||
<div class="icon-picker-grid">
|
||||
{#each NOTEBOOK_ICON_OPTIONS as option (option.id)}
|
||||
<button
|
||||
type="button"
|
||||
class="icon-picker-option"
|
||||
class:active={activeIcon === encodeBuiltinNotebookIcon(option.id)}
|
||||
aria-label={option.label}
|
||||
title={option.label}
|
||||
onclick={() => handleBuiltinIcon(option.id)}
|
||||
>
|
||||
<NotebookGlyph icon={option.id} size={20} />
|
||||
<span>{option.label}</span>
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
<div class="color-section">
|
||||
<span class="color-label">Color</span>
|
||||
<div class="swatches">
|
||||
<button
|
||||
type="button"
|
||||
class="swatch none"
|
||||
class:active={!activeColor}
|
||||
aria-label="Use default color"
|
||||
title="Default color"
|
||||
onclick={() => persist({ kind: 'color', value: null })}
|
||||
></button>
|
||||
{#each TAG_COLOR_PRESETS as preset (preset)}
|
||||
<button
|
||||
type="button"
|
||||
class="swatch"
|
||||
class:active={activeColor?.toLowerCase() === preset}
|
||||
style:background={preset}
|
||||
aria-label={`Use ${preset}`}
|
||||
title={preset}
|
||||
onclick={() => persist({ kind: 'color', value: preset })}
|
||||
></button>
|
||||
{/each}
|
||||
<label class="swatch custom" title="Custom color">
|
||||
<input type="color" value={colorInputValue} oninput={onColorInput} aria-label="Custom tag color" />
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="icon-picker-actions">
|
||||
<button type="button" onclick={handleCustomIcon}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2" /><circle cx="8.5" cy="8.5" r="1.5" /><path d="m21 15-5-5L5 21" /></svg>
|
||||
Custom image...
|
||||
</button>
|
||||
{#if hasStyle}
|
||||
<button type="button" class="remove" onclick={handleReset}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"><path d="M4 7h16M9 7V4h6v3M7 7l1 13h8l1-13" /></svg>
|
||||
Use default
|
||||
</button>
|
||||
{/if}
|
||||
<p class="icon-picker-recommendation">Icons and colors are optional. Recommended image size: <strong>1:1</strong></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.picker-error {
|
||||
padding: 8px 16px;
|
||||
font-size: 13px;
|
||||
color: var(--text-primary);
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.icon-picker-overlay {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 1100;
|
||||
display: grid;
|
||||
place-items: center;
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.icon-picker-backdrop {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
padding: 0;
|
||||
border: none;
|
||||
background: rgba(8, 10, 18, 0.42);
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.icon-picker {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
width: min(360px, 100%);
|
||||
max-height: calc(100dvh - 40px);
|
||||
overflow-y: auto;
|
||||
background: var(--bg-primary);
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 14px;
|
||||
box-shadow: var(--shadow-lg);
|
||||
}
|
||||
|
||||
.icon-picker-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 16px;
|
||||
padding: 16px 18px 12px;
|
||||
border-bottom: 1px solid var(--border-light);
|
||||
}
|
||||
|
||||
.icon-picker-header h3,
|
||||
.icon-picker-header p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.icon-picker-header h3 {
|
||||
color: var(--text-primary);
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
}
|
||||
|
||||
.icon-picker-header p {
|
||||
margin-top: 6px;
|
||||
color: var(--text-tertiary);
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.icon-picker-close {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
display: grid;
|
||||
place-items: center;
|
||||
padding: 0;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
background: transparent;
|
||||
color: var(--text-tertiary);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.icon-picker-close:hover {
|
||||
background: var(--bg-hover);
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
.icon-picker-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||
gap: 7px;
|
||||
padding: 14px;
|
||||
}
|
||||
|
||||
.icon-picker-option {
|
||||
min-width: 0;
|
||||
min-height: 60px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 5px;
|
||||
padding: 7px 3px 6px;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 9px;
|
||||
background: var(--bg-secondary);
|
||||
color: var(--text-secondary);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.icon-picker-option span {
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
color: var(--text-tertiary);
|
||||
font-size: 10px;
|
||||
line-height: 1.1;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.icon-picker-option:hover {
|
||||
border-color: var(--border-color);
|
||||
background: var(--bg-hover);
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
.icon-picker-option.active {
|
||||
border-color: var(--accent);
|
||||
background: var(--accent-light);
|
||||
color: var(--accent);
|
||||
}
|
||||
|
||||
.icon-picker-option.active span {
|
||||
color: var(--accent);
|
||||
}
|
||||
|
||||
.color-section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
padding: 0 14px 12px;
|
||||
}
|
||||
|
||||
.color-label {
|
||||
color: var(--text-secondary);
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.swatches {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 7px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.swatch {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
padding: 0;
|
||||
border: 2px solid transparent;
|
||||
border-radius: 50%;
|
||||
background: var(--bg-tertiary);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.swatch:hover,
|
||||
.swatch.active {
|
||||
border-color: var(--text-primary);
|
||||
}
|
||||
|
||||
.swatch.none {
|
||||
background:
|
||||
linear-gradient(to bottom right, transparent calc(50% - 1px), var(--text-tertiary) calc(50% - 1px), var(--text-tertiary) calc(50% + 1px), transparent calc(50% + 1px)),
|
||||
var(--bg-secondary);
|
||||
border-color: var(--border-color);
|
||||
}
|
||||
|
||||
.swatch.custom {
|
||||
display: grid;
|
||||
place-items: center;
|
||||
overflow: hidden;
|
||||
background: conic-gradient(from 90deg, #e11d48, #eab308, #22c55e, #3b82f6, #8b5cf6, #e11d48);
|
||||
}
|
||||
|
||||
.swatch.custom input {
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
padding: 0;
|
||||
border: none;
|
||||
background: none;
|
||||
cursor: pointer;
|
||||
transform: scale(1.4);
|
||||
}
|
||||
|
||||
.icon-picker-actions {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
padding: 12px 14px 14px;
|
||||
border-top: 1px solid var(--border-light);
|
||||
}
|
||||
|
||||
.icon-picker-recommendation {
|
||||
flex: 0 0 100%;
|
||||
margin: 2px 0 0;
|
||||
color: var(--text-tertiary);
|
||||
font-size: 11px;
|
||||
line-height: 1.3;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.icon-picker-actions button {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 7px;
|
||||
padding: 9px 12px;
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 8px;
|
||||
background: var(--bg-secondary);
|
||||
color: var(--text-secondary);
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.icon-picker-actions button:hover {
|
||||
background: var(--bg-hover);
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
.icon-picker-actions button.remove {
|
||||
color: var(--text-tertiary);
|
||||
}
|
||||
|
||||
.icon-picker-overlay.mobile {
|
||||
padding: 12px;
|
||||
align-items: end;
|
||||
}
|
||||
|
||||
.icon-picker-overlay.mobile .icon-picker {
|
||||
width: 100%;
|
||||
max-height: min(86dvh, 640px);
|
||||
}
|
||||
|
||||
.icon-picker-overlay.mobile .icon-picker-option {
|
||||
min-height: 64px;
|
||||
}
|
||||
|
||||
.icon-picker-overlay.mobile .icon-picker-actions button {
|
||||
min-height: 44px;
|
||||
}
|
||||
</style>
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { tags } from '$lib/stores/app';
|
||||
import TagLabel from './TagLabel.svelte';
|
||||
|
||||
let { existing = [], placeholder = 'Add tag...', onsubmit, oncancel }: {
|
||||
existing?: string[];
|
||||
@@ -69,14 +70,14 @@
|
||||
/>
|
||||
{#if suggestions.length}
|
||||
<div class="tag-suggest-list">
|
||||
{#each suggestions as s, i}
|
||||
{#each suggestions as s, i (s)}
|
||||
<button
|
||||
type="button"
|
||||
class="tag-suggest-item"
|
||||
class:selected={i === selIndex}
|
||||
onmouseenter={() => (selIndex = i)}
|
||||
onmousedown={(e) => { e.preventDefault(); submit(s); }}
|
||||
>#{s}</button>
|
||||
><TagLabel name={s} size={12} /></button>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
@@ -110,6 +111,8 @@
|
||||
gap: 1px;
|
||||
}
|
||||
.tag-suggest-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
text-align: left;
|
||||
padding: 5px 8px;
|
||||
border: none;
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
import { tasksLayout, tasksHideCompleted, tasksOnlyFlagged, tasksSort, appConfig } from '$lib/stores/app';
|
||||
import { isAndroid } from '$lib/platform';
|
||||
import type { TaskItem, FileEvent } from '$lib/types';
|
||||
import { isCurrentVaultEvent } from '$lib/utils/note-list-updates';
|
||||
|
||||
let { onOpenTask = (_t: TaskItem) => {}, onToggleTask = async (_t: TaskItem) => {}, onSetTaskPriority = async (_t: TaskItem, _p: string | null) => {}, onSetTaskDue = async (_t: TaskItem, _d: string | null) => {} }: {
|
||||
onOpenTask?: (t: TaskItem) => void;
|
||||
@@ -18,23 +19,82 @@
|
||||
let loading = $state(true);
|
||||
let taskQuery = $state('');
|
||||
let unlisten: (() => void) | null = null;
|
||||
let disposed = false;
|
||||
let fullLoad = 0;
|
||||
let revision = 0;
|
||||
const noteRevisions = new Map<string, number>();
|
||||
|
||||
async function load() {
|
||||
if (disposed) return;
|
||||
const request = ++fullLoad;
|
||||
const startedAt = revision;
|
||||
try {
|
||||
tasks = await getTasks();
|
||||
const loaded = await getTasks();
|
||||
if (disposed || request !== fullLoad) return;
|
||||
// Keep per-note updates/removals that arrived during the full scan.
|
||||
const changedPaths = new Set(
|
||||
[...noteRevisions].filter(([, changedAt]) => changedAt > startedAt).map(([path]) => path),
|
||||
);
|
||||
tasks = [
|
||||
...loaded.filter((task) => !changedPaths.has(task.note_path)),
|
||||
...tasks.filter((task) => changedPaths.has(task.note_path)),
|
||||
];
|
||||
} catch (e) {
|
||||
console.error('Failed to load tasks:', e);
|
||||
tasks = [];
|
||||
} finally {
|
||||
if (!disposed && request === fullLoad) loading = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function loadNote(path: string) {
|
||||
if (disposed) return;
|
||||
const request = ++revision;
|
||||
const generation = fullLoad;
|
||||
noteRevisions.set(path, request);
|
||||
try {
|
||||
const loaded = await getTasks(path);
|
||||
if (disposed || generation !== fullLoad || noteRevisions.get(path) !== request) return;
|
||||
tasks = [...tasks.filter((task) => task.note_path !== path), ...loaded];
|
||||
} catch (e) {
|
||||
console.error('Failed to refresh note tasks:', e);
|
||||
}
|
||||
loading = false;
|
||||
}
|
||||
|
||||
const debouncedLoad = debounce(load, 400);
|
||||
|
||||
function handleFileChange(event: FileEvent) {
|
||||
if (disposed || !isCurrentVaultEvent(event, $appConfig?.active_vault ?? null)) return;
|
||||
if (event.event_type === 'remove') {
|
||||
const isDescendant = (path: string) =>
|
||||
path.startsWith(event.path + '/') || path.startsWith(event.path + '\\');
|
||||
const removedPaths = new Set([
|
||||
event.path,
|
||||
...tasks.filter((task) => isDescendant(task.note_path)).map((task) => task.note_path),
|
||||
...[...noteRevisions.keys()].filter(isDescendant),
|
||||
]);
|
||||
for (const path of removedPaths) noteRevisions.set(path, ++revision);
|
||||
tasks = tasks.filter((task) => !removedPaths.has(task.note_path));
|
||||
if (event.path.endsWith('.md') && removedPaths.size === 1) return;
|
||||
} else if (event.note) {
|
||||
void loadNote(event.note.path);
|
||||
return;
|
||||
}
|
||||
// Directory/unknown events need the full scan; ordinary note saves do not.
|
||||
fullLoad += 1;
|
||||
debouncedLoad();
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
load();
|
||||
listen<FileEvent>('file-changed', () => debouncedLoad()).then((u) => (unlisten = u));
|
||||
return () => { unlisten?.(); };
|
||||
void load();
|
||||
listen<FileEvent>('file-changed', ({ payload }) => handleFileChange(payload)).then((u) => {
|
||||
if (disposed) u();
|
||||
else unlisten = u;
|
||||
});
|
||||
return () => {
|
||||
disposed = true;
|
||||
fullLoad += 1;
|
||||
unlisten?.();
|
||||
};
|
||||
});
|
||||
|
||||
// Local YYYY-MM-DD (en-CA gives ISO-style date)
|
||||
@@ -83,7 +143,7 @@
|
||||
|
||||
async function toggle(t: TaskItem) {
|
||||
await onToggleTask(t);
|
||||
await load();
|
||||
await loadNote(t.note_path);
|
||||
}
|
||||
|
||||
let prioMenuFor = $state<string | null>(null);
|
||||
@@ -93,13 +153,13 @@
|
||||
async function choosePriority(t: TaskItem, p: string | null) {
|
||||
prioMenuFor = null;
|
||||
await onSetTaskPriority(t, p);
|
||||
await load();
|
||||
await loadNote(t.note_path);
|
||||
}
|
||||
|
||||
async function chooseDue(t: TaskItem, d: string | null) {
|
||||
dueMenuFor = null;
|
||||
await onSetTaskDue(t, d);
|
||||
await load();
|
||||
await loadNote(t.note_path);
|
||||
}
|
||||
|
||||
// ── Calendar ──
|
||||
@@ -183,7 +243,7 @@
|
||||
dragOverDate = null;
|
||||
if (!t || t.due === date) return;
|
||||
await onSetTaskDue(t, date);
|
||||
await load();
|
||||
await loadNote(t.note_path);
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
<script lang="ts">
|
||||
import { getCurrentWindow } from '@tauri-apps/api/window';
|
||||
import { vaultReady, focusMode, readOnly, updateAvailable, showSettings, settingsTab, appConfig, activeVaultConfig, syncState } from '$lib/stores/app';
|
||||
import { vaultReady, focusMode, readOnly, updateAvailable, showSettings, settingsTab, appConfig, activeNotePath, activeVaultConfig, syncState } from '$lib/stores/app';
|
||||
import { syncNow } from '$lib/api';
|
||||
import NoteSwitcher from './NoteSwitcher.svelte';
|
||||
import { isTrashedNote } from '$lib/utils/paths';
|
||||
|
||||
let {
|
||||
onNewNote = () => {},
|
||||
onDailyNote = () => {},
|
||||
onSelectNote
|
||||
onSelectNote,
|
||||
onBeforeVaultSwitch
|
||||
}: {
|
||||
onNewNote?: () => void;
|
||||
onDailyNote?: () => void;
|
||||
onSelectNote?: (path: string) => Promise<boolean>;
|
||||
onBeforeVaultSwitch: () => Promise<boolean>;
|
||||
} = $props();
|
||||
|
||||
const appWindow = getCurrentWindow();
|
||||
@@ -93,7 +96,7 @@
|
||||
</div>
|
||||
{/if}
|
||||
<div class="titlebar-actions">
|
||||
<button class="switch-vault-btn" onclick={() => ($vaultReady = false)} title="Switch Vault">
|
||||
<button class="switch-vault-btn" onclick={async () => { if (await onBeforeVaultSwitch()) $vaultReady = false; }} title="Switch Vault">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M22 19a2 2 0 01-2 2H4a2 2 0 01-2-2V5a2 2 0 012-2h5l2 3h9a2 2 0 012 2z" />
|
||||
</svg>
|
||||
@@ -103,7 +106,7 @@
|
||||
<path d="M8 3H5a2 2 0 00-2 2v3m18 0V5a2 2 0 00-2-2h-3m0 18h3a2 2 0 002-2v-3M3 16v3a2 2 0 002 2h3"/>
|
||||
</svg>
|
||||
</button>
|
||||
<button class="switch-vault-btn" class:active={$readOnly} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? 'Switch to Edit Mode' : 'Switch to View Mode'}>
|
||||
<button class="switch-vault-btn" class:active={$readOnly} disabled={isTrashedNote($activeNotePath, $appConfig?.active_vault)} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? 'Switch to Edit Mode' : 'Switch to View Mode'}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
{#if $readOnly}
|
||||
<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
<script lang="ts">
|
||||
import { onMount, untrack } from 'svelte';
|
||||
import { open } from '@tauri-apps/plugin-dialog';
|
||||
import { getCurrentWindow } from '@tauri-apps/api/window';
|
||||
import { documentDir } from '@tauri-apps/api/path';
|
||||
import { chooseExternalVault, getAppConfig, openVault, removeVault, restoreExternalVault } from '$lib/api';
|
||||
import { chooseExternalVault, completeWindowClose, getAppConfig, openVault, removeVault, restoreExternalVault } from '$lib/api';
|
||||
import { appConfig, vaultReady } from '$lib/stores/app';
|
||||
import { isAndroid, isIOS, isMobile } from '$lib/platform';
|
||||
import type { VaultConfig } from '$lib/types';
|
||||
@@ -10,17 +11,30 @@
|
||||
let { initialError = '' }: { initialError?: string } = $props();
|
||||
|
||||
const appWindow = getCurrentWindow();
|
||||
onMount(() => {
|
||||
let disposed = false;
|
||||
let unlisten: (() => void) | undefined;
|
||||
appWindow.onCloseRequested(async (event) => {
|
||||
event.preventDefault();
|
||||
try {
|
||||
await completeWindowClose();
|
||||
} catch (error) {
|
||||
console.error('Failed to close window:', error);
|
||||
}
|
||||
}).then((stop) => {
|
||||
if (disposed) stop();
|
||||
else unlisten = stop;
|
||||
});
|
||||
return () => { disposed = true; unlisten?.(); };
|
||||
});
|
||||
|
||||
let recentVaults: VaultConfig[] = $derived($appConfig?.vaults ?? []);
|
||||
let loading = $state(false);
|
||||
let error = $state('');
|
||||
let error = $state(untrack(() => initialError));
|
||||
let vaultName = $state('HelixNotes');
|
||||
let hasPermission = $state(!isAndroid);
|
||||
let selectedLocation = $state('Documents');
|
||||
|
||||
$effect(() => {
|
||||
if (initialError && !error) error = initialError;
|
||||
});
|
||||
let customPath = $state('');
|
||||
let iosBasePath = $state('');
|
||||
|
||||
@@ -269,7 +283,7 @@
|
||||
</button>
|
||||
{/if}
|
||||
|
||||
{#if $appConfig?.active_vault}
|
||||
{#if $appConfig?.active_vault && !initialError}
|
||||
<button class="btn-back" onclick={() => ($vaultReady = true)}>
|
||||
Back
|
||||
</button>
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
import type { Node as ProseMirrorNode } from '@tiptap/pm/model';
|
||||
import type { EditorState } from '@tiptap/pm/state';
|
||||
import { Decoration, DecorationSet } from '@tiptap/pm/view';
|
||||
|
||||
const COPY_ICON = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>';
|
||||
const CHECK_ICON = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"/></svg>';
|
||||
|
||||
export function buildCodeCopyDecorations(doc: ProseMirrorNode): DecorationSet {
|
||||
const decorations: Decoration[] = [];
|
||||
doc.descendants((node, pos) => {
|
||||
if (node.type.name !== 'codeBlock') return !node.isTextblock;
|
||||
decorations.push(Decoration.widget(pos + 1, (view, getPos) => {
|
||||
const button = document.createElement('button');
|
||||
button.type = 'button';
|
||||
button.className = 'code-copy-btn';
|
||||
button.title = 'Copy code';
|
||||
button.innerHTML = COPY_ICON;
|
||||
button.addEventListener('click', (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const position = getPos();
|
||||
if (position === undefined || view.isDestroyed) return;
|
||||
const current = view.state.doc.resolve(position).parent;
|
||||
if (current.type.name !== 'codeBlock') return;
|
||||
void navigator.clipboard.writeText(current.textContent).then(() => {
|
||||
if (!button.isConnected) return;
|
||||
button.innerHTML = CHECK_ICON;
|
||||
button.classList.add('copied');
|
||||
setTimeout(() => { button.innerHTML = COPY_ICON; button.classList.remove('copied'); }, 1500);
|
||||
}).catch((error) => console.error('Failed to copy code:', error));
|
||||
});
|
||||
return button;
|
||||
}, { side: -1, key: `copy-btn:${pos}` }));
|
||||
return false;
|
||||
});
|
||||
return DecorationSet.create(doc, decorations);
|
||||
}
|
||||
|
||||
const priority = /(^|\s)(!(?:high|medium|med|low))\b/gi;
|
||||
const due = /\bdue:\d{4}-\d{2}-\d{2}\b/gi;
|
||||
|
||||
export function buildTaskMetaDecorations(doc: ProseMirrorNode): DecorationSet {
|
||||
const decorations: Decoration[] = [];
|
||||
doc.descendants((node, pos) => {
|
||||
// A prose-only note never traverses inline text or resolves a position.
|
||||
if (node.type.name !== 'taskItem') return !node.isTextblock;
|
||||
// One traversal covers the whole task subtree, including nested tasks.
|
||||
node.descendants((child, offset) => {
|
||||
if (!child.isText || !child.text) return;
|
||||
const start = pos + 1 + offset;
|
||||
for (const match of child.text.matchAll(priority)) {
|
||||
const from = start + match.index! + match[1].length;
|
||||
decorations.push(Decoration.inline(from, from + match[2].length, { class: 'task-meta-dim' }));
|
||||
}
|
||||
for (const match of child.text.matchAll(due)) {
|
||||
const from = start + match.index!;
|
||||
decorations.push(Decoration.inline(from, from + match[0].length, { class: 'task-meta-dim' }));
|
||||
}
|
||||
});
|
||||
return false;
|
||||
});
|
||||
return DecorationSet.create(doc, decorations);
|
||||
}
|
||||
|
||||
/** Placeholder only needs the caret's empty textblock, not a recursive document emptiness scan. */
|
||||
export function focusedPlaceholderDecorations(state: EditorState): DecorationSet {
|
||||
const { $anchor } = state.selection;
|
||||
const node = $anchor.parent;
|
||||
if (!$anchor.depth || !node.isTextblock || node.content.size) return DecorationSet.empty;
|
||||
const pos = $anchor.before();
|
||||
const placeholder = node.type.name === 'detailsSummary' ? 'Section title...' : 'Start writing...';
|
||||
return DecorationSet.create(state.doc, [Decoration.node(pos, pos + node.nodeSize, {
|
||||
class: 'is-empty', 'data-placeholder': placeholder,
|
||||
})]);
|
||||
}
|
||||
@@ -0,0 +1,130 @@
|
||||
import CodeBlock, { type CodeBlockOptions } from '@tiptap/extension-code-block';
|
||||
import type { Node as ProseMirrorNode } from '@tiptap/pm/model';
|
||||
import { Plugin, PluginKey } from '@tiptap/pm/state';
|
||||
import { Decoration, DecorationSet } from '@tiptap/pm/view';
|
||||
|
||||
interface HighlightNode {
|
||||
type: string;
|
||||
value?: string;
|
||||
properties?: { className?: unknown };
|
||||
children?: HighlightNode[];
|
||||
}
|
||||
|
||||
export interface CodeHighlighter {
|
||||
registered(language: string): boolean;
|
||||
highlight(language: string, text: string): { children: HighlightNode[] };
|
||||
highlightAuto(text: string): { children: HighlightNode[] };
|
||||
}
|
||||
type HighlightSpan = { from: number; to: number; className: string };
|
||||
type HighlightState = { blocks: Map<number, ProseMirrorNode>; decorations: DecorationSet };
|
||||
|
||||
export function createCodeBlockHighlightPlugin({
|
||||
name = 'codeBlock',
|
||||
lowlight,
|
||||
defaultLanguage = null,
|
||||
}: {
|
||||
name?: string;
|
||||
lowlight: CodeHighlighter;
|
||||
defaultLanguage?: string | null;
|
||||
}) {
|
||||
// Nodes are immutable. Relative spans survive moves and undo without retaining
|
||||
// deleted documents, and never leak between editor/highlighter instances.
|
||||
const cache = new WeakMap<ProseMirrorNode, HighlightSpan[]>();
|
||||
|
||||
function highlight(node: ProseMirrorNode): HighlightSpan[] {
|
||||
const cached = cache.get(node);
|
||||
if (cached) return cached;
|
||||
const language = node.attrs.language || defaultLanguage;
|
||||
const tree = language && lowlight.registered(language)
|
||||
? lowlight.highlight(language, node.textContent)
|
||||
: lowlight.highlightAuto(node.textContent);
|
||||
const spans: HighlightSpan[] = [];
|
||||
let offset = 0;
|
||||
function visit(nodes: HighlightNode[], inheritedClass: string) {
|
||||
for (const child of nodes) {
|
||||
if (child.type === 'element' && child.children) {
|
||||
const classes = child.properties?.className;
|
||||
const ownClass = Array.isArray(classes) ? classes.join(' ') : typeof classes === 'string' ? classes : '';
|
||||
visit(child.children, [inheritedClass, ownClass].filter(Boolean).join(' '));
|
||||
} else if (child.type === 'text' && child.value !== undefined) {
|
||||
const end = offset + child.value.length;
|
||||
if (inheritedClass && end > offset) spans.push({ from: offset, to: end, className: inheritedClass });
|
||||
offset = end;
|
||||
}
|
||||
}
|
||||
}
|
||||
visit(tree.children, '');
|
||||
cache.set(node, spans);
|
||||
return spans;
|
||||
}
|
||||
|
||||
function collect(doc: ProseMirrorNode) {
|
||||
const blocks = new Map<number, ProseMirrorNode>();
|
||||
doc.descendants((node, pos) => {
|
||||
if (node.type.name !== name) return !node.isTextblock;
|
||||
blocks.set(pos, node);
|
||||
return false;
|
||||
});
|
||||
return blocks;
|
||||
}
|
||||
|
||||
function decorate(blocks: Map<number, ProseMirrorNode>, retained?: Set<number>) {
|
||||
const decorations: Decoration[] = [];
|
||||
for (const [pos, node] of blocks) {
|
||||
if (retained?.has(pos)) continue;
|
||||
for (const span of highlight(node)) {
|
||||
decorations.push(Decoration.inline(pos + 1 + span.from, pos + 1 + span.to, { class: span.className }));
|
||||
}
|
||||
}
|
||||
return decorations;
|
||||
}
|
||||
|
||||
const plugin: Plugin<HighlightState> = new Plugin({
|
||||
key: new PluginKey('cachedCodeBlockLowlight'),
|
||||
state: {
|
||||
init: (_, { doc }) => {
|
||||
const blocks = collect(doc);
|
||||
return { blocks, decorations: DecorationSet.create(doc, decorate(blocks)) };
|
||||
},
|
||||
apply(transaction, previous) {
|
||||
// Cursor motion must not even walk the document.
|
||||
if (!transaction.docChanged) return previous;
|
||||
const blocks = collect(transaction.doc);
|
||||
const retained = new Set<number>();
|
||||
const removed: Decoration[] = [];
|
||||
for (const [pos, node] of previous.blocks) {
|
||||
const from = transaction.mapping.mapResult(pos, 1);
|
||||
const to = transaction.mapping.mapResult(pos + node.nodeSize, -1);
|
||||
if (!from.deleted && !to.deleted && to.pos - from.pos === node.nodeSize && blocks.get(from.pos) === node) {
|
||||
retained.add(from.pos);
|
||||
} else {
|
||||
removed.push(...previous.decorations.find(pos + 1, pos + node.nodeSize - 1));
|
||||
}
|
||||
}
|
||||
// Drop changed/removed blocks before mapping, including code converted to
|
||||
// a paragraph where a markup-only step leaves its text positions intact.
|
||||
const mapped = previous.decorations.remove(removed).map(transaction.mapping, transaction.doc);
|
||||
return { blocks, decorations: mapped.add(transaction.doc, decorate(blocks, retained)) };
|
||||
},
|
||||
},
|
||||
props: {
|
||||
decorations(state) {
|
||||
return plugin.getState(state)?.decorations;
|
||||
},
|
||||
},
|
||||
});
|
||||
return plugin;
|
||||
}
|
||||
|
||||
export const CachedCodeBlockLowlight = CodeBlock.extend<CodeBlockOptions & { lowlight: CodeHighlighter | null }>({
|
||||
addOptions() {
|
||||
return { ...this.parent!(), lowlight: null };
|
||||
},
|
||||
addProseMirrorPlugins() {
|
||||
if (!this.options.lowlight) throw new Error('Code block highlighting requires a lowlight instance');
|
||||
return [
|
||||
...(this.parent?.() ?? []),
|
||||
createCodeBlockHighlightPlugin({ name: this.name, lowlight: this.options.lowlight, defaultLanguage: this.options.defaultLanguage }),
|
||||
];
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,109 @@
|
||||
import type { SearchTarget } from '../types';
|
||||
import type { NoteSearchMatch } from './search';
|
||||
import { stripTitleHeading } from './titleVisibility.ts';
|
||||
|
||||
function isTextBoundary(text: string, offset: number): boolean {
|
||||
const previous = text.charCodeAt(offset - 1);
|
||||
const next = text.charCodeAt(offset);
|
||||
return !(previous >= 0xd800 && previous <= 0xdbff && next >= 0xdc00 && next <= 0xdfff);
|
||||
}
|
||||
|
||||
function isLineBoundary(text: string, offset: number): boolean {
|
||||
return !(text.charCodeAt(offset - 1) === 13 && text.charCodeAt(offset) === 10);
|
||||
}
|
||||
|
||||
function validMatch(text: string, match: NoteSearchMatch): boolean {
|
||||
return Number.isInteger(match.from) && Number.isInteger(match.to)
|
||||
&& match.from >= 0 && match.to > match.from && match.to <= text.length
|
||||
&& isTextBoundary(text, match.from) && isTextBoundary(text, match.to);
|
||||
}
|
||||
|
||||
function normalizeLines(text: string): string {
|
||||
return text.includes('\r') ? text.replace(/\r\n?/g, '\n') : text;
|
||||
}
|
||||
|
||||
function normalizedOffset(text: string, offset: number): number {
|
||||
let removed = 0;
|
||||
for (let i = text.indexOf('\r'); i >= 0 && i < offset; i = text.indexOf('\r', i + 1)) {
|
||||
if (text.charCodeAt(i + 1) === 10 && i + 1 < offset) removed++;
|
||||
}
|
||||
return offset - removed;
|
||||
}
|
||||
|
||||
// Compare the bounded anchor against the original string, retaining its coordinates.
|
||||
function matchAnchorAt(
|
||||
text: string, anchor: string, offset: number, start: number, end: number,
|
||||
): NoteSearchMatch | null {
|
||||
if (!isTextBoundary(text, offset) || !isLineBoundary(text, offset)) return null;
|
||||
let cursor = offset;
|
||||
let from = offset;
|
||||
let to = offset;
|
||||
for (let i = 0; i < anchor.length; i++) {
|
||||
if (i === start) from = cursor;
|
||||
if (i === end) to = cursor;
|
||||
const character = text.charCodeAt(cursor);
|
||||
if ((character === 13 ? 10 : character) !== anchor.charCodeAt(i)) return null;
|
||||
cursor += character === 13 && text.charCodeAt(cursor + 1) === 10 ? 2 : 1;
|
||||
}
|
||||
if (end === anchor.length) to = cursor;
|
||||
const match = { from, to };
|
||||
return validMatch(text, match) && isTextBoundary(text, cursor) ? match : null;
|
||||
}
|
||||
|
||||
/** Resolve an indexed anchor to UTF-16 offsets in the supplied, unmodified text. */
|
||||
export function resolveSearchTarget(text: string, target: SearchTarget): NoteSearchMatch | null {
|
||||
if (!Number.isInteger(target.start) || !Number.isInteger(target.end)
|
||||
|| target.start < target.before.length || target.end <= target.start
|
||||
|| target.end - target.start !== target.text.length
|
||||
|| [target.before, target.text, target.after].some((part) => /[\ud800-\udfff]/u.test(part))) return null;
|
||||
|
||||
const anchor = target.before + target.text + target.after;
|
||||
const anchorStart = target.start - target.before.length;
|
||||
const recorded = { from: target.start, to: target.end };
|
||||
if (validMatch(text, recorded) && text.startsWith(anchor, anchorStart)
|
||||
&& isTextBoundary(text, anchorStart) && isTextBoundary(text, anchorStart + anchor.length)) {
|
||||
return recorded;
|
||||
}
|
||||
|
||||
// A boundary inside CRLF has no unique equivalent in an LF-only document.
|
||||
const start = target.before.length;
|
||||
const end = start + target.text.length;
|
||||
if (!isLineBoundary(anchor, start) || !isLineBoundary(anchor, end)) return null;
|
||||
const normalized = normalizeLines(anchor);
|
||||
const matchStart = normalizedOffset(anchor, start);
|
||||
const matchEnd = normalizedOffset(anchor, end);
|
||||
const first = normalized.charCodeAt(0);
|
||||
let found: NoteSearchMatch | null = null;
|
||||
for (let offset = 0; offset < text.length; offset++) {
|
||||
const character = text.charCodeAt(offset);
|
||||
if ((character === 13 ? 10 : character) !== first) continue;
|
||||
const candidate = matchAnchorAt(text, normalized, offset, matchStart, matchEnd);
|
||||
if (!candidate) continue;
|
||||
if (found) return null;
|
||||
found = candidate;
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
||||
/** Project a body range into the editor's LF-only, optionally title-hidden Markdown. */
|
||||
export function visibleSearchTarget(
|
||||
body: string, title: string | undefined, hideTitle: boolean, match: NoteSearchMatch,
|
||||
): { markdown: string; match: NoteSearchMatch | null; hiddenTitle: boolean } {
|
||||
const { markdown, removedRange } = stripTitleHeading(normalizeLines(body), title, hideTitle);
|
||||
if (!validMatch(body, match) || !isLineBoundary(body, match.from) || !isLineBoundary(body, match.to)) {
|
||||
return { markdown, match: null, hiddenTitle: false };
|
||||
}
|
||||
const visible = { from: normalizedOffset(body, match.from), to: normalizedOffset(body, match.to) };
|
||||
if (removedRange) {
|
||||
if (visible.from < removedRange.to && visible.to > removedRange.from) {
|
||||
return { markdown, match: null, hiddenTitle: true };
|
||||
}
|
||||
if (visible.from >= removedRange.to) {
|
||||
const removed = removedRange.to - removedRange.from;
|
||||
visible.from -= removed;
|
||||
visible.to -= removed;
|
||||
}
|
||||
}
|
||||
return { markdown, match: visible, hiddenTitle: false };
|
||||
}
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
import type { Node as ProseMirrorNode } from '@tiptap/pm/model';
|
||||
|
||||
export interface NoteSearchMatch { from: number; to: number }
|
||||
export interface NoteSearchOptions { matchCase: boolean; wholeWord: boolean }
|
||||
|
||||
const wordCharacter = /[\p{L}\p{N}\p{M}\p{Pc}\u200c\u200d]/u;
|
||||
|
||||
function characterBefore(text: string, offset: number): string {
|
||||
if (!offset) return '';
|
||||
const last = text.charCodeAt(offset - 1);
|
||||
return text.slice(offset - (last >= 0xdc00 && last <= 0xdfff && offset > 1 ? 2 : 1), offset);
|
||||
}
|
||||
|
||||
function literalMatcher(query: string, options: NoteSearchOptions) {
|
||||
// Unicode regexp case folding preserves original UTF-16 offsets, unlike lowercasing
|
||||
// the document (for example, U+0130 lowercases to two code points).
|
||||
const pattern = new RegExp(query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), options.matchCase ? 'gu' : 'giu');
|
||||
return (text: string, base: number, results: NoteSearchMatch[]) => {
|
||||
pattern.lastIndex = 0;
|
||||
let match: RegExpExecArray | null;
|
||||
while ((match = pattern.exec(text))) {
|
||||
const from = match.index;
|
||||
const to = from + match[0].length;
|
||||
if (!options.wholeWord || (
|
||||
!wordCharacter.test(characterBefore(text, from)) &&
|
||||
!wordCharacter.test(to < text.length ? String.fromCodePoint(text.codePointAt(to)!) : '')
|
||||
)) results.push({ from: base + from, to: base + to });
|
||||
// Keep overlapping occurrences, but never start inside a surrogate pair.
|
||||
pattern.lastIndex = from + (text.codePointAt(from)! > 0xffff ? 2 : 1);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
export function findSourceMatches(text: string, query: string, options: NoteSearchOptions): NoteSearchMatch[] {
|
||||
const results: NoteSearchMatch[] = [];
|
||||
if (query) literalMatcher(query, options)(text, 0, results);
|
||||
return results;
|
||||
}
|
||||
|
||||
export function findDocumentMatches(doc: ProseMirrorNode, query: string, options: NoteSearchOptions): NoteSearchMatch[] {
|
||||
const results: NoteSearchMatch[] = [];
|
||||
if (!query) return results;
|
||||
const match = literalMatcher(query, options);
|
||||
doc.descendants((block, pos) => {
|
||||
if (!block.isTextblock) return;
|
||||
let text = '';
|
||||
let start = 0;
|
||||
const flush = () => {
|
||||
if (text) match(text, start, results);
|
||||
text = '';
|
||||
};
|
||||
block.forEach((child, offset) => {
|
||||
if (!child.isText) {
|
||||
// Hard breaks, images and inline atoms are real boundaries, not marks.
|
||||
flush();
|
||||
return;
|
||||
}
|
||||
if (!text) start = pos + 1 + offset;
|
||||
text += child.text;
|
||||
});
|
||||
flush();
|
||||
return false;
|
||||
});
|
||||
return results;
|
||||
}
|
||||
|
||||
export function closestSearchMatch(results: NoteSearchMatch[], anchor: number): number {
|
||||
if (!results.length) return 0;
|
||||
let lo = 0;
|
||||
let hi = results.length;
|
||||
while (lo < hi) {
|
||||
const mid = (lo + hi) >>> 1;
|
||||
if (results[mid].from < anchor) lo = mid + 1; else hi = mid;
|
||||
}
|
||||
return Math.min(lo, results.length - 1);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,174 @@
|
||||
import { Annotation, Compartment, EditorSelection, EditorState, StateEffect, StateField, Transaction, type ChangeDesc, type Extension, type StateCommand, type TransactionSpec } from '@codemirror/state';
|
||||
import { Decoration, EditorView, drawSelection, keymap, lineNumbers, placeholder, type DecorationSet } from '@codemirror/view';
|
||||
import { defaultKeymap, history, historyKeymap, indentWithTab, redo, undo } from '@codemirror/commands';
|
||||
import { HighlightStyle, indentUnit, syntaxHighlighting } from '@codemirror/language';
|
||||
import { markdown } from '@codemirror/lang-markdown';
|
||||
import { tags } from '@lezer/highlight';
|
||||
import { getSelectionPair } from '../selectionPairs.ts';
|
||||
import type { NoteSearchMatch } from '../search';
|
||||
|
||||
const representationChange = Annotation.define<boolean>();
|
||||
const activeMatch = StateEffect.define<NoteSearchMatch | null>();
|
||||
export const sourceSearchDecoration = StateField.define<DecorationSet>({
|
||||
create: () => Decoration.none,
|
||||
update(value, transaction) {
|
||||
value = value.map(transaction.changes);
|
||||
for (const effect of transaction.effects) {
|
||||
if (effect.is(activeMatch)) {
|
||||
const match = effect.value;
|
||||
value = match && match.to > match.from
|
||||
? Decoration.set([Decoration.mark({ class: 'source-search-current' }).range(match.from, match.to)])
|
||||
: Decoration.none;
|
||||
}
|
||||
}
|
||||
return value;
|
||||
},
|
||||
provide: (field) => EditorView.decorations.from(field),
|
||||
});
|
||||
|
||||
/** Insert just the wrappers, preserving the selected immutable text and its direction. */
|
||||
export function wrapSourceSelection(state: EditorState, key: string): TransactionSpec | null {
|
||||
const close = getSelectionPair(key);
|
||||
if (state.readOnly || !close || state.selection.main.empty) return null;
|
||||
return {
|
||||
...state.changeByRange((range) => range.empty ? { range } : ({
|
||||
changes: [{ from: range.from, insert: key }, { from: range.to, insert: close }],
|
||||
range: EditorSelection.range(range.anchor + key.length, range.head + key.length),
|
||||
})),
|
||||
userEvent: 'input.type',
|
||||
scrollIntoView: true,
|
||||
};
|
||||
}
|
||||
|
||||
export const sourceHardBreak: StateCommand = ({ state, dispatch }) => {
|
||||
if (state.readOnly) return false;
|
||||
dispatch(state.update(state.replaceSelection(' \n'), { userEvent: 'input.type', scrollIntoView: true }));
|
||||
return true;
|
||||
};
|
||||
|
||||
const sourceTheme = EditorView.theme({
|
||||
'&': { height: '100%', color: 'var(--text-primary)', backgroundColor: 'transparent', fontSize: 'var(--editor-font-size, 14px)' },
|
||||
'&.cm-focused': { outline: 'none' },
|
||||
'.cm-scroller': { overflow: 'auto', fontFamily: "var(--editor-font-family, 'JetBrains Mono', 'Fira Code', 'Cascadia Code', monospace)", lineHeight: 'var(--editor-line-height, 1.3)' },
|
||||
'.cm-content': { padding: '0 0 var(--editor-scroll-past-end, 65vh)', caretColor: 'var(--text-primary)' },
|
||||
'.cm-line': { padding: '0 4px' },
|
||||
'.cm-gutters': { backgroundColor: 'var(--bg-primary)', color: 'var(--text-secondary)', border: 'none' },
|
||||
'.cm-cursor': { borderLeftColor: 'var(--text-primary)' },
|
||||
'&.cm-focused .cm-selectionBackground, .cm-selectionBackground, ::selection': { backgroundColor: 'color-mix(in srgb, var(--accent) 25%, transparent)' },
|
||||
'.source-search-current': { backgroundColor: 'color-mix(in srgb, var(--accent) 40%, transparent)', outline: '1px solid var(--accent)' },
|
||||
'.cm-placeholder': { color: 'var(--text-secondary)' },
|
||||
});
|
||||
const sourceSyntax = HighlightStyle.define([
|
||||
{ tag: [tags.heading, tags.strong], color: 'var(--accent)' },
|
||||
{ tag: [tags.link, tags.url, tags.emphasis], color: 'color-mix(in srgb, var(--accent) 78%, var(--text-primary))' },
|
||||
{ tag: [tags.processingInstruction, tags.list, tags.meta], color: 'var(--success)' },
|
||||
{ tag: [tags.quote, tags.monospace, tags.comment], color: 'var(--text-secondary)' },
|
||||
]);
|
||||
|
||||
export class SourceController {
|
||||
private configuration = new Compartment();
|
||||
private readOnly = false;
|
||||
private numbers = false;
|
||||
private extensions: Extension[];
|
||||
private onChange: (changes: ChangeDesc, edited: boolean) => void;
|
||||
state: EditorState;
|
||||
view: EditorView | null = null;
|
||||
|
||||
constructor(onChange: (changes: ChangeDesc, edited: boolean) => void = () => {}, events: {
|
||||
paste?: (event: ClipboardEvent) => boolean;
|
||||
drop?: (event: DragEvent) => boolean;
|
||||
} = {}) {
|
||||
this.onChange = onChange;
|
||||
this.extensions = [
|
||||
markdown(), history(), drawSelection(), sourceSearchDecoration, sourceTheme,
|
||||
syntaxHighlighting(sourceSyntax), indentUnit.of('\t'), EditorState.tabSize.of(4),
|
||||
placeholder('Start writing...'),
|
||||
EditorView.contentAttributes.of({ 'aria-label': 'Markdown source', tabindex: '0', spellcheck: 'false', autocapitalize: 'off' }),
|
||||
keymap.of([{ key: 'Shift-Enter', run: sourceHardBreak }, indentWithTab, ...historyKeymap, ...defaultKeymap]),
|
||||
EditorView.domEventHandlers({
|
||||
keydown: (event, view) => {
|
||||
if (event.ctrlKey || event.metaKey || event.altKey || event.isComposing) return false;
|
||||
const transaction = wrapSourceSelection(view.state, event.key);
|
||||
if (!transaction) return false;
|
||||
view.dispatch(transaction);
|
||||
return true;
|
||||
},
|
||||
paste: (event, view) => !view.state.readOnly && (events.paste?.(event) ?? false),
|
||||
drop: (event, view) => !view.state.readOnly && (events.drop?.(event) ?? false),
|
||||
}),
|
||||
this.configuration.of(this.settings()),
|
||||
];
|
||||
this.state = EditorState.create({ extensions: this.extensions });
|
||||
}
|
||||
|
||||
private settings(): Extension[] {
|
||||
return [EditorState.readOnly.of(this.readOnly), EditorView.editable.of(!this.readOnly),
|
||||
this.numbers ? lineNumbers() : EditorView.lineWrapping];
|
||||
}
|
||||
|
||||
configure(readOnly: boolean, numbers: boolean): void {
|
||||
if (readOnly === this.readOnly && numbers === this.numbers) return;
|
||||
this.readOnly = readOnly;
|
||||
this.numbers = numbers;
|
||||
this.dispatch({ effects: this.configuration.reconfigure(this.settings()) });
|
||||
}
|
||||
|
||||
attach(parent: HTMLElement): () => void {
|
||||
const view = new EditorView({
|
||||
parent, state: this.state,
|
||||
dispatchTransactions: (transactions, current) => {
|
||||
current.update(transactions);
|
||||
this.state = current.state;
|
||||
for (const transaction of transactions) this.changed(transaction);
|
||||
},
|
||||
});
|
||||
this.view = view;
|
||||
return () => {
|
||||
if (this.view === view) this.view = null;
|
||||
view.destroy();
|
||||
};
|
||||
}
|
||||
|
||||
private changed(transaction: Transaction): void {
|
||||
if (transaction.docChanged) this.onChange(transaction.changes, !transaction.annotation(representationChange));
|
||||
}
|
||||
|
||||
dispatch(spec: TransactionSpec | Transaction): void {
|
||||
const transaction = spec instanceof Transaction ? spec : this.state.update(spec);
|
||||
if (this.view) this.view.dispatch(transaction);
|
||||
else {
|
||||
this.state = transaction.state;
|
||||
this.changed(transaction);
|
||||
}
|
||||
}
|
||||
|
||||
/** New note/mode conversion: drop undo history, never mark dirty or focus. */
|
||||
load(content: string): void {
|
||||
this.state = EditorState.create({ doc: content, extensions: this.extensions });
|
||||
// A fresh state starts with the original compartment; retain live settings.
|
||||
this.state = this.state.update({ effects: this.configuration.reconfigure(this.settings()) }).state;
|
||||
this.view?.setState(this.state);
|
||||
}
|
||||
|
||||
replace(content: string, from = 0, to = this.state.doc.length, representationOnly = false): void {
|
||||
this.dispatch({ changes: { from, to, insert: content },
|
||||
annotations: representationOnly ? [representationChange.of(true), Transaction.addToHistory.of(false)] : undefined,
|
||||
userEvent: representationOnly ? undefined : 'input' });
|
||||
}
|
||||
|
||||
select(from: number, to = from, scroll = false): void {
|
||||
const length = this.state.doc.length;
|
||||
this.dispatch({ selection: { anchor: Math.min(from, length), head: Math.min(to, length) },
|
||||
effects: scroll ? EditorView.scrollIntoView(Math.min(from, length), { y: 'center' }) : undefined });
|
||||
}
|
||||
|
||||
highlight(match: NoteSearchMatch | null, reveal = false): void {
|
||||
this.dispatch({ effects: activeMatch.of(match),
|
||||
...(match && reveal ? { selection: { anchor: match.from, head: match.to },
|
||||
effects: [activeMatch.of(match), EditorView.scrollIntoView(match.from, { y: 'center' })] } : {}) });
|
||||
}
|
||||
|
||||
focus(): void { this.view?.focus(); }
|
||||
undo(): boolean { return undo({ state: this.state, dispatch: (tr) => this.dispatch(tr) }); }
|
||||
redo(): boolean { return redo({ state: this.state, dispatch: (tr) => this.dispatch(tr) }); }
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
import { getSelectionPair } from '../selectionPairs';
|
||||
|
||||
// Pure source-mode helper: computes the wrapped textarea value and preserved
|
||||
// inner selection so Svelte event handlers stay as glue code.
|
||||
export function wrapTextareaSelection(value: string, start: number, end: number, key: string) {
|
||||
const close = getSelectionPair(key);
|
||||
if (!close || start === end) return null;
|
||||
|
||||
return {
|
||||
value: value.slice(0, start) + key + value.slice(start, end) + close + value.slice(end),
|
||||
selectionStart: start + key.length,
|
||||
selectionEnd: end + key.length,
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
export type HiddenTitleHeading = {
|
||||
headingPrefix: string;
|
||||
title: string;
|
||||
};
|
||||
|
||||
type TitleHeadingResult = {
|
||||
markdown: string;
|
||||
hiddenTitle: HiddenTitleHeading | null;
|
||||
removedRange?: { from: number; to: number };
|
||||
};
|
||||
|
||||
function normalizeTitle(value: string): string {
|
||||
return value.trim().toLowerCase().replace(/[\s\-_\u2014]+/g, ' ');
|
||||
}
|
||||
|
||||
export function stripTitleHeading(
|
||||
markdown: string,
|
||||
title: string | undefined,
|
||||
hideTitle: boolean,
|
||||
): TitleHeadingResult {
|
||||
if (!hideTitle || !title) return { markdown, hiddenTitle: null };
|
||||
|
||||
const lines = markdown.split('\n');
|
||||
let lineStart = 0;
|
||||
for (let i = 0; i < lines.length; i++) {
|
||||
const line = lines[i].trim();
|
||||
if (line === '') {
|
||||
lineStart += lines[i].length + 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
const match = line.match(/^(#{1,6})\s+(.+)$/);
|
||||
if (match && normalizeTitle(match[2]) === normalizeTitle(title)) {
|
||||
const hiddenTitle = { headingPrefix: match[1], title: title.trim() };
|
||||
const count = i + 1 < lines.length && lines[i + 1].trim() === '' ? 2 : 1;
|
||||
const reachesEnd = i + count === lines.length;
|
||||
const removedRange = {
|
||||
from: reachesEnd ? Math.max(0, lineStart - 1) : lineStart,
|
||||
to: reachesEnd ? markdown.length
|
||||
: lineStart + lines[i].length + 1 + (count === 2 ? lines[i + 1].length + 1 : 0),
|
||||
};
|
||||
return {
|
||||
markdown: markdown.slice(0, removedRange.from) + markdown.slice(removedRange.to),
|
||||
hiddenTitle,
|
||||
removedRange,
|
||||
};
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return { markdown, hiddenTitle: null };
|
||||
}
|
||||
|
||||
export function restoreTitleHeading(
|
||||
markdown: string,
|
||||
hiddenTitle: HiddenTitleHeading | null,
|
||||
): string {
|
||||
if (!hiddenTitle) return markdown;
|
||||
return `${hiddenTitle.headingPrefix} ${hiddenTitle.title}\n\n${markdown}`;
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
import type { ToolbarLayout } from '../types';
|
||||
|
||||
export const toolbarLabels = {
|
||||
insert: 'Insert',
|
||||
heading: 'Heading',
|
||||
bold: 'Bold',
|
||||
italic: 'Italic',
|
||||
underline: 'Underline',
|
||||
strike: 'Strikethrough',
|
||||
'text-color': 'Text color',
|
||||
link: 'Link',
|
||||
'bullet-list': 'Bullet list',
|
||||
'ordered-list': 'Numbered list',
|
||||
'task-list': 'Task list',
|
||||
undo: 'Undo',
|
||||
redo: 'Redo',
|
||||
'inline-code': 'Inline code',
|
||||
'code-block': 'Code block',
|
||||
quote: 'Quote',
|
||||
details: 'Collapsible section',
|
||||
callout: 'Callout',
|
||||
table: 'Table',
|
||||
'horizontal-rule': 'Horizontal rule',
|
||||
highlight: 'Highlight',
|
||||
subscript: 'Subscript',
|
||||
superscript: 'Superscript',
|
||||
alignment: 'Text alignment',
|
||||
indent: 'Indent',
|
||||
outdent: 'Outdent',
|
||||
'date-time': 'Date and time',
|
||||
'ai-actions': 'AI actions',
|
||||
} as const;
|
||||
|
||||
export type ToolbarButtonId = keyof typeof toolbarLabels;
|
||||
export type ToolbarArea = 'main' | 'more';
|
||||
export type ResolvedToolbarLayout = Record<ToolbarArea, ToolbarButtonId[]>;
|
||||
|
||||
const desktopGroups: readonly (readonly ToolbarButtonId[])[] = [
|
||||
['insert'], ['heading'], ['bold', 'italic', 'underline', 'strike', 'text-color'],
|
||||
['link'], ['bullet-list', 'ordered-list', 'task-list'], ['undo', 'redo'],
|
||||
['inline-code', 'code-block', 'quote', 'details', 'callout', 'table', 'horizontal-rule'],
|
||||
['highlight', 'subscript', 'superscript'], ['alignment'], ['indent', 'outdent'],
|
||||
];
|
||||
const mobileGroups: readonly (readonly ToolbarButtonId[])[] = [
|
||||
['insert'], ['heading'], ['bold', 'italic', 'underline', 'strike'], ['link'],
|
||||
['bullet-list', 'ordered-list', 'task-list', 'indent', 'outdent'],
|
||||
['highlight'], ['date-time'], ['undo', 'redo'], ['ai-actions'],
|
||||
];
|
||||
|
||||
export function toolbarGroups(mobile: boolean, hasAi: boolean): ToolbarButtonId[][] {
|
||||
return (mobile ? mobileGroups : desktopGroups)
|
||||
.map((group) => group.filter((id) => id !== 'ai-actions' || hasAi))
|
||||
.filter((group) => group.length > 0);
|
||||
}
|
||||
|
||||
export function resolveToolbarLayout(
|
||||
layout: ToolbarLayout | null | undefined, mobile: boolean, hasAi: boolean,
|
||||
): ResolvedToolbarLayout {
|
||||
const available = toolbarGroups(mobile, hasAi).flat();
|
||||
if (mobile || !layout) return { main: available, more: [] };
|
||||
const allowed = new Set<string>(available);
|
||||
const seen = new Set<string>();
|
||||
const take = (ids: readonly string[]) => ids.filter((id): id is ToolbarButtonId => {
|
||||
if (!allowed.has(id) || seen.has(id)) return false;
|
||||
seen.add(id);
|
||||
return true;
|
||||
});
|
||||
const main = take(layout.main);
|
||||
const more = take(layout.more);
|
||||
// Newly added controls stay reachable without changing the user's saved order.
|
||||
main.push(...available.filter((id) => !seen.has(id)));
|
||||
return { main, more };
|
||||
}
|
||||
|
||||
export function groupToolbarButtons(ids: readonly ToolbarButtonId[], mobile: boolean): ToolbarButtonId[][] {
|
||||
const defaults = mobile ? mobileGroups : desktopGroups;
|
||||
const groups: ToolbarButtonId[][] = [];
|
||||
let previous = -1;
|
||||
for (const id of ids) {
|
||||
const group = defaults.findIndex((items) => items.includes(id));
|
||||
if (group !== previous || groups.length === 0) groups.push([]);
|
||||
groups[groups.length - 1].push(id);
|
||||
previous = group;
|
||||
}
|
||||
return groups;
|
||||
}
|
||||
|
||||
/** Index is an insertion gap in the destination list before removing the dragged item. */
|
||||
export function moveToolbarButton(
|
||||
layout: ResolvedToolbarLayout, id: ToolbarButtonId, area: ToolbarArea, index: number,
|
||||
): ResolvedToolbarLayout {
|
||||
const from = layout.main.includes(id) ? 'main' : 'more';
|
||||
const oldIndex = layout[from].indexOf(id);
|
||||
if (oldIndex < 0) return layout;
|
||||
const gap = Math.max(0, Math.min(index, layout[area].length));
|
||||
const target = gap - (from === area && oldIndex < gap ? 1 : 0);
|
||||
if (from === area && target === oldIndex) return layout;
|
||||
const next = { main: layout.main.filter((item) => item !== id), more: layout.more.filter((item) => item !== id) };
|
||||
next[area].splice(target, 0, id);
|
||||
return next;
|
||||
}
|
||||
|
||||
export function toolbarLayoutPreference(layout: ResolvedToolbarLayout): ToolbarLayout | null {
|
||||
const defaults = desktopGroups.flat();
|
||||
return layout.more.length === 0 && layout.main.length === defaults.length
|
||||
&& layout.main.every((id, index) => id === defaults[index]) ? null : layout;
|
||||
}
|
||||
+64
-26
@@ -11,6 +11,7 @@ import type {
|
||||
VaultState,
|
||||
ViewMode,
|
||||
SortMode,
|
||||
TagStyle,
|
||||
} from "$lib/types";
|
||||
|
||||
// App state
|
||||
@@ -47,6 +48,7 @@ export const showSettings = writable(false);
|
||||
export const settingsTab = writable<string | null>(null);
|
||||
export const showInfo = writable(false);
|
||||
export const notebookIcons = writable<Record<string, string>>({});
|
||||
export const tagStyles = writable<Record<string, TagStyle>>({});
|
||||
export const quickAccessPaths = writable<string[]>([]);
|
||||
export const collapsedNotebooks = writable<string[]>([]);
|
||||
|
||||
@@ -190,13 +192,33 @@ function createNavHistory() {
|
||||
const store = writable<NavHistoryState>({ stack: [], index: -1, skipping: false });
|
||||
return {
|
||||
subscribe: store.subscribe,
|
||||
clear() {
|
||||
store.set({ stack: [], index: -1, skipping: false });
|
||||
},
|
||||
push(path: string) {
|
||||
store.update(s => {
|
||||
if (s.skipping) return { ...s, skipping: false };
|
||||
if (s.stack[s.index] === path) return s;
|
||||
const trimmed = s.stack.slice(0, s.index + 1);
|
||||
return { stack: [...trimmed, path], index: trimmed.length, skipping: false };
|
||||
});
|
||||
},
|
||||
remap(oldPrefix: string, newPrefix: string) {
|
||||
const oldRoot = oldPrefix.replace(/\\/g, '/').replace(/\/+$/, '');
|
||||
const newRoot = newPrefix.replace(/[\\/]+$/, '');
|
||||
const insensitive = /^[A-Za-z]:\//.test(oldRoot) || oldRoot.startsWith('//');
|
||||
const matchRoot = insensitive ? oldRoot.toLowerCase() : oldRoot;
|
||||
store.update(s => ({
|
||||
...s,
|
||||
stack: s.stack.map(path => {
|
||||
const normalized = path.replace(/\\/g, '/');
|
||||
const candidate = insensitive ? normalized.toLowerCase() : normalized;
|
||||
return candidate === matchRoot || candidate.startsWith(`${matchRoot}/`)
|
||||
? newRoot + path.slice(oldRoot.length)
|
||||
: path;
|
||||
}),
|
||||
}));
|
||||
},
|
||||
go(direction: -1 | 1): string | null {
|
||||
let target: string | null = null;
|
||||
store.update(s => {
|
||||
@@ -213,6 +235,34 @@ export const navHistory = createNavHistory();
|
||||
export const canGoBack = derived(navHistory, $h => $h.index > 0);
|
||||
export const canGoForward = derived(navHistory, $h => $h.index < $h.stack.length - 1);
|
||||
|
||||
let dataVaultPath: string | null = null;
|
||||
|
||||
/** Never expose the previous vault's editable note while a new vault loads. */
|
||||
export function activateVaultData(vaultPath: string | null): void {
|
||||
if (dataVaultPath === vaultPath) return;
|
||||
dataVaultPath = vaultPath;
|
||||
activeNote.set(null);
|
||||
activeNotePath.set(null);
|
||||
activeNotebook.set(null);
|
||||
activeTag.set(null);
|
||||
viewerNote.set(null);
|
||||
editorDirty.set(false);
|
||||
notes.set([]);
|
||||
notebooks.set([]);
|
||||
tags.set([]);
|
||||
rootNoteCount.set(0);
|
||||
quickAccessPaths.set([]);
|
||||
notebookIcons.set({});
|
||||
tagStyles.set({});
|
||||
collapsedNotebooks.set([]);
|
||||
notebookOrder.set({});
|
||||
noteOrder.set({});
|
||||
viewMode.set("all");
|
||||
sortMode.set("modified");
|
||||
groupNotesByDate.set(false);
|
||||
navHistory.clear();
|
||||
}
|
||||
|
||||
// Derived
|
||||
export const sortedNotes = derived(
|
||||
[notes, sortMode, viewMode, noteOrder],
|
||||
@@ -224,35 +274,23 @@ export const sortedNotes = derived(
|
||||
|
||||
const pinned = $notes.filter((n) => n.meta.pinned);
|
||||
const unpinned = $notes.filter((n) => !n.meta.pinned);
|
||||
const dateField = $sortMode === "title" || ($sortMode === "custom" && customSortable)
|
||||
? null
|
||||
: $sortMode === "created" ? "created" : "modified";
|
||||
const timestamps = dateField ? new Map<NoteEntry, number>() : null;
|
||||
if (dateField && timestamps) {
|
||||
for (const note of $notes) timestamps.set(note, Date.parse(note.meta[dateField]));
|
||||
}
|
||||
|
||||
const sortFn = (a: NoteEntry, b: NoteEntry) => {
|
||||
switch ($sortMode) {
|
||||
case "custom": {
|
||||
if (!customSortable) {
|
||||
return (
|
||||
new Date(b.meta.modified).getTime() -
|
||||
new Date(a.meta.modified).getTime()
|
||||
);
|
||||
}
|
||||
const oa = $noteOrder[a.path] ?? Number.MAX_SAFE_INTEGER;
|
||||
const ob = $noteOrder[b.path] ?? Number.MAX_SAFE_INTEGER;
|
||||
if (oa !== ob) return oa - ob;
|
||||
return a.meta.title.localeCompare(b.meta.title);
|
||||
}
|
||||
case "title":
|
||||
return compareNaturalNames(a.meta.title, b.meta.title);
|
||||
case "created":
|
||||
return (
|
||||
new Date(b.meta.created).getTime() -
|
||||
new Date(a.meta.created).getTime()
|
||||
);
|
||||
case "modified":
|
||||
default:
|
||||
return (
|
||||
new Date(b.meta.modified).getTime() -
|
||||
new Date(a.meta.modified).getTime()
|
||||
);
|
||||
if (timestamps) return timestamps.get(b)! - timestamps.get(a)!;
|
||||
if ($sortMode === "custom") {
|
||||
const oa = $noteOrder[a.path] ?? Number.MAX_SAFE_INTEGER;
|
||||
const ob = $noteOrder[b.path] ?? Number.MAX_SAFE_INTEGER;
|
||||
if (oa !== ob) return oa - ob;
|
||||
return a.meta.title.localeCompare(b.meta.title);
|
||||
}
|
||||
return compareNaturalNames(a.meta.title, b.meta.title);
|
||||
};
|
||||
|
||||
return [...pinned.sort(sortFn), ...unpinned.sort(sortFn)];
|
||||
|
||||
+47
-1
@@ -34,6 +34,16 @@ export interface NotebookEntry {
|
||||
note_count: number;
|
||||
}
|
||||
|
||||
export interface TagStyle {
|
||||
icon?: string | null;
|
||||
color?: string | null;
|
||||
}
|
||||
|
||||
export type TagStyleChange =
|
||||
| { kind: "icon"; value: string | null }
|
||||
| { kind: "color"; value: string | null }
|
||||
| { kind: "reset" };
|
||||
|
||||
export interface NoteContent {
|
||||
path: string;
|
||||
meta: NoteMeta;
|
||||
@@ -54,6 +64,12 @@ export interface VaultConfig {
|
||||
sync_on_change?: boolean;
|
||||
sync_interval_minutes?: number;
|
||||
last_sync_time?: string | null;
|
||||
last_backup_time?: string | null;
|
||||
}
|
||||
|
||||
export interface PendingOpenFile {
|
||||
id: number;
|
||||
path: string;
|
||||
}
|
||||
|
||||
export interface ExternalVaultResult {
|
||||
@@ -83,6 +99,11 @@ export interface CustomTheme {
|
||||
|
||||
export type StartupView = "all" | "quickaccess" | "tasks" | "daily";
|
||||
|
||||
export interface ToolbarLayout {
|
||||
main: string[];
|
||||
more: string[];
|
||||
}
|
||||
|
||||
export interface AppConfig {
|
||||
vaults: VaultConfig[];
|
||||
active_vault: string | null;
|
||||
@@ -93,6 +114,7 @@ export interface AppConfig {
|
||||
accent_color: string | null;
|
||||
font_size: number | null;
|
||||
scroll_to_change_font_size: boolean;
|
||||
toolbar_layout: ToolbarLayout | null;
|
||||
font_family: string | null;
|
||||
line_height: number | null;
|
||||
ui_scale: number | null;
|
||||
@@ -120,7 +142,6 @@ export interface AppConfig {
|
||||
backup_frequency: string;
|
||||
backup_max_count: number;
|
||||
backup_location: string | null;
|
||||
last_backup_time: string | null;
|
||||
backup_include_attachments: boolean;
|
||||
max_versions_per_note: number;
|
||||
ai_provider: string | null;
|
||||
@@ -172,16 +193,40 @@ export interface VaultState {
|
||||
tasks_sort?: string;
|
||||
}
|
||||
|
||||
export interface SearchMatch {
|
||||
start: number;
|
||||
end: number;
|
||||
}
|
||||
|
||||
export interface SearchTarget {
|
||||
field: 'body' | 'title' | 'tags';
|
||||
start: number;
|
||||
end: number;
|
||||
text: string;
|
||||
before: string;
|
||||
after: string;
|
||||
}
|
||||
|
||||
export interface SearchResult {
|
||||
path: string;
|
||||
title: string;
|
||||
snippet: string;
|
||||
score: number;
|
||||
title_matches: SearchMatch[];
|
||||
snippet_matches: SearchMatch[];
|
||||
match_target: SearchTarget | null;
|
||||
}
|
||||
|
||||
export interface SearchPage {
|
||||
results: SearchResult[];
|
||||
total: number;
|
||||
}
|
||||
|
||||
export interface FileEvent {
|
||||
vault_path: string;
|
||||
event_type: string;
|
||||
path: string;
|
||||
note?: NoteEntry | null;
|
||||
}
|
||||
|
||||
export interface ImportResult {
|
||||
@@ -213,6 +258,7 @@ export interface VersionEntry {
|
||||
}
|
||||
|
||||
export interface AiStreamEvent {
|
||||
request_id: string;
|
||||
event_type: string;
|
||||
text: string | null;
|
||||
error: string | null;
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { AppearanceMutations } from './appearance-mutations.ts';
|
||||
|
||||
const deferred = () => {
|
||||
let resolve;
|
||||
const promise = new Promise(done => { resolve = done; });
|
||||
return { promise, resolve };
|
||||
};
|
||||
|
||||
test('appearance reads started before or during a write cannot restore an old snapshot', async () => {
|
||||
const changes = new AppearanceMutations();
|
||||
const before = changes.snapshot('A');
|
||||
const gate = deferred();
|
||||
const write = changes.run('A', 'notebook', () => true, () => gate.promise, () => {});
|
||||
const during = changes.snapshot('A');
|
||||
assert.equal(changes.acceptsSnapshot('A', before), false);
|
||||
assert.equal(changes.acceptsSnapshot('A', during), false);
|
||||
assert.equal(changes.acceptsSnapshot('B', changes.snapshot('B')), true);
|
||||
gate.resolve();
|
||||
await write;
|
||||
assert.equal(changes.acceptsSnapshot('A', before), false);
|
||||
assert.equal(changes.acceptsSnapshot('A', during), false);
|
||||
assert.equal(changes.acceptsSnapshot('A', changes.snapshot('A')), true);
|
||||
});
|
||||
|
||||
test('an upload and later field patch commit in order without losing either field', async () => {
|
||||
const changes = new AppearanceMutations();
|
||||
const gate = deferred();
|
||||
let persisted = { color: '#abcdef' };
|
||||
let visible;
|
||||
const upload = changes.run('A', 'work', () => true, async () => {
|
||||
const original = persisted;
|
||||
await gate.promise;
|
||||
persisted = { ...original, icon: 'uploaded.svg' };
|
||||
return persisted;
|
||||
}, next => { visible = next; });
|
||||
const color = changes.run('A', 'work', () => true, async () => {
|
||||
persisted = { ...persisted, color: '#123456' };
|
||||
return persisted;
|
||||
}, next => { visible = next; });
|
||||
gate.resolve();
|
||||
await Promise.all([upload, color]);
|
||||
assert.deepEqual(persisted, { icon: 'uploaded.svg', color: '#123456' });
|
||||
assert.deepEqual(visible, persisted);
|
||||
});
|
||||
|
||||
test('a superseded queued choice cannot write over the newer choice', async () => {
|
||||
const changes = new AppearanceMutations();
|
||||
const gate = deferred();
|
||||
const blocker = changes.run('A', 'work', () => true, () => gate.promise, () => {});
|
||||
const oldChoice = changes.choose('A', 'work:icon');
|
||||
let persisted = 'original';
|
||||
const old = changes.run('A', 'work', oldChoice, async () => { persisted = 'old'; }, () => {});
|
||||
const latest = changes.choose('A', 'work:icon');
|
||||
const next = changes.run('A', 'work', latest, async () => { persisted = 'new'; }, () => {});
|
||||
gate.resolve();
|
||||
await Promise.all([blocker, old, next]);
|
||||
assert.equal(persisted, 'new');
|
||||
assert.equal(oldChoice(), false);
|
||||
assert.equal(latest(), true);
|
||||
});
|
||||
|
||||
test('a failed later choice does not hide the successful earlier commit or poison the queue', async () => {
|
||||
const changes = new AppearanceMutations();
|
||||
let visible = 'original';
|
||||
const first = changes.run('A', 'work', () => true, async () => 'uploaded.svg', value => { visible = value; });
|
||||
const failed = changes.run('A', 'work', () => true, async () => { throw new Error('disk full'); }, value => { visible = value; });
|
||||
await first;
|
||||
await assert.rejects(failed, /disk full/);
|
||||
assert.equal(visible, 'uploaded.svg');
|
||||
await changes.run('A', 'work', () => true, async () => 'builtin:star', value => { visible = value; });
|
||||
assert.equal(visible, 'builtin:star');
|
||||
assert.equal(changes.acceptsSnapshot('A', changes.snapshot('A')), true);
|
||||
});
|
||||
|
||||
test('different vaults do not share choice cancellation or a write queue', async () => {
|
||||
const changes = new AppearanceMutations();
|
||||
const aChoice = changes.choose('A', 'work');
|
||||
changes.choose('B', 'work');
|
||||
const gate = deferred();
|
||||
const a = changes.run('A', 'work', aChoice, () => gate.promise, () => {});
|
||||
let bSaved = false;
|
||||
await changes.run('B', 'work', () => true, async () => { bSaved = true; }, () => {});
|
||||
assert.equal(aChoice(), true);
|
||||
assert.equal(bSaved, true);
|
||||
gate.resolve();
|
||||
await a;
|
||||
});
|
||||
@@ -0,0 +1,67 @@
|
||||
interface VaultChanges {
|
||||
revision: number;
|
||||
pending: number;
|
||||
choices: Map<string, number>;
|
||||
tails: Map<string, Promise<void>>;
|
||||
}
|
||||
|
||||
/** Keep old refresh snapshots and late choices from replacing committed appearances. */
|
||||
export class AppearanceMutations {
|
||||
private vaults = new Map<string, VaultChanges>();
|
||||
|
||||
private state(vault: string): VaultChanges {
|
||||
let state = this.vaults.get(vault);
|
||||
if (!state) {
|
||||
state = { revision: 0, pending: 0, choices: new Map(), tails: new Map() };
|
||||
this.vaults.set(vault, state);
|
||||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
snapshot(vault: string): number {
|
||||
return this.state(vault).revision;
|
||||
}
|
||||
|
||||
acceptsSnapshot(vault: string, revision: number): boolean {
|
||||
const state = this.state(vault);
|
||||
return state.pending === 0 && state.revision === revision;
|
||||
}
|
||||
|
||||
choose(vault: string, key: string): () => boolean {
|
||||
const choices = this.state(vault).choices;
|
||||
const choice = (choices.get(key) ?? 0) + 1;
|
||||
choices.set(key, choice);
|
||||
return () => choices.get(key) === choice;
|
||||
}
|
||||
|
||||
async run<T>(
|
||||
vault: string,
|
||||
key: string,
|
||||
canRun: () => boolean,
|
||||
operation: () => Promise<T>,
|
||||
publish: (result: T) => void,
|
||||
): Promise<void> {
|
||||
const state = this.state(vault);
|
||||
state.revision++;
|
||||
state.pending++;
|
||||
const previous = state.tails.get(key) ?? Promise.resolve();
|
||||
const work = previous.catch(() => {}).then(async () => {
|
||||
if (!canRun()) return;
|
||||
const result = await operation();
|
||||
// Publish committed state in queue order, including when a later choice
|
||||
// fails or a later file dialog is cancelled.
|
||||
publish(result);
|
||||
});
|
||||
state.tails.set(key, work);
|
||||
try {
|
||||
await work;
|
||||
} finally {
|
||||
state.pending--;
|
||||
state.revision++;
|
||||
if (state.tails.get(key) === work) state.tails.delete(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export const notebookAppearance = new AppearanceMutations();
|
||||
export const tagAppearance = new AppearanceMutations();
|
||||
@@ -0,0 +1,110 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { applyGraphRepulsion } from './graph-layout.ts';
|
||||
|
||||
const node = (x, y) => ({ x, y, vx: 0, vy: 0 });
|
||||
function run(nodes) {
|
||||
for (const _ of applyGraphRepulsion(nodes)) { /* finish one physics step */ }
|
||||
}
|
||||
|
||||
// Independent pairwise reference: an optimization must not change the force law.
|
||||
function reference(nodes) {
|
||||
return nodes.map((a, index) => {
|
||||
let vx = a.vx, vy = a.vy;
|
||||
for (let other = 0; other < nodes.length; other++) {
|
||||
if (index === other) continue;
|
||||
const dx = a.x - nodes[other].x;
|
||||
const dy = a.y - nodes[other].y;
|
||||
const squared = dx * dx + dy * dy;
|
||||
if (squared > 600 * 600 || squared === 0) continue;
|
||||
const scale = 1500 / (squared * Math.sqrt(squared));
|
||||
vx += dx * scale;
|
||||
vy += dy * scale;
|
||||
}
|
||||
return { ...a, vx, vy };
|
||||
});
|
||||
}
|
||||
|
||||
function assertForce(actual, expected) {
|
||||
for (let i = 0; i < actual.length; i++) {
|
||||
assert.equal(actual[i].x, expected[i].x, 'repulsion must not move a node mid-step');
|
||||
assert.equal(actual[i].y, expected[i].y);
|
||||
for (const axis of ['vx', 'vy']) {
|
||||
const tolerance = 1e-10 * Math.max(1, Math.abs(expected[i][axis]));
|
||||
assert.ok(Math.abs(actual[i][axis] - expected[i][axis]) <= tolerance,
|
||||
`node ${i} ${axis}: ${actual[i][axis]} != ${expected[i][axis]}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
test('repulsion preserves nearby forces across negative coordinates and cell boundaries', () => {
|
||||
const nodes = [
|
||||
node(-601, -601), node(-599, -599), node(-1, -1), node(1, 1),
|
||||
node(599, 599), node(601, 601), node(-599, 599), node(599, -599),
|
||||
node(1800, 1800), node(10000, -10000),
|
||||
];
|
||||
nodes[0].vx = 3;
|
||||
nodes[2].vy = -2;
|
||||
const expected = reference(nodes);
|
||||
run(nodes);
|
||||
assertForce(nodes, expected);
|
||||
});
|
||||
|
||||
test('the exact 600-unit cutoff is included, but farther nodes have no effect', () => {
|
||||
for (const offset of [[600, 0], [360, 480], [-600, 0], [0, -600]]) {
|
||||
const nodes = [node(-10, -20), node(-10 + offset[0], -20 + offset[1])];
|
||||
const expected = reference(nodes);
|
||||
run(nodes);
|
||||
assertForce(nodes, expected);
|
||||
assert.ok(Math.hypot(nodes[0].vx, nodes[0].vy) > 0);
|
||||
}
|
||||
const distant = [node(0, 0), node(600.001, 0)];
|
||||
run(distant);
|
||||
assert.deepEqual(distant, [node(0, 0), node(600.001, 0)]);
|
||||
});
|
||||
|
||||
test('dense and coincident nodes remain finite and preserve equal-and-opposite forces', () => {
|
||||
const nodes = Array.from({ length: 120 }, (_, i) => node((i % 12) * 17 - 100, Math.floor(i / 12) * 19 - 90));
|
||||
nodes.push(node(nodes[0].x, nodes[0].y));
|
||||
const expected = reference(nodes);
|
||||
run(nodes);
|
||||
assertForce(nodes, expected);
|
||||
assert.ok(Math.abs(nodes.reduce((sum, n) => sum + n.vx, 0)) < 1e-9);
|
||||
assert.ok(Math.abs(nodes.reduce((sum, n) => sum + n.vy, 0)) < 1e-9);
|
||||
});
|
||||
|
||||
test('moving across cells between steps updates which nodes interact', () => {
|
||||
const nodes = [node(0, 0), node(1800, 0), node(1810, 10)];
|
||||
run(nodes);
|
||||
assert.equal(nodes[0].vx, 0);
|
||||
nodes[1].x = 300;
|
||||
nodes[2].x = 310;
|
||||
const expected = reference(nodes);
|
||||
run(nodes);
|
||||
assertForce(nodes, expected);
|
||||
assert.ok(nodes[0].vx < 0);
|
||||
});
|
||||
|
||||
test('sparse graphs do not read coordinates for every distant pair', () => {
|
||||
let coordinateReads = 0;
|
||||
const nodes = Array.from({ length: 1200 }, (_, i) => {
|
||||
const x = Math.floor(i / 3) * 1800 + (i % 3) * 20;
|
||||
return {
|
||||
get x() { coordinateReads++; return x; },
|
||||
get y() { coordinateReads++; return 0; },
|
||||
vx: 0, vy: 0,
|
||||
};
|
||||
});
|
||||
run(nodes);
|
||||
// A generous work bound, independent of wall-clock speed or exact bucket implementation.
|
||||
assert.ok(coordinateReads < nodes.length * 64,
|
||||
`distant-pair work grew quadratically: ${coordinateReads} coordinate reads`);
|
||||
assert.ok(nodes[0].vx < 0 && nodes[2].vx > 0, 'nearby triples must still repel');
|
||||
});
|
||||
|
||||
test('empty and singleton graphs leave velocities unchanged', () => {
|
||||
run([]);
|
||||
const singleton = [{ x: 5, y: -8, vx: 2, vy: -3 }];
|
||||
run(singleton);
|
||||
assert.deepEqual(singleton, [{ x: 5, y: -8, vx: 2, vy: -3 }]);
|
||||
});
|
||||
@@ -0,0 +1,50 @@
|
||||
export interface RepulsionNode {
|
||||
x: number;
|
||||
y: number;
|
||||
vx: number;
|
||||
vy: number;
|
||||
}
|
||||
|
||||
/** Update velocities without moving nodes; yield between rows for cooperative layout. */
|
||||
export function* applyGraphRepulsion(nodes: readonly RepulsionNode[]): Generator<void> {
|
||||
// The force already has a 600-unit cutoff. Only the same cell and its
|
||||
// eight neighbours can contain nodes inside that radius.
|
||||
const cellSize = 600;
|
||||
const columns = new Map<number, Map<number, number[]>>();
|
||||
for (let i = 0; i < nodes.length; i++) {
|
||||
const x = Math.floor(nodes[i].x / cellSize);
|
||||
const y = Math.floor(nodes[i].y / cellSize);
|
||||
let column = columns.get(x);
|
||||
if (!column) columns.set(x, column = new Map());
|
||||
let bucket = column.get(y);
|
||||
if (!bucket) column.set(y, bucket = []);
|
||||
bucket.push(i);
|
||||
}
|
||||
|
||||
for (let i = 0; i < nodes.length; i++) {
|
||||
const a = nodes[i];
|
||||
const ax = a.x, ay = a.y;
|
||||
const cellX = Math.floor(ax / cellSize), cellY = Math.floor(ay / cellSize);
|
||||
for (let offsetX = -1; offsetX <= 1; offsetX++) {
|
||||
const column = columns.get(cellX + offsetX);
|
||||
if (!column) continue;
|
||||
for (let offsetY = -1; offsetY <= 1; offsetY++) {
|
||||
const bucket = column.get(cellY + offsetY);
|
||||
if (!bucket) continue;
|
||||
for (const j of bucket) {
|
||||
if (j <= i) continue;
|
||||
const b = nodes[j];
|
||||
const dx = b.x - ax, dy = b.y - ay;
|
||||
const distSq = dx * dx + dy * dy;
|
||||
if (distSq > cellSize * cellSize) continue;
|
||||
const d = distSq || 1;
|
||||
const force = 1500 / d;
|
||||
const dist = Math.sqrt(d);
|
||||
const fx = (dx / dist) * force, fy = (dy / dist) * force;
|
||||
a.vx -= fx; a.vy -= fy; b.vx += fx; b.vy += fy;
|
||||
}
|
||||
}
|
||||
}
|
||||
yield;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { isCurrentVaultEvent, updateNoteList, sameNoteTags } from './note-list-updates.ts';
|
||||
|
||||
const note = {
|
||||
path: '/vault/Work/Plan.md', relative_path: 'Work/Plan.md', preview: 'Before',
|
||||
meta: { id: 'plan', title: 'Plan', tags: ['work'], pinned: false, created: '2026-01-01', modified: '2026-01-02' },
|
||||
};
|
||||
|
||||
test('a body save updates preview and modification date without changing unrelated notes', () => {
|
||||
const other = { ...note, path: '/vault/Other.md', relative_path: 'Other.md' };
|
||||
const changed = { ...note, preview: 'After', meta: { ...note.meta, modified: '2026-01-03' } };
|
||||
const result = updateNoteList([note, other], changed, 'all', []);
|
||||
assert.deepEqual(result, [changed, other]);
|
||||
assert.equal(result[1], other);
|
||||
assert.equal(sameNoteTags(note, changed), true);
|
||||
});
|
||||
|
||||
test('tag edits remove and insert notes in the appropriate cached views', () => {
|
||||
const changed = { ...note, meta: { ...note.meta, tags: ['personal'] } };
|
||||
assert.deepEqual(updateNoteList([note], changed, 'tag:work', []), []);
|
||||
assert.deepEqual(updateNoteList([], changed, 'tag:personal', []), [changed]);
|
||||
assert.equal(sameNoteTags(note, changed), false);
|
||||
});
|
||||
|
||||
test('notebook views contain direct children only, with native path separators', () => {
|
||||
const windows = { ...note, path: 'C:\\vault\\Work\\Plan.md', relative_path: 'Work\\Plan.md' };
|
||||
assert.deepEqual(updateNoteList([], windows, 'nb:C:/vault/Work', []), [windows]);
|
||||
assert.deepEqual(updateNoteList([], windows, 'nb:C:/vault', []), []);
|
||||
assert.deepEqual(updateNoteList([], windows, 'nb:C:/vault/Workshop', []), []);
|
||||
});
|
||||
|
||||
test('daily, quick access and trash views keep their membership constraints', () => {
|
||||
const daily = { ...note, path: '/vault/Daily/2026-01-03.md', relative_path: 'Daily/2026-01-03.md' };
|
||||
assert.deepEqual(updateNoteList([], daily, 'daily', []), [daily]);
|
||||
assert.deepEqual(updateNoteList([], note, 'daily', []), []);
|
||||
assert.deepEqual(updateNoteList([], note, 'quickaccess', ['Work\\Plan.md']), [note]);
|
||||
assert.deepEqual(updateNoteList([note], note, 'quickaccess', []), []);
|
||||
assert.deepEqual(updateNoteList([], note, 'trash', []), []);
|
||||
});
|
||||
|
||||
test('duplicate watcher notifications leave an already current list unchanged', () => {
|
||||
const list = [note];
|
||||
assert.equal(updateNoteList(list, structuredClone(note), 'all', []), list);
|
||||
});
|
||||
|
||||
test('delayed events cannot cross vaults, including nested vaults sharing note paths', () => {
|
||||
const event = { vault_path: '/vault', event_type: 'modify', path: '/vault/nested/Note.md', note };
|
||||
assert.equal(isCurrentVaultEvent(event, '/vault'), true);
|
||||
assert.equal(isCurrentVaultEvent(event, '/other'), false);
|
||||
assert.equal(isCurrentVaultEvent(event, '/vault/nested'), false);
|
||||
assert.equal(isCurrentVaultEvent({ ...event, vault_path: '/vault/nested' }, '/vault'), false);
|
||||
assert.equal(isCurrentVaultEvent(event, null), false);
|
||||
const unscoped = JSON.parse('{"event_type":"modify","path":"/vault/nested/Note.md"}');
|
||||
assert.equal(isCurrentVaultEvent(unscoped, '/vault'), false);
|
||||
});
|
||||
|
||||
test('vault event identity handles native Windows separators and trailing slashes', () => {
|
||||
const event = { vault_path: 'C:\\Notes\\Vault\\', event_type: 'remove', path: 'C:\\Notes\\Vault\\Old.md' };
|
||||
assert.equal(isCurrentVaultEvent(event, 'C:/Notes/Vault'), true);
|
||||
assert.equal(isCurrentVaultEvent(event, 'C:/Notes/Vault-copy'), false);
|
||||
});
|
||||
@@ -0,0 +1,43 @@
|
||||
import type { FileEvent, NoteEntry } from '../types';
|
||||
|
||||
const normalize = (path: string) => path.replace(/\\/g, '/');
|
||||
|
||||
/** A delayed watcher/sync batch must not update a different (even nested) vault. */
|
||||
export function isCurrentVaultEvent(event: FileEvent, vaultPath: string | null): boolean {
|
||||
if (!vaultPath || typeof event.vault_path !== 'string') return false;
|
||||
return normalize(event.vault_path).replace(/\/+$/, '') === normalize(vaultPath).replace(/\/+$/, '');
|
||||
}
|
||||
|
||||
export function sameNoteTags(left: NoteEntry, right: NoteEntry): boolean {
|
||||
return left.meta.tags.length === right.meta.tags.length &&
|
||||
left.meta.tags.every((tag) => right.meta.tags.includes(tag));
|
||||
}
|
||||
|
||||
function belongsToList(note: NoteEntry, key: string, quickAccess: string[]): boolean {
|
||||
if (key.startsWith('tag:')) return note.meta.tags.includes(key.slice(4));
|
||||
if (key.startsWith('nb:')) {
|
||||
const path = normalize(note.path);
|
||||
return path.slice(0, path.lastIndexOf('/')) === normalize(key.slice(3));
|
||||
}
|
||||
if (key === 'daily') return /^Daily\/[^/]+$/.test(normalize(note.relative_path));
|
||||
if (key === 'quickaccess') return quickAccess.some((path) => normalize(path) === normalize(note.relative_path));
|
||||
return key === 'all';
|
||||
}
|
||||
|
||||
/** Patch one note without rescanning the vault, including changes to tag membership. */
|
||||
export function updateNoteList(list: NoteEntry[], note: NoteEntry, key: string, quickAccess: string[]): NoteEntry[] {
|
||||
if (key === 'trash') return list;
|
||||
const index = list.findIndex((entry) => normalize(entry.path) === normalize(note.path));
|
||||
if (!belongsToList(note, key, quickAccess)) {
|
||||
return index < 0 ? list : list.filter((_, i) => i !== index);
|
||||
}
|
||||
if (index < 0) return [...list, note];
|
||||
const previous = list[index];
|
||||
if (previous.preview === note.preview && previous.relative_path === note.relative_path &&
|
||||
previous.meta.id === note.meta.id && previous.meta.title === note.meta.title &&
|
||||
previous.meta.pinned === note.meta.pinned && previous.meta.created === note.meta.created &&
|
||||
previous.meta.modified === note.meta.modified && sameNoteTags(previous, note)) return list;
|
||||
const updated = list.slice();
|
||||
updated[index] = note;
|
||||
return updated;
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { buildNoteListRows, noteListOffsets, noteListWindow, noteListRevealScrollTop } from './note-list-window.ts';
|
||||
|
||||
const today = new Date(2026, 8, 26, 12);
|
||||
function note(index, daysAgo = 0, pinned = false) {
|
||||
const date = new Date(2026, 8, 26 - daysAgo, 12).toISOString();
|
||||
return {
|
||||
path: `/vault/${index}.md`, relative_path: `${index}.md`, preview: 'Preview',
|
||||
meta: { id: String(index), title: `Note ${index}`, pinned, tags: [], created: date, modified: date },
|
||||
};
|
||||
}
|
||||
|
||||
test('grouped rows retain pinned/date sections and original note indexes', () => {
|
||||
const notes = [note(0, 60, true), note(1), note(2, 1), note(3, 1)];
|
||||
const rows = buildNoteListRows(notes, 'modified', today);
|
||||
assert.deepEqual(rows.filter(row => row.kind === 'section').map(row => row.label), ['Pinned', 'Today', 'Yesterday']);
|
||||
assert.deepEqual(rows.filter(row => row.kind === 'note').map(row => [row.note.path, row.noteIndex]),
|
||||
notes.map((entry, index) => [entry.path, index]));
|
||||
assert.equal(new Set(rows.map(row => row.key)).size, rows.length);
|
||||
});
|
||||
|
||||
test('measured heights select the correct rows across section boundaries', () => {
|
||||
const rows = buildNoteListRows([note(0), note(1), note(2, 1)], 'modified', today);
|
||||
const heights = new Map(rows.map((row, index) => [row.key, [24, 60, 100, 32, 80][index]]));
|
||||
const offsets = noteListOffsets(rows, heights, 62, 32);
|
||||
assert.deepEqual(offsets, [0, 24, 84, 184, 216, 296]);
|
||||
const window = noteListWindow(offsets, 90, 40, 0);
|
||||
assert.deepEqual(rows.slice(window.start, window.end).map(row => row.key), ['note:/vault/1.md']);
|
||||
assert.equal(window.top, 84);
|
||||
assert.equal(window.bottom, 112);
|
||||
const crossing = noteListWindow(offsets, 175, 60, 0);
|
||||
assert.deepEqual(rows.slice(crossing.start, crossing.end).map(row => row.kind), ['note', 'section', 'note']);
|
||||
});
|
||||
|
||||
test('thousands of grouped notes keep a bounded viewport and can reach the final note', () => {
|
||||
const notes = Array.from({ length: 3000 }, (_, index) => note(index));
|
||||
const rows = buildNoteListRows(notes, 'created', today);
|
||||
const offsets = noteListOffsets(rows, new Map(), 62, 32);
|
||||
for (const scrollTop of [0, 60000, offsets.at(-1) - 900]) {
|
||||
const window = noteListWindow(offsets, scrollTop, 900);
|
||||
assert.ok(window.end - window.start <= 38, 'only the viewport and overscan should render');
|
||||
assert.ok(offsets[window.start] <= scrollTop);
|
||||
assert.ok(offsets[window.end] >= scrollTop + 900);
|
||||
assert.equal(window.top + offsets[window.end] - offsets[window.start] + window.bottom, offsets.at(-1));
|
||||
}
|
||||
const last = noteListWindow(offsets, offsets.at(-1) - 900, 900);
|
||||
assert.equal(rows[last.end - 1].note.path, '/vault/2999.md');
|
||||
});
|
||||
|
||||
test('empty lists and a viewport above the note rows have safe padding', () => {
|
||||
assert.deepEqual(noteListWindow([0], 0, 900), { start: 0, end: 0, anchor: 0, top: 0, bottom: 0 });
|
||||
const rows = buildNoteListRows([note(0), note(1)], null, today);
|
||||
const offsets = noteListOffsets(rows, new Map(), 62, 32);
|
||||
const window = noteListWindow(offsets, -250, 900);
|
||||
assert.equal(window.start, 0);
|
||||
assert.equal(window.end, 2);
|
||||
assert.equal(window.top, 0);
|
||||
assert.equal(window.bottom, 0);
|
||||
assert.deepEqual(rows.map(row => row.noteIndex), [0, 1]);
|
||||
});
|
||||
|
||||
test('revealing a distant grouped note puts its row inside the virtual window', () => {
|
||||
const notes = Array.from({ length: 3000 }, (_, index) => note(index, index, index < 3));
|
||||
const rows = buildNoteListRows(notes, 'created', today);
|
||||
const offsets = noteListOffsets(rows, new Map(), 62, 32);
|
||||
const index = rows.findIndex(row => row.kind === 'note' && row.note.path === notes[2550].path);
|
||||
const top = noteListRevealScrollTop(offsets, index, 0, 600);
|
||||
const window = noteListWindow(offsets, top, 600);
|
||||
assert.ok(index >= window.start && index < window.end);
|
||||
assert.ok(offsets[index] >= top);
|
||||
assert.ok(offsets[index + 1] <= top + 600);
|
||||
});
|
||||
|
||||
test('revealing keeps visible notes stationary and accounts for content above the list', () => {
|
||||
const offsets = [0, 30, 90, 150, 210];
|
||||
assert.equal(noteListRevealScrollTop(offsets, 1, 25, 100), 25);
|
||||
assert.equal(noteListRevealScrollTop(offsets, 3, 0, 100), 130);
|
||||
assert.equal(noteListRevealScrollTop(offsets, 2, 0, 100, 180), 250);
|
||||
assert.equal(noteListRevealScrollTop(offsets, 0, 200, 100), 0);
|
||||
});
|
||||
|
||||
test('revealing oversized notes shows their beginning and ignores unavailable rows', () => {
|
||||
assert.equal(noteListRevealScrollTop([0, 200, 260], 0, 100, 80, 20), 20);
|
||||
assert.equal(noteListRevealScrollTop([0], 0, 42, 600), 42);
|
||||
assert.equal(noteListRevealScrollTop([0, 62], -1, 42, 600), 42);
|
||||
assert.equal(noteListRevealScrollTop([0, 62], 1, 42, 600), 42);
|
||||
assert.equal(noteListRevealScrollTop([0, 62], 0, 42, 0), 42);
|
||||
});
|
||||
@@ -0,0 +1,81 @@
|
||||
import type { NoteEntry } from '../types';
|
||||
import { dateBucketLabel } from './time.ts';
|
||||
|
||||
export type NoteListRow =
|
||||
| { kind: 'section'; key: string; label: string }
|
||||
| { kind: 'note'; key: string; note: NoteEntry; noteIndex: number };
|
||||
|
||||
export function buildNoteListRows(
|
||||
notes: NoteEntry[],
|
||||
groupBy: 'created' | 'modified' | null,
|
||||
now = new Date(),
|
||||
): NoteListRow[] {
|
||||
const rows: NoteListRow[] = [];
|
||||
let previousLabel: string | undefined;
|
||||
let section = 0;
|
||||
for (let noteIndex = 0; noteIndex < notes.length; noteIndex++) {
|
||||
const note = notes[noteIndex];
|
||||
if (groupBy) {
|
||||
const label = note.meta.pinned ? 'Pinned' : dateBucketLabel(note.meta[groupBy], now);
|
||||
if (label !== previousLabel) {
|
||||
rows.push({ kind: 'section', key: `section:${section++}:${label}`, label });
|
||||
previousLabel = label;
|
||||
}
|
||||
}
|
||||
rows.push({ kind: 'note', key: `note:${note.path}`, note, noteIndex });
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
|
||||
/** Prefix offsets are rebuilt when rows or measured heights change, not on scroll. */
|
||||
export function noteListOffsets(
|
||||
rows: NoteListRow[],
|
||||
heights: ReadonlyMap<string, number>,
|
||||
noteHeight: number,
|
||||
sectionHeight: number,
|
||||
): number[] {
|
||||
const offsets = new Array<number>(rows.length + 1);
|
||||
offsets[0] = 0;
|
||||
for (let index = 0; index < rows.length; index++) {
|
||||
const row = rows[index];
|
||||
offsets[index + 1] = offsets[index] +
|
||||
(heights.get(row.key) ?? (row.kind === 'note' ? noteHeight : sectionHeight));
|
||||
}
|
||||
return offsets;
|
||||
}
|
||||
|
||||
function rowAt(offsets: number[], position: number): number {
|
||||
let low = 0;
|
||||
let high = offsets.length - 1;
|
||||
while (low < high) {
|
||||
const middle = Math.floor((low + high + 1) / 2);
|
||||
if (offsets[middle] <= position) low = middle;
|
||||
else high = middle - 1;
|
||||
}
|
||||
return Math.min(low, Math.max(0, offsets.length - 2));
|
||||
}
|
||||
|
||||
export function noteListWindow(offsets: number[], scrollTop: number, height: number, overscan = 10) {
|
||||
const count = offsets.length - 1;
|
||||
if (count === 0) return { start: 0, end: 0, anchor: 0, top: 0, bottom: 0 };
|
||||
const anchor = rowAt(offsets, Math.max(0, scrollTop));
|
||||
const start = Math.max(0, anchor - overscan);
|
||||
const end = Math.min(count, rowAt(offsets, Math.max(0, scrollTop + height)) + 1 + overscan);
|
||||
return { start, end, anchor, top: offsets[start], bottom: offsets[count] - offsets[end] };
|
||||
}
|
||||
|
||||
/** Keep visible rows stationary; request a centered offset for off-screen rows. */
|
||||
export function noteListRevealScrollTop(
|
||||
offsets: number[],
|
||||
rowIndex: number,
|
||||
scrollTop: number,
|
||||
height: number,
|
||||
listOrigin = 0,
|
||||
): number {
|
||||
if (rowIndex < 0 || rowIndex + 1 >= offsets.length || height <= 0) return scrollTop;
|
||||
const top = listOrigin + offsets[rowIndex];
|
||||
const bottom = listOrigin + offsets[rowIndex + 1];
|
||||
if (top >= scrollTop && bottom <= scrollTop + height) return scrollTop;
|
||||
// The scrolling element clamps the upper bound, including its bottom padding.
|
||||
return Math.max(0, top - Math.max(0, height - (bottom - top)) / 2);
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { beginNoteNavigation, isCurrentNoteNavigation, cancelNoteNavigation } from './note-navigation.ts';
|
||||
|
||||
function deferred() {
|
||||
let resolve;
|
||||
const promise = new Promise(res => { resolve = res; });
|
||||
return { promise, resolve };
|
||||
}
|
||||
|
||||
function navigationConsumer(initialSelection) {
|
||||
let selected = initialSelection;
|
||||
let ownedToken;
|
||||
return {
|
||||
get selected() { return selected; },
|
||||
async select(path, read) {
|
||||
const token = beginNoteNavigation();
|
||||
ownedToken = token;
|
||||
if (path === selected.path) return;
|
||||
const note = await read;
|
||||
if (isCurrentNoteNavigation(token)) selected = note;
|
||||
},
|
||||
dispose() {
|
||||
if (ownedToken !== undefined) cancelNoteNavigation(ownedToken);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
test('a slower earlier note read cannot replace a newer selection', async () => {
|
||||
const navigation = navigationConsumer({ path: 'initial.md', body: 'initial' });
|
||||
const older = deferred();
|
||||
const newer = deferred();
|
||||
const oldSelection = navigation.select('older.md', older.promise);
|
||||
const newSelection = navigation.select('newer.md', newer.promise);
|
||||
newer.resolve({ path: 'newer.md', body: 'newer note' });
|
||||
await newSelection;
|
||||
older.resolve({ path: 'older.md', body: 'older note' });
|
||||
await oldSelection;
|
||||
assert.deepEqual(navigation.selected, { path: 'newer.md', body: 'newer note' });
|
||||
});
|
||||
|
||||
test('selecting the already-open note cancels a different pending selection', async () => {
|
||||
const currentNote = { path: 'current.md', body: 'current note' };
|
||||
const navigation = navigationConsumer(currentNote);
|
||||
const pending = deferred();
|
||||
const selection = navigation.select('other.md', pending.promise);
|
||||
await navigation.select('current.md');
|
||||
pending.resolve({ path: 'other.md', body: 'other note' });
|
||||
await selection;
|
||||
assert.equal(navigation.selected, currentNote);
|
||||
});
|
||||
|
||||
test('disposing the owner prevents its unfinished read from publishing', async () => {
|
||||
const currentNote = { path: 'current.md', body: 'current note' };
|
||||
const navigation = navigationConsumer(currentNote);
|
||||
const pending = deferred();
|
||||
const selection = navigation.select('other.md', pending.promise);
|
||||
navigation.dispose();
|
||||
pending.resolve({ path: 'other.md', body: 'old vault content' });
|
||||
await selection;
|
||||
assert.equal(navigation.selected, currentNote);
|
||||
});
|
||||
|
||||
test('disposing an older owner does not cancel a replacement owner selection', async () => {
|
||||
const oldNote = { path: 'old-vault/current.md', body: 'old vault' };
|
||||
const oldOwner = navigationConsumer(oldNote);
|
||||
const newOwner = navigationConsumer({ path: 'new-vault/current.md', body: 'new vault' });
|
||||
const oldRead = deferred();
|
||||
const newRead = deferred();
|
||||
const oldSelection = oldOwner.select('old-vault/other.md', oldRead.promise);
|
||||
const newSelection = newOwner.select('new-vault/other.md', newRead.promise);
|
||||
oldOwner.dispose();
|
||||
oldRead.resolve({ path: 'old-vault/other.md', body: 'stale old vault' });
|
||||
newRead.resolve({ path: 'new-vault/other.md', body: 'latest new vault' });
|
||||
await Promise.all([oldSelection, newSelection]);
|
||||
assert.equal(oldOwner.selected, oldNote);
|
||||
assert.deepEqual(newOwner.selected, { path: 'new-vault/other.md', body: 'latest new vault' });
|
||||
});
|
||||
@@ -0,0 +1,15 @@
|
||||
let currentNoteNavigation = 0;
|
||||
|
||||
/** Start an intent before any await, including selections of the already-open note. */
|
||||
export function beginNoteNavigation(): number {
|
||||
return ++currentNoteNavigation;
|
||||
}
|
||||
|
||||
export function isCurrentNoteNavigation(token: number): boolean {
|
||||
return token === currentNoteNavigation;
|
||||
}
|
||||
|
||||
/** A disposed owner may invalidate its own intent, but never a newer owner's intent. */
|
||||
export function cancelNoteNavigation(token: number): void {
|
||||
if (isCurrentNoteNavigation(token)) currentNoteNavigation++;
|
||||
}
|
||||
@@ -125,3 +125,19 @@ export function resolvePathFromFile(filePath: string, targetPath: string): strin
|
||||
|
||||
return prefix + resolved.join('/');
|
||||
}
|
||||
|
||||
/** Lexical ownership for the UI; native code enforces filesystem access. */
|
||||
export function isPathInDirectory(path: string, directory: string | null): boolean {
|
||||
if (!directory) return false;
|
||||
let root = resolvePathFromFile('', directory).replace(/\/+$/, '');
|
||||
let target = resolvePathFromFile('', path);
|
||||
if (/^[A-Za-z]:\//.test(root) || root.startsWith('//')) {
|
||||
root = root.toLowerCase();
|
||||
target = target.toLowerCase();
|
||||
}
|
||||
return target.startsWith(`${root}/`);
|
||||
}
|
||||
|
||||
export function isTrashedNote(path: string | null, vaultRoot: string | null | undefined): boolean {
|
||||
return !!path && !!vaultRoot && isPathInDirectory(path, `${vaultRoot}/.helixnotes/trash`);
|
||||
}
|
||||
@@ -0,0 +1,220 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { RevisionSaveQueue } from './revision-save.ts';
|
||||
|
||||
function deferred() {
|
||||
let resolve;
|
||||
let reject;
|
||||
const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
|
||||
return { promise, resolve, reject };
|
||||
}
|
||||
|
||||
test('an edit during a pending save stays dirty and the next save persists it', async () => {
|
||||
const saves = new RevisionSaveQueue();
|
||||
const started = deferred();
|
||||
const diskWrite = deferred();
|
||||
let disk = 'initial';
|
||||
saves.markChanged();
|
||||
const first = saves.save(saves.capture(), async () => {
|
||||
started.resolve();
|
||||
await diskWrite.promise;
|
||||
disk = 'first edit';
|
||||
});
|
||||
await started.promise;
|
||||
saves.markChanged();
|
||||
diskWrite.resolve();
|
||||
assert.equal(await first, false, 'a stale completion must not authorize navigation');
|
||||
assert.equal(saves.dirty, true);
|
||||
assert.equal(await saves.save(saves.capture(), async () => { disk = 'second edit'; }), true);
|
||||
assert.equal(disk, 'second edit');
|
||||
assert.equal(saves.dirty, false);
|
||||
});
|
||||
|
||||
test('failed saves stay dirty and do not poison an explicit retry', async () => {
|
||||
const saves = new RevisionSaveQueue();
|
||||
let disk = 'initial';
|
||||
saves.markChanged();
|
||||
const snapshot = saves.capture();
|
||||
await assert.rejects(saves.save(snapshot, async () => { throw new Error('disk full'); }), /disk full/);
|
||||
assert.equal(saves.dirty, true);
|
||||
assert.equal(disk, 'initial');
|
||||
assert.equal(await saves.save(snapshot, async () => { disk = 'retried edit'; }), true);
|
||||
assert.equal(disk, 'retried edit');
|
||||
assert.equal(saves.dirty, false);
|
||||
});
|
||||
|
||||
test('flush waits behind autosave and an older captured snapshot cannot overwrite it', async () => {
|
||||
const saves = new RevisionSaveQueue();
|
||||
const started = deferred();
|
||||
const diskWrite = deferred();
|
||||
const writes = [];
|
||||
saves.markChanged();
|
||||
const older = saves.capture();
|
||||
const autoSave = saves.save(older, async () => {
|
||||
started.resolve();
|
||||
await diskWrite.promise;
|
||||
writes.push('autosave');
|
||||
});
|
||||
await started.promise;
|
||||
saves.markChanged();
|
||||
const flush = saves.save(saves.capture(), async () => { writes.push('flush'); });
|
||||
const staleFlush = saves.save(older, async () => { writes.push('stale'); });
|
||||
assert.deepEqual(writes, []);
|
||||
diskWrite.resolve();
|
||||
assert.equal(await autoSave, false);
|
||||
assert.equal(await flush, true);
|
||||
assert.equal(await staleFlush, false);
|
||||
assert.deepEqual(writes, ['autosave', 'flush']);
|
||||
});
|
||||
|
||||
test('returning to the same note starts a new session that an older completion cannot clean', async () => {
|
||||
const saves = new RevisionSaveQueue();
|
||||
const started = deferred();
|
||||
const diskWrite = deferred();
|
||||
const writes = [];
|
||||
saves.markChanged();
|
||||
const leaving = saves.save(saves.capture(), async () => {
|
||||
started.resolve();
|
||||
await diskWrite.promise;
|
||||
writes.push(['A.md', 'before leaving']);
|
||||
});
|
||||
await started.promise;
|
||||
saves.startSession();
|
||||
saves.markChanged();
|
||||
const otherNote = saves.save(saves.capture(), async () => { writes.push(['B.md', 'other note']); });
|
||||
saves.startSession();
|
||||
saves.markChanged();
|
||||
diskWrite.resolve();
|
||||
assert.equal(await leaving, false);
|
||||
assert.equal(await otherNote, false);
|
||||
assert.equal(saves.dirty, true);
|
||||
assert.equal(await saves.save(saves.capture(), async () => { writes.push(['A.md', 'after returning']); }), true);
|
||||
assert.deepEqual(writes, [
|
||||
['A.md', 'before leaving'],
|
||||
['B.md', 'other note'],
|
||||
['A.md', 'after returning'],
|
||||
]);
|
||||
assert.equal(saves.dirty, false);
|
||||
});
|
||||
|
||||
test('queued saves advance the exact accepted raw baseline even when newer typing remains dirty', async () => {
|
||||
const saves = new RevisionSaveQueue();
|
||||
const firstWrite = deferred();
|
||||
const started = deferred();
|
||||
let disk = '---\nmodified: old\n---\noriginal';
|
||||
saves.startSession(disk);
|
||||
saves.markChanged();
|
||||
const first = saves.save(saves.capture(), async (expectedRaw) => {
|
||||
assert.equal(expectedRaw, disk);
|
||||
started.resolve();
|
||||
await firstWrite.promise;
|
||||
disk = '---\nmodified: first\n---\nfirst edit';
|
||||
return disk;
|
||||
});
|
||||
await started.promise;
|
||||
saves.markChanged();
|
||||
firstWrite.resolve();
|
||||
assert.equal(await first, false);
|
||||
assert.equal(saves.dirty, true);
|
||||
assert.equal(saves.raw, disk, 'a successful older save advances the active session baseline');
|
||||
const second = saves.save(saves.capture(), async (expectedRaw) => {
|
||||
assert.equal(expectedRaw, disk, 'later queued saves compare against the preceding accepted raw');
|
||||
disk = '---\nmodified: second\n---\nsecond edit';
|
||||
return disk;
|
||||
});
|
||||
assert.equal(await second, true);
|
||||
assert.equal(saves.raw, disk);
|
||||
assert.equal(saves.dirty, false);
|
||||
});
|
||||
|
||||
test('external disk changes reject an edit without losing its baseline or silently replacing disk', async () => {
|
||||
const saves = new RevisionSaveQueue();
|
||||
saves.startSession('original');
|
||||
saves.markChanged();
|
||||
let disk = 'external';
|
||||
const snapshot = saves.capture();
|
||||
const write = async (expectedRaw) => {
|
||||
if (expectedRaw !== disk) throw new Error('Save conflict: changed outside the app');
|
||||
disk = 'draft';
|
||||
return disk;
|
||||
};
|
||||
await assert.rejects(saves.save(snapshot, write), /Save conflict/);
|
||||
assert.equal(disk, 'external');
|
||||
assert.equal(saves.raw, 'original');
|
||||
assert.equal(saves.dirty, true);
|
||||
await assert.rejects(saves.save(snapshot, write), /Save conflict/);
|
||||
assert.equal(disk, 'external');
|
||||
});
|
||||
|
||||
test('native rename advances a dirty draft baseline only for its accepted raw', async () => {
|
||||
const saves = new RevisionSaveQueue();
|
||||
saves.startSession('before rename');
|
||||
saves.markChanged();
|
||||
assert.equal(saves.adoptMovedRaw('stale unrelated revision', 'renamed'), false);
|
||||
assert.equal(saves.raw, 'before rename');
|
||||
assert.equal(saves.adoptMovedRaw('before rename', 'renamed'), true);
|
||||
assert.equal(saves.dirty, true, 'native path migration does not claim the draft was saved');
|
||||
let disk = 'renamed';
|
||||
assert.equal(await saves.save(saves.capture(), async (expectedRaw) => {
|
||||
assert.equal(expectedRaw, disk);
|
||||
disk = 'renamed with draft';
|
||||
return disk;
|
||||
}), true);
|
||||
assert.equal(saves.raw, disk);
|
||||
assert.equal(saves.dirty, false);
|
||||
});
|
||||
|
||||
test('overlapping manual saves and a clean save do not rewrite the same revision', async () => {
|
||||
const saves = new RevisionSaveQueue();
|
||||
let writes = 0;
|
||||
const persist = async () => { writes++; };
|
||||
assert.equal(await saves.save(saves.capture(), persist), true);
|
||||
assert.equal(writes, 0);
|
||||
saves.markChanged();
|
||||
const snapshot = saves.capture();
|
||||
assert.deepEqual(await Promise.all([saves.save(snapshot, persist), saves.save(snapshot, persist)]), [true, true]);
|
||||
assert.equal(await saves.save(saves.capture(), persist), true);
|
||||
assert.equal(writes, 1);
|
||||
});
|
||||
|
||||
test('autosave waits for idle but continuous typing cannot postpone it indefinitely', (t) => {
|
||||
t.mock.timers.enable({ apis: ['setTimeout'] });
|
||||
const saves = new RevisionSaveQueue();
|
||||
let now = 0;
|
||||
const writes = [];
|
||||
const save = () => { writes.push(now); };
|
||||
saves.schedule(save);
|
||||
for (let second = 1; second <= 9; second++) {
|
||||
now = second * 1_000;
|
||||
t.mock.timers.tick(1_000);
|
||||
saves.schedule(save);
|
||||
}
|
||||
assert.deepEqual(writes, []);
|
||||
now = 10_000;
|
||||
t.mock.timers.tick(1_000);
|
||||
assert.deepEqual(writes, [10_000]);
|
||||
saves.schedule(save);
|
||||
now = 12_999;
|
||||
t.mock.timers.tick(2_999);
|
||||
assert.deepEqual(writes, [10_000]);
|
||||
now = 13_000;
|
||||
t.mock.timers.tick(1);
|
||||
assert.deepEqual(writes, [10_000, 13_000]);
|
||||
});
|
||||
|
||||
test('explicit saves and note switches cancel both pending autosave deadlines', (t) => {
|
||||
t.mock.timers.enable({ apis: ['setTimeout'] });
|
||||
const saves = new RevisionSaveQueue();
|
||||
const writes = [];
|
||||
saves.schedule(() => { writes.push('cancelled by flush'); });
|
||||
t.mock.timers.tick(1_000);
|
||||
saves.cancelScheduled();
|
||||
t.mock.timers.tick(10_000);
|
||||
saves.schedule(() => { writes.push('previous note'); });
|
||||
t.mock.timers.tick(1_000);
|
||||
saves.startSession();
|
||||
t.mock.timers.tick(10_000);
|
||||
saves.schedule(() => { writes.push('current note'); });
|
||||
t.mock.timers.tick(3_000);
|
||||
assert.deepEqual(writes, ['current note']);
|
||||
});
|
||||
@@ -0,0 +1,91 @@
|
||||
interface SaveSession {
|
||||
revision: number;
|
||||
savedRevision: number;
|
||||
raw: string;
|
||||
}
|
||||
|
||||
export interface SaveRevision {
|
||||
readonly session: SaveSession;
|
||||
readonly revision: number;
|
||||
}
|
||||
|
||||
/** Serializes immutable save snapshots without letting an old completion mark newer edits clean. */
|
||||
export class RevisionSaveQueue {
|
||||
private session: SaveSession = { revision: 0, savedRevision: 0, raw: '' };
|
||||
private tail: Promise<void> = Promise.resolve();
|
||||
private idleTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
private maxWaitTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
startSession(raw = ''): void {
|
||||
this.cancelScheduled();
|
||||
this.session = { revision: 0, savedRevision: 0, raw };
|
||||
}
|
||||
|
||||
markChanged(): void {
|
||||
this.session.revision++;
|
||||
}
|
||||
|
||||
schedule(save: () => void): void {
|
||||
if (this.idleTimer !== null) clearTimeout(this.idleTimer);
|
||||
const session = this.session;
|
||||
const run = () => {
|
||||
this.cancelScheduled();
|
||||
if (session === this.session) save();
|
||||
};
|
||||
this.idleTimer = setTimeout(run, 3_000);
|
||||
if (this.maxWaitTimer === null) this.maxWaitTimer = setTimeout(run, 10_000);
|
||||
}
|
||||
|
||||
cancelScheduled(): void {
|
||||
if (this.idleTimer !== null) clearTimeout(this.idleTimer);
|
||||
if (this.maxWaitTimer !== null) clearTimeout(this.maxWaitTimer);
|
||||
this.idleTimer = null;
|
||||
this.maxWaitTimer = null;
|
||||
}
|
||||
|
||||
capture(): SaveRevision {
|
||||
return { session: this.session, revision: this.session.revision };
|
||||
}
|
||||
|
||||
isCurrentSession(snapshot: SaveRevision): boolean {
|
||||
return snapshot.session === this.session;
|
||||
}
|
||||
|
||||
isCurrent(snapshot: SaveRevision): boolean {
|
||||
return this.isCurrentSession(snapshot) && snapshot.revision === this.session.revision;
|
||||
}
|
||||
|
||||
get raw(): string {
|
||||
return this.session.raw;
|
||||
}
|
||||
|
||||
/** Adopt a native rename's serialized baseline only when it moved our accepted revision. */
|
||||
adoptMovedRaw(oldRaw: string, newRaw: string): boolean {
|
||||
if (this.session.raw !== oldRaw) return false;
|
||||
this.session.raw = newRaw;
|
||||
return true;
|
||||
}
|
||||
|
||||
get dirty(): boolean {
|
||||
return this.session.revision !== this.session.savedRevision;
|
||||
}
|
||||
|
||||
save(snapshot: SaveRevision, persist: (expectedRaw: string) => Promise<string | void>): Promise<boolean> {
|
||||
const queued = this.tail.then(async () => {
|
||||
// An explicit flush may capture the same revision as an already queued autosave.
|
||||
if (snapshot.revision > snapshot.session.savedRevision) {
|
||||
const nextRaw = await persist(snapshot.session.raw);
|
||||
if (typeof nextRaw === 'string') snapshot.session.raw = nextRaw;
|
||||
snapshot.session.savedRevision = snapshot.revision;
|
||||
}
|
||||
return this.isCurrent(snapshot);
|
||||
});
|
||||
// Recover the queue, not the caller's result: a failed save stays dirty and remains retryable.
|
||||
this.tail = queued.then(() => {}, () => {});
|
||||
return queued;
|
||||
}
|
||||
|
||||
async idle(): Promise<void> {
|
||||
await this.tail;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
|
||||
const {
|
||||
applyCommittedTagStyle,
|
||||
isValidTagColor,
|
||||
lookupTagStyle,
|
||||
normalizeTagStyleKey,
|
||||
tagColor,
|
||||
tagCustomImagePath,
|
||||
tagIterationKey,
|
||||
tagStyleKeyEquals
|
||||
} = await import(new URL('./tag-styles.ts', import.meta.url));
|
||||
|
||||
test('normalizes tag style keys by trimming', () => {
|
||||
assert.equal(normalizeTagStyleKey(' work '), 'work');
|
||||
});
|
||||
|
||||
test('accepts 3 and 6 digit hex colors only', () => {
|
||||
assert.equal(isValidTagColor('#e11'), true);
|
||||
assert.equal(isValidTagColor('#e11d48'), true);
|
||||
assert.equal(isValidTagColor('#E11D48'), true);
|
||||
assert.equal(isValidTagColor('red'), false);
|
||||
assert.equal(isValidTagColor('#gg0000'), false);
|
||||
assert.equal(isValidTagColor('#e11d48aa'), false);
|
||||
});
|
||||
|
||||
test('looks up tag styles with a case-insensitive fallback', () => {
|
||||
const styles = { Work: { icon: 'builtin:briefcase', color: '#e11d48' } };
|
||||
assert.equal(lookupTagStyle('Work', styles)?.icon, 'builtin:briefcase');
|
||||
assert.equal(lookupTagStyle('work', styles)?.color, '#e11d48');
|
||||
assert.equal(tagColor('missing', styles), null);
|
||||
assert.equal(tagStyleKeyEquals('Work', 'work'), true);
|
||||
});
|
||||
|
||||
test('treats non-builtin icons as custom image paths', () => {
|
||||
const styles = { daily: { icon: '.helixnotes/attachments/tag.png' } };
|
||||
assert.equal(tagCustomImagePath('daily', styles), '.helixnotes/attachments/tag.png');
|
||||
assert.equal(tagCustomImagePath('daily', { daily: { icon: 'builtin:calendar' } }), null);
|
||||
});
|
||||
|
||||
|
||||
test('resetting a differently cased tag removes the stored style', () => {
|
||||
const styles = { Work: { icon: 'builtin:briefcase', color: '#e11d48' } };
|
||||
assert.deepEqual(applyCommittedTagStyle(styles, 'work', null), {});
|
||||
});
|
||||
|
||||
test('saving a style replaces a differently cased stored key', () => {
|
||||
const styles = { Work: { icon: 'builtin:briefcase' } };
|
||||
const next = applyCommittedTagStyle(styles, 'work', {
|
||||
icon: 'builtin:star',
|
||||
color: '#ec4899'
|
||||
});
|
||||
assert.deepEqual(next, {
|
||||
Work: { icon: 'builtin:star', color: '#ec4899' }
|
||||
});
|
||||
assert.equal(Object.hasOwn(next, 'work'), false);
|
||||
});
|
||||
|
||||
|
||||
test('duplicate tag names still get unique each keys', () => {
|
||||
const tags = ['work', 'work'];
|
||||
const keys = tags.map((tag, index) => tagIterationKey(tag, index));
|
||||
assert.deepEqual(keys, ['0:work', '1:work']);
|
||||
assert.equal(new Set(keys).size, keys.length);
|
||||
});
|
||||
@@ -0,0 +1,93 @@
|
||||
export interface TagStyleFields {
|
||||
icon?: string | null;
|
||||
color?: string | null;
|
||||
}
|
||||
|
||||
export const TAG_COLOR_PRESETS = [
|
||||
'#e11d48',
|
||||
'#f97316',
|
||||
'#eab308',
|
||||
'#22c55e',
|
||||
'#14b8a6',
|
||||
'#3b82f6',
|
||||
'#8b5cf6',
|
||||
'#ec4899',
|
||||
'#64748b'
|
||||
];
|
||||
|
||||
const HEX_COLOR = /^#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/;
|
||||
const BUILTIN_PREFIX = 'builtin:';
|
||||
|
||||
export function normalizeTagStyleKey(tag: string): string {
|
||||
return tag.trim();
|
||||
}
|
||||
|
||||
export function isValidTagColor(value: string | null | undefined): value is string {
|
||||
return typeof value === 'string' && HEX_COLOR.test(value);
|
||||
}
|
||||
|
||||
export function tagStyleKeyEquals(a: string, b: string): boolean {
|
||||
return normalizeTagStyleKey(a).toLowerCase() === normalizeTagStyleKey(b).toLowerCase();
|
||||
}
|
||||
|
||||
export function existingTagStyleKey(
|
||||
tag: string,
|
||||
styles: Record<string, TagStyleFields>
|
||||
): string | undefined {
|
||||
const key = normalizeTagStyleKey(tag);
|
||||
if (!key) return undefined;
|
||||
if (Object.hasOwn(styles, key)) return key;
|
||||
const lower = key.toLowerCase();
|
||||
return Object.keys(styles).find((name) => name.toLowerCase() === lower);
|
||||
}
|
||||
|
||||
export function lookupTagStyle(
|
||||
tag: string,
|
||||
styles: Record<string, TagStyleFields>
|
||||
): TagStyleFields | undefined {
|
||||
const storedKey = existingTagStyleKey(tag, styles);
|
||||
return storedKey ? styles[storedKey] : undefined;
|
||||
}
|
||||
|
||||
/** Stable `{#each}` key when a note can contain duplicate tag names. */
|
||||
export function tagIterationKey(tag: string, index: number): string {
|
||||
return `${index}:${tag}`;
|
||||
}
|
||||
|
||||
export function tagColor(
|
||||
tag: string,
|
||||
styles: Record<string, TagStyleFields>
|
||||
): string | null {
|
||||
const color = lookupTagStyle(tag, styles)?.color;
|
||||
return isValidTagColor(color) ? color : null;
|
||||
}
|
||||
|
||||
export function tagCustomImagePath(
|
||||
tag: string,
|
||||
styles: Record<string, TagStyleFields>
|
||||
): string | null {
|
||||
const icon = lookupTagStyle(tag, styles)?.icon;
|
||||
if (!icon || icon.startsWith(BUILTIN_PREFIX)) return null;
|
||||
return icon;
|
||||
}
|
||||
|
||||
|
||||
export function applyCommittedTagStyle(
|
||||
styles: Record<string, TagStyleFields>,
|
||||
tag: string,
|
||||
next: TagStyleFields | null
|
||||
): Record<string, TagStyleFields> {
|
||||
const result = { ...styles };
|
||||
const key = normalizeTagStyleKey(tag);
|
||||
if (!key) return result;
|
||||
|
||||
const lower = key.toLowerCase();
|
||||
for (const name of Object.keys(result)) {
|
||||
if (name.toLowerCase() === lower) delete result[name];
|
||||
}
|
||||
if (next) {
|
||||
const storedKey = existingTagStyleKey(tag, styles) ?? key;
|
||||
result[storedKey] = next;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
+18
-10
@@ -1,5 +1,17 @@
|
||||
const shortDateFormatter = new Intl.DateTimeFormat(undefined, { month: 'short', day: 'numeric' });
|
||||
const fullDateFormatter = new Intl.DateTimeFormat(undefined, {
|
||||
year: 'numeric',
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
});
|
||||
const monthFormatter = new Intl.DateTimeFormat(undefined, { month: 'long' });
|
||||
const monthYearFormatter = new Intl.DateTimeFormat(undefined, { month: 'long', year: 'numeric' });
|
||||
|
||||
export function formatRelativeTime(dateStr: string): string {
|
||||
const date = new Date(dateStr);
|
||||
if (Number.isNaN(date.getTime())) return date.toString();
|
||||
const now = new Date();
|
||||
const diff = now.getTime() - date.getTime();
|
||||
const seconds = Math.floor(diff / 1000);
|
||||
@@ -12,17 +24,12 @@ export function formatRelativeTime(dateStr: string): string {
|
||||
if (hours < 24) return `${hours}h ago`;
|
||||
if (days < 7) return `${days}d ago`;
|
||||
|
||||
return date.toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
|
||||
return shortDateFormatter.format(date);
|
||||
}
|
||||
|
||||
export function formatDate(dateStr: string): string {
|
||||
return new Date(dateStr).toLocaleDateString(undefined, {
|
||||
year: 'numeric',
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
});
|
||||
const date = new Date(dateStr);
|
||||
return Number.isNaN(date.getTime()) ? date.toString() : fullDateFormatter.format(date);
|
||||
}
|
||||
|
||||
// Relative-date bucket label for grouping the notes list:
|
||||
@@ -30,6 +37,7 @@ export function formatDate(dateStr: string): string {
|
||||
// Buckets are contiguous, so a list already sorted by date groups by consecutive label.
|
||||
export function dateBucketLabel(dateStr: string, now: Date = new Date()): string {
|
||||
const d = new Date(dateStr);
|
||||
if (Number.isNaN(d.getTime())) return d.toString();
|
||||
const dayMs = 86400000;
|
||||
const startOfDay = (x: Date) => new Date(x.getFullYear(), x.getMonth(), x.getDate()).getTime();
|
||||
const today = startOfDay(now);
|
||||
@@ -38,6 +46,6 @@ export function dateBucketLabel(dateStr: string, now: Date = new Date()): string
|
||||
if (day >= today - dayMs) return 'Yesterday';
|
||||
if (day >= today - 7 * dayMs) return 'Previous 7 Days';
|
||||
if (day >= today - 30 * dayMs) return 'Previous 30 Days';
|
||||
if (d.getFullYear() === now.getFullYear()) return d.toLocaleDateString(undefined, { month: 'long' });
|
||||
return d.toLocaleDateString(undefined, { month: 'long', year: 'numeric' });
|
||||
if (d.getFullYear() === now.getFullYear()) return monthFormatter.format(d);
|
||||
return monthYearFormatter.format(d);
|
||||
}
|
||||
@@ -2,7 +2,7 @@ import { WebviewWindow } from '@tauri-apps/api/webviewWindow';
|
||||
|
||||
const openNoteWindows = new Map<string, string>();
|
||||
|
||||
export async function openNoteWindow(notePath: string, noteTitle: string) {
|
||||
export async function openNoteWindow(vaultPath: string, notePath: string, noteTitle: string) {
|
||||
const existingLabel = openNoteWindows.get(notePath);
|
||||
if (existingLabel) {
|
||||
const existing = await WebviewWindow.getByLabel(existingLabel);
|
||||
@@ -15,8 +15,8 @@ export async function openNoteWindow(notePath: string, noteTitle: string) {
|
||||
openNoteWindows.delete(notePath);
|
||||
}
|
||||
|
||||
const label = `note-${Date.now()}`;
|
||||
const url = `/?note=${encodeURIComponent(notePath)}`;
|
||||
const label = `note-${crypto.randomUUID()}`;
|
||||
const url = `/?note=${encodeURIComponent(notePath)}&vault=${encodeURIComponent(vaultPath)}`;
|
||||
|
||||
const noteWindow = new WebviewWindow(label, {
|
||||
url,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import '../app.css';
|
||||
import { resolvedTheme, appConfig, activeNote, activeNotePath, installType, platformIsMobile, checkForUpdate, checkForUpdateMobile, isManagedInstall, customThemes } from '$lib/stores/app';
|
||||
import { openFile, openUrl, readNote, getInstallType, isMobilePlatform } from '$lib/api';
|
||||
import { resolvedTheme, appConfig, activeNotePath, installType, platformIsMobile, checkForUpdate, checkForUpdateMobile, isManagedInstall, customThemes } from '$lib/stores/app';
|
||||
import { openFile, openUrl, getInstallType, isMobilePlatform } from '$lib/api';
|
||||
import { get } from 'svelte/store';
|
||||
import { darkThemes, isMobile, isAndroid } from '$lib/platform';
|
||||
import type { CustomTheme } from '$lib/types';
|
||||
@@ -97,10 +97,7 @@
|
||||
);
|
||||
// Internal .md note link - navigate within the app
|
||||
if (absPath.endsWith('.md')) {
|
||||
readNote(absPath).then((content) => {
|
||||
activeNote.set({ ...content, content: content.content });
|
||||
activeNotePath.set(absPath);
|
||||
}).catch((err) => console.error('Failed to navigate to note:', err));
|
||||
window.dispatchEvent(new CustomEvent('helixnotes-open-note', { detail: absPath }));
|
||||
} else {
|
||||
openLocalFile(absPath);
|
||||
}
|
||||
|
||||
+29
-14
@@ -13,6 +13,7 @@
|
||||
|
||||
let loading = $state(true);
|
||||
let noteWindowPath = $state<string | null>(null);
|
||||
let noteWindowVault = $state<string | null>(null);
|
||||
let startupVaultError = $state('');
|
||||
let fontSizeSaveTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
let removeEditorZoomShortcuts: (() => void) | null = null;
|
||||
@@ -45,16 +46,16 @@
|
||||
const minEditorFontSize = 10;
|
||||
const maxEditorFontSize = 32;
|
||||
|
||||
function getEditorScrollSurface(): HTMLElement | HTMLTextAreaElement | null {
|
||||
const sourceEditor = document.querySelector<HTMLTextAreaElement>('.source-editor');
|
||||
if (sourceEditor && getComputedStyle(sourceEditor).display !== 'none') return sourceEditor;
|
||||
function getEditorScrollSurface(): HTMLElement | null {
|
||||
const sourceEditor = document.querySelector<HTMLElement>('.source-editor .cm-scroller');
|
||||
if (sourceEditor && sourceEditor.clientHeight > 0) return sourceEditor;
|
||||
return document.querySelector<HTMLElement>('.editor-body');
|
||||
}
|
||||
|
||||
function preserveEditorViewportAfterLayout(scrollSurface: HTMLElement | HTMLTextAreaElement | null) {
|
||||
function preserveEditorViewportAfterLayout(scrollSurface: HTMLElement | null) {
|
||||
if (!scrollSurface) return () => {};
|
||||
|
||||
const isSourceEditor = scrollSurface instanceof HTMLTextAreaElement;
|
||||
const isSourceEditor = scrollSurface.classList.contains('cm-scroller');
|
||||
const maxScroll = scrollSurface.scrollHeight - scrollSurface.clientHeight;
|
||||
const scrollRatio = maxScroll > 0 ? scrollSurface.scrollTop / maxScroll : 0;
|
||||
const rect = scrollSurface.getBoundingClientRect();
|
||||
@@ -152,10 +153,23 @@
|
||||
const notePath = params.get('note');
|
||||
if (notePath) {
|
||||
noteWindowPath = notePath;
|
||||
noteWindowVault = params.get('vault');
|
||||
}
|
||||
|
||||
try {
|
||||
const config = await getAppConfig();
|
||||
if (noteWindowPath) {
|
||||
const origin = config.vaults.find(vault => vault.path === noteWindowVault);
|
||||
if (noteWindowVault && (origin || config.active_vault === noteWindowVault)) {
|
||||
// This is window-local state, not a native vault switch.
|
||||
config.active_vault = noteWindowVault;
|
||||
config.active_bookmark_id = origin?.bookmark_id ?? null;
|
||||
} else {
|
||||
noteWindowPath = null;
|
||||
noteWindowVault = null;
|
||||
startupVaultError = 'This note window’s vault is no longer available. Choose a vault to continue.';
|
||||
}
|
||||
}
|
||||
$appConfig = config;
|
||||
removeFontSizeListener = await listen<number>('editor-font-size-changed', (event) => {
|
||||
if ($appConfig?.font_size !== event.payload) applyEditorFontSize(event.payload);
|
||||
@@ -272,14 +286,15 @@
|
||||
}
|
||||
$vaultReady = true;
|
||||
} catch (e) {
|
||||
if (isIOS && activeVault?.bookmark_id) {
|
||||
startupVaultError = String(e);
|
||||
$appConfig = {
|
||||
...config,
|
||||
active_vault: null,
|
||||
active_bookmark_id: null
|
||||
};
|
||||
}
|
||||
$vaultReady = false;
|
||||
startupVaultError = `Could not open the last vault: ${String(e)}`;
|
||||
// A saved path is not proof that the vault was initialized.
|
||||
// Do not let the picker navigate back into a failed startup.
|
||||
$appConfig = {
|
||||
...config,
|
||||
active_vault: null,
|
||||
active_bookmark_id: null
|
||||
};
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
@@ -308,7 +323,7 @@
|
||||
<div class="spinner"></div>
|
||||
</div>
|
||||
{:else if noteWindowPath}
|
||||
<NoteWindow notePath={noteWindowPath} />
|
||||
<NoteWindow notePath={noteWindowPath} vaultPath={noteWindowVault} />
|
||||
{:else if $vaultReady}
|
||||
<AppLayout />
|
||||
{:else}
|
||||
|
||||
@@ -0,0 +1,150 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { Schema } from '@tiptap/pm/model';
|
||||
import { EditorState, TextSelection } from '@tiptap/pm/state';
|
||||
import { history, undo, redo } from '@tiptap/pm/history';
|
||||
import { common, createLowlight } from 'lowlight';
|
||||
import { createCodeBlockHighlightPlugin } from '../src/lib/editor/extensions/cachedCodeBlockLowlight.ts';
|
||||
|
||||
const schema = new Schema({
|
||||
nodes: {
|
||||
doc: { content: 'block+' },
|
||||
paragraph: { content: 'text*', group: 'block' },
|
||||
blockquote: { content: 'block+', group: 'block' },
|
||||
codeBlock: { content: 'text*', group: 'block', code: true, attrs: { language: { default: null } } },
|
||||
text: { group: 'inline' },
|
||||
},
|
||||
});
|
||||
|
||||
function codeBlock(text, language = 'javascript') {
|
||||
return schema.node('codeBlock', { language }, text ? schema.text(text) : null);
|
||||
}
|
||||
|
||||
function setup(blocks, defaultLanguage = 'text') {
|
||||
const lowlight = createLowlight(common);
|
||||
const calls = [];
|
||||
const plugin = createCodeBlockHighlightPlugin({
|
||||
defaultLanguage,
|
||||
lowlight: {
|
||||
...lowlight,
|
||||
highlight(language, text) {
|
||||
calls.push({ language, text });
|
||||
return lowlight.highlight(language, text);
|
||||
},
|
||||
highlightAuto(text) {
|
||||
calls.push({ language: 'auto', text });
|
||||
return lowlight.highlightAuto(text);
|
||||
},
|
||||
},
|
||||
});
|
||||
const state = EditorState.create({ schema, doc: schema.node('doc', null, blocks), plugins: [history(), plugin] });
|
||||
return { state, plugin, calls };
|
||||
}
|
||||
|
||||
function keywordRanges(plugin, state) {
|
||||
return plugin.getState(state).decorations.find()
|
||||
.filter((decoration) => decoration.type.attrs.class.split(' ').includes('hljs-keyword'))
|
||||
.map(({ from, to }) => ({ from, to, text: state.doc.textBetween(from, to) }));
|
||||
}
|
||||
|
||||
function expectedKeywords(doc) {
|
||||
const ranges = [];
|
||||
doc.descendants((node, pos) => {
|
||||
if (node.type.name === 'codeBlock' && node.attrs.language === 'javascript') {
|
||||
const offset = node.textContent.indexOf('const');
|
||||
if (offset >= 0) ranges.push({ from: pos + 1 + offset, to: pos + 6 + offset, text: 'const' });
|
||||
}
|
||||
});
|
||||
return ranges;
|
||||
}
|
||||
|
||||
test('typing highlights only the changed block; selection-only transactions reuse plugin state', () => {
|
||||
const fixture = setup(Array.from({ length: 80 }, (_, i) => codeBlock(`const item${i} = 1;`)));
|
||||
let { state } = fixture;
|
||||
const { plugin, calls } = fixture;
|
||||
assert.equal(calls.length, 80);
|
||||
calls.length = 0;
|
||||
state = state.apply(state.tr.insertText('2', 1 + 'const item0 = 1'.length));
|
||||
assert.deepEqual(calls, [{ language: 'javascript', text: 'const item0 = 12;' }]);
|
||||
assert.deepEqual(keywordRanges(plugin, state), expectedKeywords(state.doc));
|
||||
calls.length = 0;
|
||||
const beforeSelection = plugin.getState(state);
|
||||
state = state.apply(state.tr.setSelection(TextSelection.create(state.doc, state.doc.content.size - 1)));
|
||||
assert.equal(plugin.getState(state), beforeSelection);
|
||||
assert.deepEqual(calls, []);
|
||||
});
|
||||
|
||||
test('insertions, moves, nested blocks, and deletions keep cached spans at their new positions', () => {
|
||||
const first = codeBlock('const first = 1;');
|
||||
const second = codeBlock('const second = 2;');
|
||||
const fixture = setup([first, schema.node('blockquote', null, [second])]);
|
||||
let { state } = fixture;
|
||||
const { plugin, calls } = fixture;
|
||||
calls.length = 0;
|
||||
const prefix = schema.node('paragraph', null, schema.text('Inserted before code'));
|
||||
state = state.apply(state.tr.insert(0, prefix));
|
||||
assert.deepEqual(keywordRanges(plugin, state), expectedKeywords(state.doc));
|
||||
const move = state.tr.delete(prefix.nodeSize, prefix.nodeSize + first.nodeSize);
|
||||
move.insert(move.doc.content.size, first);
|
||||
state = state.apply(move);
|
||||
assert.deepEqual(keywordRanges(plugin, state), expectedKeywords(state.doc));
|
||||
state = state.apply(state.tr.delete(prefix.nodeSize, prefix.nodeSize + second.nodeSize + 2));
|
||||
assert.deepEqual(keywordRanges(plugin, state), expectedKeywords(state.doc));
|
||||
assert.deepEqual(calls, []);
|
||||
});
|
||||
|
||||
test('language changes, code-to-paragraph conversion, and full replacement discard obsolete decorations', () => {
|
||||
const original = codeBlock('const value = 1;');
|
||||
const fixture = setup([original, codeBlock('const other = 2;')]);
|
||||
let { state } = fixture;
|
||||
const { plugin, calls } = fixture;
|
||||
calls.length = 0;
|
||||
state = state.apply(state.tr.setNodeMarkup(0, undefined, { language: 'text' }));
|
||||
assert.deepEqual(calls, [{ language: 'text', text: original.textContent }]);
|
||||
assert.deepEqual(keywordRanges(plugin, state), expectedKeywords(state.doc));
|
||||
calls.length = 0;
|
||||
state = state.apply(state.tr.setNodeMarkup(original.nodeSize, schema.nodes.paragraph));
|
||||
assert.deepEqual(plugin.getState(state).decorations.find(), []);
|
||||
assert.deepEqual(calls, []);
|
||||
state = state.apply(state.tr.replaceWith(0, state.doc.content.size, original));
|
||||
assert.deepEqual(keywordRanges(plugin, state), expectedKeywords(state.doc));
|
||||
assert.deepEqual(calls, [], 'reused immutable nodes retain their relative highlighting');
|
||||
});
|
||||
|
||||
test('undo and redo restore token ranges without highlighting unrelated blocks', () => {
|
||||
const fixture = setup([codeBlock('const first = 1;'), codeBlock('const second = 2;')]);
|
||||
let { state } = fixture;
|
||||
const { plugin, calls } = fixture;
|
||||
const before = state.doc;
|
||||
state = state.apply(state.tr.insertText('/*new*/ ', 1));
|
||||
const after = state.doc;
|
||||
calls.length = 0;
|
||||
assert.equal(undo(state, (transaction) => { state = state.apply(transaction); }), true);
|
||||
assert.ok(state.doc.eq(before));
|
||||
assert.deepEqual(keywordRanges(plugin, state), expectedKeywords(state.doc));
|
||||
assert.ok(calls.length <= 1);
|
||||
assert.ok(calls.every(({ text }) => text === 'const first = 1;'));
|
||||
calls.length = 0;
|
||||
assert.equal(redo(state, (transaction) => { state = state.apply(transaction); }), true);
|
||||
assert.ok(state.doc.eq(after));
|
||||
assert.deepEqual(keywordRanges(plugin, state), expectedKeywords(state.doc));
|
||||
assert.ok(calls.length <= 1);
|
||||
assert.ok(calls.every(({ text }) => text === '/*new*/ const first = 1;'));
|
||||
});
|
||||
|
||||
test('cache ownership respects highlighter/default-language boundaries and empty blocks', () => {
|
||||
const shared = codeBlock('const value = 1;', null);
|
||||
const javascript = setup([shared], 'javascript');
|
||||
const plaintext = setup([shared], 'text');
|
||||
assert.equal(javascript.plugin.getState(javascript.state).decorations.find()[0].type.attrs.class, 'hljs-keyword');
|
||||
assert.deepEqual(plaintext.plugin.getState(plaintext.state).decorations.find(), []);
|
||||
const empty = codeBlock('');
|
||||
const fixture = setup([empty]);
|
||||
let { state } = fixture;
|
||||
fixture.calls.length = 0;
|
||||
state = state.apply(state.tr.insert(0, schema.node('paragraph')));
|
||||
assert.deepEqual(fixture.calls, []);
|
||||
state = state.apply(state.tr.insertText('const x = 1;', 3));
|
||||
assert.deepEqual(fixture.calls, [{ language: 'javascript', text: 'const x = 1;' }]);
|
||||
assert.deepEqual(keywordRanges(fixture.plugin, state), expectedKeywords(state.doc));
|
||||
});
|
||||
@@ -0,0 +1,43 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { Schema } from '@tiptap/pm/model';
|
||||
import { EditorState, TextSelection } from '@tiptap/pm/state';
|
||||
import { buildTaskMetaDecorations, focusedPlaceholderDecorations } from '../src/lib/editor/decorations.ts';
|
||||
|
||||
const schema = new Schema({
|
||||
nodes: {
|
||||
doc: { content: 'block+' },
|
||||
paragraph: { group: 'block', content: 'inline*' },
|
||||
taskList: { group: 'block', content: 'taskItem+' },
|
||||
taskItem: { content: 'paragraph block*' },
|
||||
text: { group: 'inline' },
|
||||
},
|
||||
marks: { bold: {} },
|
||||
});
|
||||
const p = (value = '') => schema.node('paragraph', null, value ? schema.text(value) : undefined);
|
||||
const item = (...children) => schema.node('taskItem', null, children);
|
||||
const list = (...items) => schema.node('taskList', null, items);
|
||||
|
||||
test('task decorations include nested tasks once, but never style ordinary prose tokens', () => {
|
||||
const doc = schema.node('doc', null, [
|
||||
p('ordinary !high due:2026-09-27'),
|
||||
list(item(p('parent !low'), list(item(p('nested !high due:2026-09-28')))), item(p('sibling !med'))),
|
||||
p('ordinary !low'),
|
||||
]);
|
||||
const tokens = buildTaskMetaDecorations(doc).find().map(({ from, to }) => doc.textBetween(from, to));
|
||||
assert.deepEqual(tokens, ['!low', '!high', 'due:2026-09-28', '!med']);
|
||||
assert.deepEqual(buildTaskMetaDecorations(schema.node('doc', null, [p('!high'), p('due:2026-09-27')])).find(), []);
|
||||
});
|
||||
|
||||
test('placeholder follows an empty nested paragraph and disappears when that paragraph gains content', () => {
|
||||
const doc = schema.node('doc', null, [p('before'), list(item(p()))]);
|
||||
let emptyPosition;
|
||||
doc.descendants((node, pos) => { if (node.type.name === 'paragraph' && !node.content.size) emptyPosition = pos; });
|
||||
let state = EditorState.create({ doc, selection: TextSelection.create(doc, emptyPosition + 1) });
|
||||
const decorations = focusedPlaceholderDecorations(state).find();
|
||||
assert.deepEqual(decorations.map(({ from, to }) => [from, to]), [[emptyPosition, emptyPosition + 2]]);
|
||||
state = state.apply(state.tr.insertText('written'));
|
||||
assert.deepEqual(focusedPlaceholderDecorations(state).find(), []);
|
||||
state = state.apply(state.tr.setSelection(TextSelection.create(state.doc, 1)));
|
||||
assert.deepEqual(focusedPlaceholderDecorations(state).find(), []);
|
||||
});
|
||||
@@ -0,0 +1,77 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { Schema } from '@tiptap/pm/model';
|
||||
import { findDocumentMatches, findSourceMatches, closestSearchMatch } from '../src/lib/editor/search.ts';
|
||||
|
||||
const options = { matchCase: false, wholeWord: false };
|
||||
const schema = new Schema({
|
||||
nodes: {
|
||||
doc: { content: 'block+' },
|
||||
paragraph: { group: 'block', content: 'inline*' },
|
||||
text: { group: 'inline' },
|
||||
hard_break: { group: 'inline', inline: true },
|
||||
image: { group: 'inline', inline: true, atom: true },
|
||||
},
|
||||
marks: { bold: {}, italic: {} },
|
||||
});
|
||||
const text = (value, marks = []) => schema.text(value, marks.map((name) => schema.mark(name)));
|
||||
const paragraph = (...children) => schema.node('paragraph', null, children);
|
||||
const doc = (...children) => schema.node('doc', null, children);
|
||||
|
||||
test('rich phrases span adjacent text nodes regardless of formatting', () => {
|
||||
const document = doc(paragraph(text('A '), text('formatted', ['bold']), text(' phrase repeats. A formatted phrase repeats.')));
|
||||
const results = findDocumentMatches(document, 'formatted phrase', options);
|
||||
assert.deepEqual(results, [{ from: 3, to: 19 }, { from: 31, to: 47 }]);
|
||||
assert.deepEqual(results.map(({ from, to }) => document.textBetween(from, to)), ['formatted phrase', 'formatted phrase']);
|
||||
});
|
||||
|
||||
test('rich search does not bridge paragraphs, hard breaks or inline atoms', () => {
|
||||
for (const document of [
|
||||
doc(paragraph(text('hello ')), paragraph(text('world'))),
|
||||
doc(paragraph(text('hello '), schema.node('hard_break'), text('world'))),
|
||||
doc(paragraph(text('hello '), schema.node('image'), text('world'))),
|
||||
]) assert.deepEqual(findDocumentMatches(document, 'hello world', options), []);
|
||||
});
|
||||
|
||||
test('Unicode case folding keeps original UTF-16 positions and supplementary letters intact', () => {
|
||||
const source = 'İ 😀 FoO 𐐀 Σςσ K';
|
||||
assert.deepEqual(findSourceMatches(source, 'foo', options), [{ from: 5, to: 8 }]);
|
||||
assert.deepEqual(findSourceMatches(source, '𐐨', options), [{ from: 9, to: 11 }]);
|
||||
assert.deepEqual(findSourceMatches(source, 'σ', options), [{ from: 12, to: 13 }, { from: 13, to: 14 }, { from: 14, to: 15 }]);
|
||||
assert.deepEqual(findSourceMatches(source, 'k', options), [{ from: 16, to: 17 }]);
|
||||
const document = doc(paragraph(text('İ 😀 '), text('FoO', ['italic'])));
|
||||
assert.deepEqual(findDocumentMatches(document, 'foo', options), [{ from: 6, to: 9 }]);
|
||||
});
|
||||
|
||||
test('case-sensitive matches retain literal punctuation and overlapping occurrences', () => {
|
||||
assert.deepEqual(findSourceMatches('Foo foo FOO', 'foo', { ...options, matchCase: true }), [{ from: 4, to: 7 }]);
|
||||
assert.deepEqual(findSourceMatches('a.b a?b a.b', 'a.b', options), [{ from: 0, to: 3 }, { from: 8, to: 11 }]);
|
||||
assert.deepEqual(findSourceMatches('banana', 'ana', options), [{ from: 1, to: 4 }, { from: 3, to: 6 }]);
|
||||
assert.deepEqual(findSourceMatches('😀😀😀', '😀😀', options), [{ from: 0, to: 4 }, { from: 2, to: 6 }]);
|
||||
assert.deepEqual(findSourceMatches('anything', '', options), []);
|
||||
});
|
||||
|
||||
test('whole-word boundaries include Unicode letters, marks, numbers and connectors', () => {
|
||||
const source = 'cat scatter cat_ cat2 écat caté cat\u0301 cat\u200d (cat) 😀cat😀';
|
||||
const results = findSourceMatches(source, 'cat', { ...options, wholeWord: true });
|
||||
assert.deepEqual(results.map(({ from }) => from), [0, source.indexOf('(cat)') + 1, source.indexOf('😀cat😀') + 2]);
|
||||
assert.deepEqual(findSourceMatches('中文 中文字', '中文', options), [{ from: 0, to: 2 }, { from: 3, to: 5 }]);
|
||||
assert.deepEqual(findSourceMatches('中文 中文字', '中文', { ...options, wholeWord: true }), [{ from: 0, to: 2 }]);
|
||||
const document = doc(paragraph(text('cat'), text('apult', ['bold']), text(' cat')));
|
||||
assert.deepEqual(findDocumentMatches(document, 'cat', { ...options, wholeWord: true }), [{ from: 10, to: 13 }]);
|
||||
});
|
||||
|
||||
test('rescanning edited documents adds and removes occurrences without changing documents', () => {
|
||||
const before = doc(paragraph(text('word WORD')));
|
||||
const after = doc(paragraph(text('word WORD word')));
|
||||
assert.deepEqual(findDocumentMatches(before, 'word', options), [{ from: 1, to: 5 }, { from: 6, to: 10 }]);
|
||||
const results = findDocumentMatches(after, 'word', options);
|
||||
assert.deepEqual(results, [{ from: 1, to: 5 }, { from: 6, to: 10 }, { from: 11, to: 15 }]);
|
||||
assert.equal(closestSearchMatch(results, 6), 1);
|
||||
assert.equal(closestSearchMatch(results, 8), 2);
|
||||
assert.equal(closestSearchMatch(results, 100), 2);
|
||||
assert.equal(closestSearchMatch([], 100), 0);
|
||||
assert.equal(before.textContent, 'word WORD');
|
||||
assert.equal(after.textContent, 'word WORD word');
|
||||
});
|
||||
|
||||
@@ -0,0 +1,115 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFile } from 'node:fs/promises';
|
||||
import test from 'node:test';
|
||||
import { createContext, Script } from 'node:vm';
|
||||
import { compile, parse } from 'svelte/compiler';
|
||||
import { get, writable } from 'svelte/store';
|
||||
|
||||
const source = await readFile(
|
||||
new URL('../src/lib/components/Sidebar.svelte', import.meta.url),
|
||||
'utf8'
|
||||
);
|
||||
const ast = parse(source, { modern: true });
|
||||
|
||||
function elementWithClass(nodes, className) {
|
||||
return nodes.find((node) => node.attributes?.some((attribute) =>
|
||||
attribute.name === 'class' && attribute.value[0]?.data === className
|
||||
));
|
||||
}
|
||||
|
||||
const aside = elementWithClass(ast.fragment.nodes, 'sidebar');
|
||||
const blocks = aside.fragment.nodes.filter((node) => node.type === 'IfBlock');
|
||||
const content = blocks.find((node) => elementWithClass(node.consequent.nodes, 'section'));
|
||||
const header = blocks.find((node) => elementWithClass(node.consequent.nodes, 'sidebar-header'));
|
||||
const toggle = elementWithClass(
|
||||
elementWithClass(header.consequent.nodes, 'sidebar-header').fragment.nodes,
|
||||
'collapse-btn'
|
||||
);
|
||||
|
||||
function expressionScript(expression) {
|
||||
assert.ok(expression, 'expected a component expression');
|
||||
return new Script(`(${source.slice(expression.start, expression.end)})`);
|
||||
}
|
||||
|
||||
// Execute the actual template conditions, not a copy of the collapse logic.
|
||||
const expressions = {
|
||||
contentVisible: expressionScript(content.test),
|
||||
collapsedClass: expressionScript(aside.attributes.find((attribute) =>
|
||||
attribute.type === 'ClassDirective' && attribute.name === 'collapsed'
|
||||
).expression),
|
||||
toggleVisible: expressionScript(header.test)
|
||||
};
|
||||
const toggleScript = expressionScript(
|
||||
toggle.attributes.find((attribute) => attribute.name === 'onclick').value.expression
|
||||
);
|
||||
|
||||
function sidebarContext(isMobile, stored) {
|
||||
const sidebarCollapsed = writable(stored);
|
||||
const context = createContext({
|
||||
isMobile,
|
||||
get $sidebarCollapsed() { return get(sidebarCollapsed); },
|
||||
set $sidebarCollapsed(value) { sidebarCollapsed.set(value); }
|
||||
});
|
||||
return { context, sidebarCollapsed };
|
||||
}
|
||||
|
||||
function evaluate(context) {
|
||||
return Object.fromEntries(Object.entries(expressions).map(([name, script]) =>
|
||||
[name, script.runInContext(context)]
|
||||
));
|
||||
}
|
||||
|
||||
const scenarios = [
|
||||
{
|
||||
platform: 'desktop', isMobile: false,
|
||||
expanded: { contentVisible: true, collapsedClass: false, toggleVisible: true },
|
||||
collapsed: { contentVisible: false, collapsedClass: true, toggleVisible: true }
|
||||
},
|
||||
{
|
||||
platform: 'mobile', isMobile: true,
|
||||
expanded: { contentVisible: true, collapsedClass: false, toggleVisible: false },
|
||||
collapsed: { contentVisible: true, collapsedClass: false, toggleVisible: false }
|
||||
}
|
||||
];
|
||||
|
||||
for (const scenario of scenarios) {
|
||||
for (const stored of [false, true]) {
|
||||
test(`${scenario.platform} navigation with stored sidebar_collapsed=${stored}`, () => {
|
||||
const { context, sidebarCollapsed } = sidebarContext(scenario.isMobile, stored);
|
||||
|
||||
assert.deepEqual(evaluate(context), stored ? scenario.collapsed : scenario.expanded);
|
||||
assert.equal(get(sidebarCollapsed), stored, 'rendering must preserve the stored preference');
|
||||
});
|
||||
}
|
||||
|
||||
test(`${scenario.platform} navigation follows late false -> true -> false store updates`, () => {
|
||||
const { context, sidebarCollapsed } = sidebarContext(scenario.isMobile, false);
|
||||
|
||||
assert.deepEqual(evaluate(context), scenario.expanded);
|
||||
sidebarCollapsed.set(true);
|
||||
assert.deepEqual(evaluate(context), scenario.collapsed);
|
||||
assert.equal(get(sidebarCollapsed), true, 'rendering must not reset the loaded preference');
|
||||
sidebarCollapsed.set(false);
|
||||
assert.deepEqual(evaluate(context), scenario.expanded);
|
||||
assert.equal(get(sidebarCollapsed), false);
|
||||
});
|
||||
}
|
||||
|
||||
test('desktop collapse toggle still collapses and expands the sidebar', () => {
|
||||
const { context, sidebarCollapsed } = sidebarContext(false, false);
|
||||
const toggleSidebar = toggleScript.runInContext(context);
|
||||
|
||||
toggleSidebar();
|
||||
assert.equal(get(sidebarCollapsed), true);
|
||||
assert.deepEqual(evaluate(context), scenarios[0].collapsed);
|
||||
toggleSidebar();
|
||||
assert.equal(get(sidebarCollapsed), false);
|
||||
assert.deepEqual(evaluate(context), scenarios[0].expanded);
|
||||
});
|
||||
|
||||
test('Sidebar compiles for the client', () => {
|
||||
assert.doesNotThrow(() => compile(source, {
|
||||
filename: 'src/lib/components/Sidebar.svelte',
|
||||
generate: 'client'
|
||||
}));
|
||||
});
|
||||
@@ -16,6 +16,8 @@ const {
|
||||
assetSourceToMarkdown,
|
||||
assetUrlToLocalPath,
|
||||
normalizeLocalAssetPath,
|
||||
isPathInDirectory,
|
||||
isTrashedNote,
|
||||
resolvePathFromFile,
|
||||
resolveVaultFilePath
|
||||
} = await import(
|
||||
@@ -115,3 +117,27 @@ test('resolves vault files consistently across platforms', () => {
|
||||
'//server/share/Vault/assets/image.png'
|
||||
);
|
||||
});
|
||||
|
||||
test('restored Windows and UNC notes remain vault-owned across separator and case differences', () => {
|
||||
assert.equal(isPathInDirectory('C:\\NOTES\\Alpha.md', 'c:\\Notes\\'), true);
|
||||
assert.equal(isPathInDirectory('C:/Notes/Folder/Alpha.md', 'C:\\Notes'), true);
|
||||
assert.equal(isPathInDirectory('\\\\SERVER\\SHARE\\Notes\\Alpha.md', '//server/share/notes/'), true);
|
||||
});
|
||||
|
||||
test('vault ownership normalizes trailing separators and dot segments without accepting siblings', () => {
|
||||
assert.equal(isPathInDirectory('/vault/folder/../Alpha.md', '/vault/'), true);
|
||||
assert.equal(isPathInDirectory('/vault/folder/../../Outside.md', '/vault'), false);
|
||||
assert.equal(isPathInDirectory('/vault-extra/Alpha.md', '/vault'), false);
|
||||
assert.equal(isPathInDirectory('D:\\Notes\\Alpha.md', 'C:\\Notes'), false);
|
||||
assert.equal(isPathInDirectory('/Vault/Alpha.md', '/vault'), false);
|
||||
assert.equal(isPathInDirectory('/vault/Alpha.md', null), false);
|
||||
});
|
||||
|
||||
test('trash previews are protected without blocking ordinary notebooks or other vaults', () => {
|
||||
assert.equal(isTrashedNote('/vault/.helixnotes/trash/deleted.md', '/vault'), true);
|
||||
assert.equal(isTrashedNote('C:\\Vault\\.helixnotes\\trash\\deleted.md', 'c:/vault/'), true);
|
||||
assert.equal(isTrashedNote('/vault/Trash/note.md', '/vault'), false);
|
||||
assert.equal(isTrashedNote('/vault/.helixnotes/trash-backup/note.md', '/vault'), false);
|
||||
assert.equal(isTrashedNote('/other/.helixnotes/trash/deleted.md', '/vault'), false);
|
||||
assert.equal(isTrashedNote(null, '/vault'), false);
|
||||
});
|
||||
@@ -0,0 +1,182 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import {
|
||||
resolveSearchTarget,
|
||||
visibleSearchTarget,
|
||||
} from '../src/lib/editor/search-target.ts';
|
||||
|
||||
function targetIn(source, text, before = '', after = '', from = source.indexOf(text)) {
|
||||
return Object.freeze({ field: 'body', start: from, end: from + text.length, text, before, after });
|
||||
}
|
||||
|
||||
function rangeIn(source, text) {
|
||||
const from = source.indexOf(text);
|
||||
return Object.freeze({ from, to: from + text.length });
|
||||
}
|
||||
|
||||
test('recorded UTF-16 offsets require exact source text and surrounding context', () => {
|
||||
const source = 'prefix Needle suffix / prefix Needle suffix';
|
||||
const target = targetIn(source, 'Needle', 'prefix ', ' suffix', source.lastIndexOf('Needle'));
|
||||
assert.deepEqual(resolveSearchTarget(source, target), { from: target.start, to: target.end });
|
||||
assert.equal(resolveSearchTarget(source.toLowerCase(), target), null);
|
||||
});
|
||||
|
||||
test('relocates a unique full anchor rather than the first occurrence of its text', () => {
|
||||
const original = 'prefix needle suffix';
|
||||
const target = targetIn(original, 'needle', 'prefix ', ' suffix');
|
||||
const changed = 'needle without context\nnew paragraph\n' + original;
|
||||
const resolved = resolveSearchTarget(changed, target);
|
||||
assert.deepEqual(resolved, { from: changed.lastIndexOf('needle'), to: changed.lastIndexOf('needle') + 6 });
|
||||
assert.equal(changed.slice(resolved.from, resolved.to), target.text);
|
||||
});
|
||||
|
||||
test('does not choose an ambiguous relocated anchor or overlapping occurrence', () => {
|
||||
const original = 'prefix needle suffix';
|
||||
assert.equal(resolveSearchTarget('moved\n' + original + '\n' + original,
|
||||
targetIn(original, 'needle', 'prefix ', ' suffix')), null);
|
||||
assert.equal(resolveSearchTarget('x banana', targetIn('ana', 'ana')), null);
|
||||
});
|
||||
|
||||
test('removed matches and changed context do not fall back to a remaining word', () => {
|
||||
const original = 'prefix needle suffix';
|
||||
const target = targetIn(original, 'needle', 'prefix ', ' suffix');
|
||||
for (const changed of [
|
||||
'prefix removed suffix',
|
||||
'prefix removed suffix / different needle context',
|
||||
'PREFIX needle suffix',
|
||||
'prefix needle SUFFIX',
|
||||
]) assert.equal(resolveSearchTarget(changed, target), null);
|
||||
});
|
||||
|
||||
test('an entire-field anchor can move only when its exact text is unique', () => {
|
||||
const target = targetIn('needle', 'needle');
|
||||
assert.deepEqual(resolveSearchTarget('new needle', target), { from: 4, to: 10 });
|
||||
assert.equal(resolveSearchTarget('new needle needle', target), null);
|
||||
});
|
||||
|
||||
test('Unicode anchors preserve exact supplementary characters and source offsets', () => {
|
||||
const original = '😀 prefix 𐐀needle tail 😃';
|
||||
const target = targetIn(original, '𐐀needle', '😀 prefix ', ' tail 😃');
|
||||
const changed = 'intro 🧭\n' + original;
|
||||
assert.deepEqual(resolveSearchTarget(original, target), { from: target.start, to: target.end });
|
||||
assert.deepEqual(resolveSearchTarget(changed, target), {
|
||||
from: changed.indexOf('𐐀needle'), to: changed.indexOf('𐐀needle') + '𐐀needle'.length,
|
||||
});
|
||||
assert.equal(resolveSearchTarget(changed.replace('𐐀', '𐐨'), target), null);
|
||||
});
|
||||
|
||||
test('invalid offsets and split-surrogate targets never produce a range', () => {
|
||||
const source = '😀 needle 😃';
|
||||
const target = targetIn(source, 'needle', '😀 ', ' 😃');
|
||||
for (const invalid of [
|
||||
{ ...target, start: -1 },
|
||||
{ ...target, start: 3.5 },
|
||||
{ ...target, end: NaN },
|
||||
{ ...target, end: target.end + 1 },
|
||||
{ ...target, text: '', end: target.start },
|
||||
{ ...target, before: '\ude00 ' },
|
||||
{ ...target, after: ' \ud83d' },
|
||||
targetIn(source, '\ud83d', '', '', 0),
|
||||
targetIn(source, '\ude00', '', '', 1),
|
||||
]) assert.equal(resolveSearchTarget(source, invalid), null);
|
||||
assert.equal(resolveSearchTarget('😀', targetIn('\ud83d', '\ud83d')), null);
|
||||
});
|
||||
|
||||
test('CRLF anchors resolve against LF text without retaining old line offsets', () => {
|
||||
const original = 'lead\r\nprefix\r\nneedle\r\nsuffix\r\nend';
|
||||
const target = targetIn(original, 'needle\r\nsuffix', '\r\nprefix\r\n', '\r\nend');
|
||||
const normalized = original.replaceAll('\r\n', '\n');
|
||||
assert.deepEqual(resolveSearchTarget(original, target), { from: target.start, to: target.end });
|
||||
assert.deepEqual(resolveSearchTarget(normalized, target), {
|
||||
from: normalized.indexOf('needle'), to: normalized.indexOf('\nend'),
|
||||
});
|
||||
const lfTarget = targetIn(normalized, 'needle\nsuffix', '\nprefix\n', '\nend');
|
||||
assert.deepEqual(resolveSearchTarget(original, lfTarget), { from: target.start, to: target.end });
|
||||
});
|
||||
|
||||
test('line-ending equivalence cannot make a duplicated relocated anchor unique', () => {
|
||||
const original = 'prefix\r\nneedle\r\nsuffix';
|
||||
const target = targetIn(original, 'needle', 'prefix\r\n', '\r\nsuffix');
|
||||
assert.equal(resolveSearchTarget('moved\n' + original + '\n' + original.replaceAll('\r\n', '\n'), target), null);
|
||||
});
|
||||
|
||||
test('a target boundary inside CRLF is not relocated into an LF-only document', () => {
|
||||
const source = 'prefix\r\nneedle';
|
||||
const target = targetIn(source, '\nneedle', 'prefix\r');
|
||||
assert.equal(resolveSearchTarget(source.replaceAll('\r\n', '\n'), target), null);
|
||||
});
|
||||
|
||||
test('visible source offsets remain unchanged without a matching hidden heading', () => {
|
||||
const body = '# Note title\n\nBody 😀 match';
|
||||
const match = rangeIn(body, '😀 match');
|
||||
for (const [title, hideTitle] of [['Note title', false], ['Different title', true], [undefined, true]]) {
|
||||
assert.deepEqual(visibleSearchTarget(body, title, hideTitle, match), { markdown: body, match, hiddenTitle: false });
|
||||
}
|
||||
const laterHeading = 'Intro\n\n# Note title\n\nBody match';
|
||||
assert.deepEqual(visibleSearchTarget(laterHeading, 'Note title', true, rangeIn(laterHeading, 'match')), {
|
||||
markdown: laterHeading, match: rangeIn(laterHeading, 'match'), hiddenTitle: false,
|
||||
});
|
||||
});
|
||||
|
||||
test('hidden H1 offsets include its following blank line but preserve body matches', () => {
|
||||
const body = '# Note title\n\nBody 😀 match\n';
|
||||
const markdown = 'Body 😀 match\n';
|
||||
assert.deepEqual(visibleSearchTarget(body, 'Note title', true, rangeIn(body, '😀 match')), {
|
||||
markdown, match: rangeIn(markdown, '😀 match'), hiddenTitle: false,
|
||||
});
|
||||
assert.deepEqual(visibleSearchTarget(body, 'Note title', true, rangeIn(body, 'Note title')), {
|
||||
markdown, match: null, hiddenTitle: true,
|
||||
});
|
||||
assert.deepEqual(visibleSearchTarget(body, 'Note title', true, rangeIn(body, 'title\n\nBody')), {
|
||||
markdown, match: null, hiddenTitle: true,
|
||||
});
|
||||
});
|
||||
|
||||
test('leading blanks retain their positions while later body matches shift', () => {
|
||||
const body = ' \n\n# Note title\n\nBody match';
|
||||
const markdown = ' \n\nBody match';
|
||||
assert.deepEqual(visibleSearchTarget(body, 'Note title', true, rangeIn(body, 'match')), {
|
||||
markdown, match: rangeIn(markdown, 'match'), hiddenTitle: false,
|
||||
});
|
||||
assert.deepEqual(visibleSearchTarget(body, 'Note title', true, { from: 0, to: 1 }), {
|
||||
markdown, match: { from: 0, to: 1 }, hiddenTitle: false,
|
||||
});
|
||||
});
|
||||
|
||||
test('title-only notes hide their range, including leading-blank and missing-newline cases', () => {
|
||||
for (const body of ['# Note title', '# Note title\n', '\n\n# Note title', '\n\n# Note title\n']) {
|
||||
assert.deepEqual(visibleSearchTarget(body, 'Note title', true, rangeIn(body, 'Note title')), {
|
||||
markdown: body.startsWith('\n\n') ? '\n' : '', match: null, hiddenTitle: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
test('heading normalization preserves the existing matching-title behavior', () => {
|
||||
const body = ' ### note—title \n\nBody match';
|
||||
assert.deepEqual(visibleSearchTarget(body, 'Note_title', true, rangeIn(body, 'match')), {
|
||||
markdown: 'Body match', match: { from: 5, to: 10 }, hiddenTitle: false,
|
||||
});
|
||||
});
|
||||
|
||||
test('CRLF and bare CR become CodeMirror LF offsets before title removal', () => {
|
||||
const body = '\r\n# Note title\r\n\r\nBody 😀\r\nnext match\rend';
|
||||
const markdown = '\nBody 😀\nnext match\nend';
|
||||
assert.deepEqual(visibleSearchTarget(body, 'Note title', true, rangeIn(body, '😀\r\nnext match')), {
|
||||
markdown, match: rangeIn(markdown, '😀\nnext match'), hiddenTitle: false,
|
||||
});
|
||||
const visibleHeading = body.replace(/\r\n?/g, '\n');
|
||||
assert.deepEqual(visibleSearchTarget(body, 'Note title', false, rangeIn(body, 'match\rend')), {
|
||||
markdown: visibleHeading, match: rangeIn(visibleHeading, 'match\nend'), hiddenTitle: false,
|
||||
});
|
||||
});
|
||||
|
||||
test('visible ranges reject split surrogate pairs, split CRLF and invalid bounds', () => {
|
||||
const body = '😀\r\nword';
|
||||
for (const match of [
|
||||
{ from: 0, to: 1 }, { from: 1, to: 2 }, { from: 3, to: 5 },
|
||||
{ from: 0, to: 3 }, { from: -1, to: 1 }, { from: 2, to: 100 },
|
||||
{ from: 4, to: 4 }, { from: 4.5, to: 6 },
|
||||
]) assert.deepEqual(visibleSearchTarget(body, undefined, false, match), {
|
||||
markdown: '😀\nword', match: null, hiddenTitle: false,
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,102 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { EditorSelection } from '@codemirror/state';
|
||||
import { indentMore, indentLess, moveLineDown } from '@codemirror/commands';
|
||||
import { SourceController, sourceHardBreak, sourceSearchDecoration, wrapSourceSelection } from '../src/lib/editor/source/controller.ts';
|
||||
import { closestSearchMatch, findSourceMatches } from '../src/lib/editor/search.ts';
|
||||
|
||||
const options = { matchCase: false, wholeWord: false };
|
||||
const run = (editor, command) => command({ state: editor.state, dispatch: (tr) => editor.dispatch(tr) });
|
||||
|
||||
test('source edits preserve immutable save snapshots and isolate undo when another note loads', () => {
|
||||
let dirty = 0;
|
||||
const editor = new SourceController((_, edited) => { if (edited) dirty++; });
|
||||
editor.load('# First\r\n日本語 😀\r\n');
|
||||
const saved = editor.state.doc;
|
||||
editor.select(saved.length);
|
||||
editor.replace('tail', saved.length);
|
||||
assert.equal(saved.toString(), '# First\n日本語 😀\n');
|
||||
assert.equal(editor.state.doc.toString(), '# First\n日本語 😀\ntail');
|
||||
assert.equal(dirty, 1);
|
||||
assert.equal(editor.undo(), true);
|
||||
assert.equal(editor.state.doc.toString(), saved.toString());
|
||||
assert.equal(editor.redo(), true);
|
||||
assert.equal(editor.state.doc.toString(), '# First\n日本語 😀\ntail');
|
||||
editor.load('Second note');
|
||||
assert.equal(editor.undo(), false);
|
||||
assert.equal(editor.state.doc.toString(), 'Second note');
|
||||
});
|
||||
|
||||
test('source pair wrapping keeps backwards Unicode selection and undo restores it', () => {
|
||||
const editor = new SourceController();
|
||||
editor.load('before 日本語😀 after');
|
||||
editor.dispatch({ selection: EditorSelection.single(12, 7) });
|
||||
editor.dispatch(wrapSourceSelection(editor.state, '('));
|
||||
assert.equal(editor.state.doc.toString(), 'before (日本語😀) after');
|
||||
assert.equal(editor.state.selection.main.anchor, 13);
|
||||
assert.equal(editor.state.selection.main.head, 8);
|
||||
assert.equal(editor.state.sliceDoc(8, 13), '日本語😀');
|
||||
editor.undo();
|
||||
assert.equal(editor.state.doc.toString(), 'before 日本語😀 after');
|
||||
assert.equal(editor.state.selection.main.anchor, 12);
|
||||
assert.equal(editor.state.selection.main.head, 7);
|
||||
});
|
||||
|
||||
test('hard breaks, indentation and line moves are undoable and respect read-only mode', () => {
|
||||
const editor = new SourceController();
|
||||
editor.load('first\nsecond');
|
||||
editor.select(5);
|
||||
assert.equal(run(editor, sourceHardBreak), true);
|
||||
assert.equal(editor.state.doc.toString(), 'first \n\nsecond');
|
||||
editor.undo();
|
||||
editor.select(1);
|
||||
run(editor, indentMore);
|
||||
assert.equal(editor.state.doc.toString(), '\tfirst\nsecond');
|
||||
run(editor, indentLess);
|
||||
run(editor, moveLineDown);
|
||||
assert.equal(editor.state.doc.toString(), 'second\nfirst');
|
||||
editor.configure(true, true);
|
||||
const before = editor.state.doc;
|
||||
assert.equal(run(editor, sourceHardBreak), false);
|
||||
assert.equal(run(editor, indentMore), false);
|
||||
assert.equal(run(editor, moveLineDown), false);
|
||||
assert.equal(wrapSourceSelection(editor.state, '['), null);
|
||||
assert.equal(editor.state.doc, before);
|
||||
});
|
||||
|
||||
test('live source search maps the current occurrence without resetting caret or dirty state', () => {
|
||||
let changes = 0;
|
||||
let anchor = 0;
|
||||
const editor = new SourceController((mapping) => { changes++; anchor = mapping.mapPos(anchor); });
|
||||
editor.load('İ 😀 中文 cat cat');
|
||||
let matches = findSourceMatches(editor.state.doc.toString(), 'cat', options);
|
||||
anchor = matches[1].from;
|
||||
editor.highlight(matches[1], true);
|
||||
assert.equal(changes, 0);
|
||||
editor.replace('prefix ', 0, 0);
|
||||
const selection = editor.state.selection;
|
||||
matches = findSourceMatches(editor.state.doc.toString(), 'cat', options);
|
||||
const index = closestSearchMatch(matches, anchor);
|
||||
assert.equal(index, 1);
|
||||
editor.highlight(matches[index]);
|
||||
assert.equal(editor.state.selection, selection);
|
||||
assert.equal(changes, 1);
|
||||
const ranges = [];
|
||||
editor.state.field(sourceSearchDecoration).between(0, editor.state.doc.length, (from, to) => ranges.push({ from, to }));
|
||||
assert.deepEqual(ranges, [matches[1]]);
|
||||
editor.undo();
|
||||
matches = findSourceMatches(editor.state.doc.toString(), 'cat', options);
|
||||
assert.equal(closestSearchMatch(matches, anchor), 1);
|
||||
});
|
||||
|
||||
test('asset representation updates do not clear edits or become their own undo steps', () => {
|
||||
let dirty = 0;
|
||||
const editor = new SourceController((_, edited) => { if (edited) dirty++; });
|
||||
editor.load('');
|
||||
editor.replace(' user edit', editor.state.doc.length);
|
||||
editor.replace('.helixnotes/attachments/image.png', 9, 19, true);
|
||||
assert.equal(dirty, 1);
|
||||
assert.equal(editor.state.doc.toString(), ' user edit');
|
||||
editor.undo();
|
||||
assert.equal(editor.state.doc.toString(), '');
|
||||
});
|
||||
@@ -0,0 +1,42 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFile } from 'node:fs/promises';
|
||||
import test from 'node:test';
|
||||
|
||||
const source = await readFile(
|
||||
new URL('../src/lib/components/SettingsPanel.svelte', import.meta.url),
|
||||
'utf8'
|
||||
);
|
||||
const initialization = source.match(
|
||||
/(const\s+themePresets\s*=\s*\[[\s\S]*?\];)[\s\S]*?(?=\bconst\s+accentPresets\s*=)/
|
||||
);
|
||||
assert.ok(initialization, 'theme presets initialization was not found');
|
||||
|
||||
// Evaluate only the trusted repository declaration and its initialization code.
|
||||
const unsorted = new Function(`${initialization[1]}\nreturn themePresets;`)();
|
||||
const presets = new Function(`${initialization[0]}\nreturn themePresets;`)();
|
||||
|
||||
test('pins System, Light, and Dark in that exact order', () => {
|
||||
assert.deepEqual(presets.slice(0, 3).map(({ id, label }) => ({ id, label })), [
|
||||
{ id: 'system', label: 'System' },
|
||||
{ id: 'light', label: 'Light' },
|
||||
{ id: 'dark', label: 'Dark' }
|
||||
]);
|
||||
});
|
||||
|
||||
test('orders remaining built-in labels alphabetically, including Rosé Pine', () => {
|
||||
const labels = presets.slice(3).map((preset) => preset.label);
|
||||
assert.ok(labels.includes('Rosé Pine'));
|
||||
assert.deepEqual(labels, [...labels].sort());
|
||||
});
|
||||
|
||||
test('preserves every theme ID, label, and color without duplicates', () => {
|
||||
assert.equal(presets.length, unsorted.length);
|
||||
for (const themes of [unsorted, presets]) {
|
||||
assert.equal(new Set(themes.map((preset) => preset.id)).size, themes.length);
|
||||
assert.equal(new Set(themes.map((preset) => preset.label)).size, themes.length);
|
||||
}
|
||||
assert.deepEqual(
|
||||
Object.fromEntries(presets.map((preset) => [preset.id, preset])),
|
||||
Object.fromEntries(unsorted.map((preset) => [preset.id, preset]))
|
||||
);
|
||||
});
|
||||
@@ -0,0 +1,74 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
|
||||
const { restoreTitleHeading, stripTitleHeading } = await import(
|
||||
new URL('../src/lib/editor/titleVisibility.ts', import.meta.url)
|
||||
);
|
||||
|
||||
test('keeps a hidden title through source to rich to source and save', () => {
|
||||
const persisted = '# Note title\n\n## Something else\n\nBody\n';
|
||||
const body = '## Something else\n\nBody\n';
|
||||
|
||||
const initialSource = stripTitleHeading(persisted, 'Note title', true);
|
||||
const rich = stripTitleHeading(
|
||||
restoreTitleHeading(initialSource.markdown, initialSource.hiddenTitle),
|
||||
'Note title',
|
||||
true
|
||||
);
|
||||
const toggledSource = stripTitleHeading(
|
||||
restoreTitleHeading(rich.markdown, rich.hiddenTitle),
|
||||
'Note title',
|
||||
true
|
||||
);
|
||||
|
||||
assert.equal(rich.markdown, body);
|
||||
assert.equal(toggledSource.markdown, body);
|
||||
assert.equal(restoreTitleHeading(toggledSource.markdown, toggledSource.hiddenTitle), persisted);
|
||||
});
|
||||
|
||||
test('keeps a title-only note visually empty and saves one title heading', () => {
|
||||
const initialSource = stripTitleHeading('# Note title\n', 'Note title', true);
|
||||
const rich = stripTitleHeading(
|
||||
restoreTitleHeading(initialSource.markdown, initialSource.hiddenTitle),
|
||||
'Note title',
|
||||
true
|
||||
);
|
||||
const saved = restoreTitleHeading(rich.markdown, rich.hiddenTitle);
|
||||
|
||||
assert.equal(initialSource.markdown, '');
|
||||
assert.equal(rich.markdown, '');
|
||||
assert.equal((saved.match(/^# Note title$/gm) ?? []).length, 1);
|
||||
});
|
||||
|
||||
test('replaces hidden title state when an unrelated note loads', () => {
|
||||
const markdown = '## Something else\n\nOther body\n';
|
||||
|
||||
assert.deepEqual(stripTitleHeading(markdown, 'Another note', true), {
|
||||
markdown,
|
||||
hiddenTitle: null
|
||||
});
|
||||
});
|
||||
|
||||
test('leaves the title visible when title hiding is disabled', () => {
|
||||
const persisted = '# Note title\n\n## Something else\n';
|
||||
|
||||
assert.deepEqual(stripTitleHeading(persisted, 'Note title', false), {
|
||||
markdown: persisted,
|
||||
hiddenTitle: null
|
||||
});
|
||||
});
|
||||
|
||||
test('reports the exact contiguous range removed without changing leading blank behavior', () => {
|
||||
for (const [markdown, expected, removedRange] of [
|
||||
['# Note title\n\nBody', 'Body', { from: 0, to: 14 }],
|
||||
['\n# Note title\nBody', '\nBody', { from: 1, to: 14 }],
|
||||
['\n\n# Note title', '\n', { from: 1, to: 14 }],
|
||||
['\n\n# Note title\n', '\n', { from: 1, to: 15 }],
|
||||
['# Note title\r\n\r\nBody', 'Body', { from: 0, to: 16 }],
|
||||
]) {
|
||||
const stripped = stripTitleHeading(markdown, 'Note title', true);
|
||||
assert.equal(stripped.markdown, expected);
|
||||
assert.deepEqual(stripped.removedRange, removedRange);
|
||||
assert.equal(markdown.slice(0, removedRange.from) + markdown.slice(removedRange.to), expected);
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,48 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { moveToolbarButton, resolveToolbarLayout } from '../src/lib/editor/toolbar.ts';
|
||||
|
||||
const layout = () => Object.freeze({
|
||||
main: Object.freeze(['bold', 'italic', 'link']),
|
||||
more: Object.freeze(['table', 'quote']),
|
||||
});
|
||||
|
||||
test('moving a button between toolbar and More preserves the other buttons and their order', () => {
|
||||
const original = layout();
|
||||
assert.deepEqual(moveToolbarButton(original, 'italic', 'more', 1), {
|
||||
main: ['bold', 'link'], more: ['table', 'italic', 'quote'],
|
||||
});
|
||||
assert.deepEqual(moveToolbarButton(original, 'quote', 'main', 1), {
|
||||
main: ['bold', 'quote', 'italic', 'link'], more: ['table'],
|
||||
});
|
||||
});
|
||||
|
||||
test('reordering uses insertion gaps before removing the dragged button', () => {
|
||||
const original = layout();
|
||||
assert.deepEqual(moveToolbarButton(original, 'bold', 'main', 3).main, ['italic', 'link', 'bold']);
|
||||
assert.deepEqual(moveToolbarButton(original, 'link', 'main', 0).main, ['link', 'bold', 'italic']);
|
||||
assert.deepEqual(moveToolbarButton(original, 'table', 'more', 2).more, ['quote', 'table']);
|
||||
});
|
||||
|
||||
test('self drops, boundary moves and stale dragged buttons leave the layout unchanged', () => {
|
||||
const original = layout();
|
||||
assert.equal(moveToolbarButton(original, 'italic', 'main', 1), original);
|
||||
assert.equal(moveToolbarButton(original, 'italic', 'main', 2), original);
|
||||
assert.equal(moveToolbarButton(original, 'bold', 'main', -1), original);
|
||||
assert.equal(moveToolbarButton(original, 'link', 'main', 4), original);
|
||||
assert.equal(moveToolbarButton(original, 'heading', 'more', 0), original);
|
||||
});
|
||||
|
||||
test('saved layouts keep user order without duplicate or unavailable buttons and expose newly available controls', () => {
|
||||
const saved = Object.freeze({
|
||||
main: Object.freeze(['table', 'bold', 'bold', 'removed-command']),
|
||||
more: Object.freeze(['bold', 'italic', 'italic']),
|
||||
});
|
||||
const resolved = resolveToolbarLayout(saved, false, false);
|
||||
assert.deepEqual(resolved.main.slice(0, 2), ['table', 'bold']);
|
||||
assert.deepEqual(resolved.more, ['italic']);
|
||||
assert.ok(resolved.main.includes('link'));
|
||||
assert.equal(resolved.main.includes('removed-command'), false);
|
||||
const buttons = [...resolved.main, ...resolved.more];
|
||||
assert.equal(new Set(buttons).size, buttons.length);
|
||||
});
|
||||
Reference in new issue
Block a user