mirror of
https://gitlab.com/ArkHost/HelixNotes.git
synced 2026-11-21 11:04:56 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
458bff3eac | ||
|
|
882006feb7 | ||
|
|
d5dc7147ab | ||
|
|
59b171af0a | ||
|
|
d36ac5e9fa | ||
|
|
4787559af5 | ||
|
|
ceb3a7d647 | ||
|
|
b9074ec550 | ||
|
|
c8277bb01c | ||
|
|
17f1af4294 | ||
|
|
fbabcf5099 | ||
|
|
338db1e7b0 | ||
|
|
ac4b85fd0f | ||
|
|
6716fec63a | ||
|
|
237bf799e3 | ||
|
|
77164427f1 | ||
|
|
523d1a5511 | ||
|
|
6ecde99f25 | ||
|
|
a466df85ed | ||
|
|
3858f8e455 | ||
|
|
64266969f3 | ||
|
|
a80425e084 | ||
|
|
2d554c6a9d | ||
|
|
1676f9fbd1 | ||
|
|
3c8b320892 | ||
|
|
b5189cf0e5 | ||
|
|
3d21a74d24 | ||
|
|
3b59d34fed | ||
|
|
c7bcb993bb | ||
|
|
4e2c87434d | ||
|
|
76919d6f1c | ||
|
|
5e49051ecb | ||
|
|
a6798d31e2 | ||
|
|
648cf48dcc | ||
|
|
3a9cae27c4 | ||
|
|
31d19a9faf | ||
|
|
d8e6228f13 | ||
|
|
48e39a0cbc | ||
|
|
2ddefc51e4 | ||
|
|
557f625947 | ||
|
|
043d2bd6c4 | ||
|
|
7100ac637c | ||
|
|
c0058f43f4 | ||
|
|
6986546f20 | ||
|
|
578bf9d253 | ||
|
|
94b477d072 | ||
|
|
5b21e1c3a1 | ||
|
|
630e6ea878 | ||
|
|
1289e865ce | ||
|
|
0f946ca330 | ||
|
|
39c56f7e13 | ||
|
|
8f07a24d62 | ||
|
|
9b8602e20f | ||
|
|
90795bea73 | ||
|
|
66fe9c8344 | ||
|
|
05249a3c81 | ||
|
|
af35b4dd75 | ||
|
|
b8821dd6fb | ||
|
|
5185f9a040 | ||
|
|
7db8d3f9d3 | ||
|
|
9f9c7e6c07 | ||
|
|
1ad948d4f0 | ||
|
|
6341fa8c9b | ||
|
|
21ab7ac49e | ||
|
|
3b25992a15 | ||
|
|
33514f28c9 | ||
|
|
6e2165661c | ||
|
|
e168f4e004 | ||
|
|
2014365e4a | ||
|
|
8df5efacb8 | ||
|
|
f87b8af238 | ||
|
|
f0bf0ac5e3 | ||
|
|
0ecacbe1dd | ||
|
|
455b059fb5 | ||
|
|
f4c6649c0a | ||
|
|
6c4d1c2e93 | ||
|
|
32b1e091fd | ||
|
|
9aa9ca7d3e | ||
|
|
0b94d9ff32 | ||
|
|
bd86fb8a4d | ||
|
|
ec479ced8e | ||
|
|
add45ad9dd | ||
|
|
076234974a | ||
|
|
6d9b29343f | ||
|
|
504461bfe7 | ||
|
|
4aa72e4c76 | ||
|
|
ea4a5eae26 | ||
|
|
8d3338ef89 | ||
|
|
b2c306d69f | ||
|
|
ac2c0aef94 | ||
|
|
f07241dd3a | ||
|
|
14b2a3e8a2 | ||
|
|
505ed2b890 | ||
|
|
b03d7fd12c |
No files matched your search
@@ -0,0 +1,3 @@
|
||||
[submodule "packaging/flatpak/shared-modules"]
|
||||
path = packaging/flatpak/shared-modules
|
||||
url = https://github.com/flathub/shared-modules.git
|
||||
@@ -1,7 +1,7 @@
|
||||
# HelixNotes
|
||||
|
||||
[](https://gitlab.com/ArkHost/HelixNotes/-/blob/main/LICENSE)
|
||||
[](https://gitlab.com/ArkHost/HelixNotes/-/releases/v1.3.5)
|
||||
[](https://gitlab.com/ArkHost/HelixNotes/-/releases/v1.3.6)
|
||||
[](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.5)
|
||||
## Download (v1.3.6)
|
||||
|
||||
### 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.5/HelixNotes_1.3.5_amd64.AppImage)
|
||||
[Download AppImage](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_amd64.AppImage)
|
||||
|
||||
#### Distro-specific packages
|
||||
|
||||
@@ -108,18 +108,18 @@ sudo eopkg it helixnotes
|
||||
|
||||
#### Manual package downloads
|
||||
|
||||
- [.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)
|
||||
- [.deb](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_amd64.deb) (Ubuntu 22.04+)
|
||||
- [.rpm](https://download.helixnotes.com/releases/v1.3.6/HelixNotes-1.3.6-1.x86_64.rpm)
|
||||
|
||||
### Windows
|
||||
|
||||
[Download Installer](https://download.helixnotes.com/releases/v1.3.5/HelixNotes_1.3.5_x64-setup.exe) (Windows 10/11)
|
||||
[Download Installer](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_x64-setup.exe) (Windows 10/11)
|
||||
|
||||
### macOS
|
||||
|
||||
[Download .dmg (Apple Silicon)](https://download.helixnotes.com/releases/v1.3.5/HelixNotes_1.3.5_aarch64.dmg) (M-series Macs)
|
||||
[Download .dmg (Apple Silicon)](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_aarch64.dmg) (M-series Macs)
|
||||
|
||||
[Download .dmg (Intel)](https://download.helixnotes.com/releases/v1.3.5/HelixNotes_1.3.5_x64.dmg)
|
||||
[Download .dmg (Intel)](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_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:
|
||||
|
||||
@@ -129,7 +129,7 @@ xattr -cr /Applications/HelixNotes.app
|
||||
|
||||
### Android
|
||||
|
||||
[Download APK](https://download.helixnotes.com/releases/v1.3.5/HelixNotes_1.3.5_android.apk)
|
||||
[Download APK](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_android.apk)
|
||||
|
||||
---
|
||||
|
||||
@@ -138,24 +138,44 @@ All releases: [gitlab.com/ArkHost/HelixNotes/-/releases](https://gitlab.com/ArkH
|
||||
## Features
|
||||
|
||||
- Markdown editor with toolbar, slash commands, source mode, code highlighting
|
||||
- **Tasks view**: aggregate `- [ ]` checklists from across all notes, set priority and due dates, work in a list or a calendar (drag a task to reschedule)
|
||||
- **Tasks view**: aggregate `- [ ]` checklists from across all notes, set priority and due dates, filter Today or Overdue tasks, work in a list or a calendar (drag a task to reschedule)
|
||||
- `[[Wiki-links]]` and graph view
|
||||
- Full-text search (Tantivy), CJK-aware for Chinese, Japanese, and Korean
|
||||
- Outline panel, daily notes with calendar view, tags with autocomplete, drag-and-drop
|
||||
- Live KaTeX math editor (`/math`, `/imath`) with modal preview, double-click to edit
|
||||
- Mermaid diagrams (opt-in render, copy as PNG, save as PNG/SVG)
|
||||
- Encrypted secret blocks (`/secret`) stored as portable `helix-secret` markdown fences
|
||||
- Insert date/time (`/date`, `/time`, `/now`), color swatches (`/color`), configurable week start
|
||||
- Insert date/time (`/date`, `/time`, `/now`) with 12-hour or 24-hour timestamps, color swatches (`/color`), configurable week start
|
||||
- Manual notebook sorting (drag to reorder above, into, or below)
|
||||
- External `.md` viewer mode with import-to-vault flow
|
||||
- PDF preview, Obsidian import, "Show in File Manager"
|
||||
- AI writing tools (Ollama / OpenAI-compatible / Anthropic / OpenAI)
|
||||
- **Optional WebDAV sync** to your own server (Nextcloud, ownCloud, a NAS): manual or automatic, with keep-both conflict copies
|
||||
- Version history with diffs, automatic backups
|
||||
- Version history with main-area diffs and rendered read-only snapshots, automatic backups
|
||||
- Multi-window, file associations, focus mode, view mode
|
||||
- Themes (light, dark, and 14 palettes), accent colors, fonts, 80-200% interface scale
|
||||
- Themes (light, dark, and 14 palettes), accent colors, fonts including bundled Ubuntu and Ubuntu Mono, 80-200% interface scale
|
||||
- Local plain-text files, no company cloud
|
||||
|
||||
### Version history
|
||||
|
||||
Changes compares the selected snapshot with the current editor contents, including unsaved edits. Added and removed lines show what restoring that version would change; long unchanged sections can be expanded.
|
||||
|
||||
Snapshot displays the stored note read-only, with View source available for its Markdown body. Metadata is separate and is not restored. Snapshot links are inactive, secrets stay locked, and diagrams render only when requested.
|
||||
|
||||
Restore replaces the current note's body and asks for confirmation if it would replace an unsaved draft. Inspecting versions does not replace the live editor contents or reset their undo history.
|
||||
|
||||
### Note Info
|
||||
|
||||
Open **Note info** from the editor toolbar. Expand **Frontmatter** to inspect the original YAML header, including custom keys, without editing it. This shows the last loaded or saved metadata; unsaved changes are not included, and the display updates after saving.
|
||||
|
||||
### Saving notes
|
||||
|
||||
Notes autosave after three seconds without edits. During continuous typing, a save is queued at least every ten seconds. Ctrl+S (Cmd+S on macOS), switching notes, and closing an editor flush pending changes immediately. A failed save leaves the note marked **Unsaved** and blocks leaving that editor.
|
||||
|
||||
Note writes run off the UI thread and replace the file atomically. Unchanged notes are not rewritten. Ordinary saves update only the affected note in the list, wiki-link cache, and Tasks view; search-index updates are batched in the background. External file changes are still picked up by the watcher.
|
||||
|
||||
With **Close to tray** enabled and a tray icon available, closing the main window hides it after saving. With the setting off, closing the main window closes the application. The close-to-tray setting takes effect immediately; enabling the tray icon itself requires a restart. Explicit **Quit** exits rather than hiding to the tray.
|
||||
|
||||
Full documentation: [helixnotes.com/docs](https://helixnotes.com/docs.html)
|
||||
|
||||
## Tech Stack
|
||||
|
||||
+3
-1
@@ -2,7 +2,7 @@
|
||||
"name": "helixnotes",
|
||||
"private": true,
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"version": "1.3.6",
|
||||
"version": "1.3.7",
|
||||
"type": "module",
|
||||
"packageManager": "pnpm@11.18.0",
|
||||
"scripts": {
|
||||
@@ -69,6 +69,8 @@
|
||||
"@tiptap/starter-kit": "^3.19.0",
|
||||
"@types/katex": "^0.16.8",
|
||||
"@types/markdown-it": "^14.1.2",
|
||||
"diff": "^9.0.0",
|
||||
"dompurify": "^3.4.13",
|
||||
"highlight.js": "^11.11.1",
|
||||
"katex": "^0.16.28",
|
||||
"lowlight": "^3.3.0",
|
||||
|
||||
@@ -0,0 +1,169 @@
|
||||
# Flatpak
|
||||
|
||||
This builds the Git revision pinned in the manifest inside the GNOME 51 SDK. Rust
|
||||
and Node dependencies are pinned by the existing lockfiles and downloaded before
|
||||
the sandboxed, offline build. The shared-modules submodule supplies the Ayatana
|
||||
tray libraries.
|
||||
|
||||
## ArkHost repository
|
||||
|
||||
HelixNotes is distributed through ArkHost's signed Flatpak repository at
|
||||
`https://repo.arkhost.com/flatpak/`, served by Shiny. Install using
|
||||
[HelixNotes.flatpakref](https://repo.arkhost.com/flatpak/HelixNotes.flatpakref).
|
||||
The public catalog advertises version 1.3.7.
|
||||
|
||||
The application ID is `com.helixnotes.HelixNotes`; the repository collection ID is
|
||||
`com.arkhost.Flatpak`. Keep both stable so installed applications receive future
|
||||
updates from the same repository.
|
||||
|
||||
Signing fingerprint: `B66171BA8BBE0F590D067B86D02631809E3F7AE2`.
|
||||
The initial publication was checked using a separate temporary Flatpak store:
|
||||
the install descriptor, catalog version, signatures and package download passed.
|
||||
That check did not deploy or launch the application.
|
||||
|
||||
`prepare-repository.py` imports a built bundle, prepares AppStream metadata and
|
||||
static deltas, and signs the application and repository metadata with an OpenPGP
|
||||
key. It exports only the public key. The signing key stays in the local keyring.
|
||||
Keep an offline backup of that permanent signing identity.
|
||||
|
||||
After building the bundle, prepare a fresh signed output:
|
||||
|
||||
```sh
|
||||
python3 packaging/flatpak/prepare-repository.py \
|
||||
src-tauri/target/flatpak/HelixNotes_1.3.7_x86_64.flatpak \
|
||||
--output /path/to/arkhost-flatpak-1.3.7 \
|
||||
--gpg-key FULL_OPENPGP_FINGERPRINT
|
||||
```
|
||||
|
||||
The script uses the `ostree` command when available, or the system's OSTree
|
||||
GObject bindings to initialize repositories. This Fedora workstation already
|
||||
has those bindings. For subsequent releases, add
|
||||
`--previous-directory /path/to/previous-output` to preserve the publication
|
||||
history. Always choose a new output directory.
|
||||
|
||||
If the signing identity is not ready, `--unsigned` can replace `--gpg-key` for a
|
||||
local preview. The output will be visibly marked as unsigned and will contain no
|
||||
install descriptors.
|
||||
|
||||
The signed output contains:
|
||||
|
||||
```text
|
||||
repo/ Application repository and update metadata
|
||||
arkhost.flatpakrepo Adds the ArkHost remote
|
||||
HelixNotes.flatpakref Adds the remote and installs HelixNotes
|
||||
```
|
||||
|
||||
Unsigned staging omits install links and is not a publishable repository. Keep
|
||||
the previous signed output when preparing an update so repository history and
|
||||
delta updates are retained.
|
||||
|
||||
Publish the prepared public files under
|
||||
`/srv/www/repo.arkhost.com/flatpak/` on Shiny using the existing repository
|
||||
deployment workflow. The publisher prepares local files; it does not connect to
|
||||
Shiny or change its web configuration. Serve the tree over HTTPS with HTTP
|
||||
keep-alive enabled. Keep repository summaries and install descriptors fresh in
|
||||
any HTTP cache; content-addressed objects can be cached longer.
|
||||
Keep updates scoped to this `flatpak/` subtree. APT/RPM deployments must preserve
|
||||
it, and Flatpak deployments must preserve the other repository subtrees.
|
||||
|
||||
HelixNotes and its updates come from ArkHost. The shared GNOME runtime continues
|
||||
to come from its existing upstream repository. Users install through
|
||||
`HelixNotes.flatpakref` and receive updates through Discover, GNOME Software or
|
||||
`flatpak update`.
|
||||
|
||||
## Build
|
||||
|
||||
Run from the repository root:
|
||||
|
||||
```sh
|
||||
git submodule update --init packaging/flatpak/shared-modules
|
||||
flatpak install --user flathub org.flatpak.Builder org.gnome.Platform//51 org.gnome.Sdk//51 org.freedesktop.Sdk.Extension.node24//26.08 org.freedesktop.Sdk.Extension.rust-stable//26.08
|
||||
flatpak run org.flatpak.Builder --user --force-clean --collection-id=com.arkhost.Flatpak --state-dir=src-tauri/target/flatpak/state --repo=src-tauri/target/flatpak/arkhost-origin src-tauri/target/flatpak/build packaging/flatpak/com.helixnotes.HelixNotes.yml
|
||||
flatpak build-bundle src-tauri/target/flatpak/arkhost-origin src-tauri/target/flatpak/HelixNotes_1.3.7_x86_64.flatpak com.helixnotes.HelixNotes stable --runtime-repo=https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||
```
|
||||
|
||||
The commands require a user-local Flathub remote. If only a system remote exists,
|
||||
add the user remote first:
|
||||
|
||||
```sh
|
||||
flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||
```
|
||||
|
||||
## Install and run
|
||||
|
||||
```sh
|
||||
flatpak install --user https://repo.arkhost.com/flatpak/HelixNotes.flatpakref
|
||||
flatpak run com.helixnotes.HelixNotes
|
||||
```
|
||||
|
||||
Choose vault folders using the folder picker. Flatpak grants access to the chosen
|
||||
folders through its document portal; the package does not request access to the
|
||||
whole home directory. Its settings are separate from native installations.
|
||||
The document portal does not forward external file-change notifications, so this
|
||||
build checks visible notes and notebooks about every two seconds in small vaults.
|
||||
The interval grows with scan cost in larger vaults to limit background CPU use.
|
||||
It compares file size and precise modification/change timestamps, including changes made
|
||||
while preserving a note's modification time. Attachments and hidden app data are
|
||||
excluded from these scans; note contents are read only when a change is detected.
|
||||
|
||||
The build sets `HELIXNOTES_INSTALL_TYPE=flatpak`, which suppresses the in-app
|
||||
updater. Discover, GNOME Software or `flatpak update` handle updates for installs
|
||||
from the ArkHost repository. The bundle references Flathub for its runtime, which
|
||||
is installed separately.
|
||||
|
||||
## Refresh dependencies
|
||||
|
||||
Regenerate both source lists whenever their lockfiles change. The initial lists
|
||||
were generated with flatpak-builder-tools commit
|
||||
`9d86d336a39b9af38b86f114b6ce5820fe260f91`:
|
||||
|
||||
```sh
|
||||
uv run --project /path/to/flatpak-builder-tools/node python -m flatpak_node_generator --no-requests-cache --pnpm-store-version v11 --node-sdk-extension org.freedesktop.Sdk.Extension.node24//26.08 -o packaging/flatpak/node-sources.json pnpm pnpm-lock.yaml
|
||||
uv run /path/to/flatpak-builder-tools/cargo/flatpak-cargo-generator.py -o packaging/flatpak/cargo-sources.json src-tauri/Cargo.lock
|
||||
```
|
||||
|
||||
Keep the pinned pnpm archive/version in the manifest in step with
|
||||
`package.json`'s `packageManager`. pnpm 11 uses the v11 store; the generator's
|
||||
default v10 store does not work with it.
|
||||
|
||||
The offline install uses `--trust-lockfile` for this reviewed, pinned lockfile.
|
||||
Flatpak verifies the downloaded sources against the generated checksums. This
|
||||
keeps pnpm from querying registry metadata and attestations during the offline
|
||||
build; it does not grant network access to the build sandbox.
|
||||
|
||||
The store developer is Yuri Karamian. The Flatpak build overrides Tauri's
|
||||
identifier only for this package; native packages retain their existing ID.
|
||||
|
||||
Version 1.3.7 is published in the ArkHost Flatpak repository with stable package
|
||||
metadata dated 2026-11-10. GitLab release tags and other platform channels are
|
||||
managed separately. Keep the manifest pinned to the matching source revision.
|
||||
|
||||
The published package targets x86_64. The earlier test bundle in Nextcloud uses
|
||||
the `com.helixnotes.app` ID and has not been overwritten. Install through the
|
||||
public link once to use the permanent ID and receive repository updates. The new
|
||||
ID has a separate Flatpak profile; select the same notes folder through the system
|
||||
picker.
|
||||
|
||||
## Optional Flathub submission
|
||||
|
||||
The separate Flathub submission draft has not been checked with Flathub's build
|
||||
wrapper or linter. See the [submission guide](https://docs.flathub.org/docs/for-app-authors/submission)
|
||||
and [current requirements](https://docs.flathub.org/docs/for-app-authors/requirements).
|
||||
|
||||
The Flathub repository needs these files at its root:
|
||||
|
||||
- `com.helixnotes.HelixNotes.yml`
|
||||
- `cargo-sources.json`
|
||||
- `node-sources.json`
|
||||
- `flathub.json`
|
||||
- The `shared-modules` Git submodule, pinned to
|
||||
`6be1f986ac28a2b7d745e5ff45a3f8a2d3345083`
|
||||
|
||||
Desktop, icon and MetaInfo files are installed from the pinned application source.
|
||||
The source currently includes the packaging metadata and the Flatpak watcher fix.
|
||||
It is a preparation revision, not a published v1.3.7 release tag.
|
||||
|
||||
Use a branch based on `flathub/flathub`'s `new-pr` branch. Preserve the upstream
|
||||
submission template. Author the submission description and any review replies
|
||||
yourself, following Flathub's current requirements. This preparation does not
|
||||
create a GitHub pull request or publish an application.
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,10 @@
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=HelixNotes
|
||||
Comment=Write and organize local Markdown notes
|
||||
Exec=helixnotes %f
|
||||
Icon=com.helixnotes.HelixNotes
|
||||
Terminal=false
|
||||
Categories=Office;
|
||||
MimeType=text/markdown;text/x-markdown;
|
||||
Keywords=Markdown;tasks;wiki;
|
||||
@@ -0,0 +1,45 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright 2026 Yuri Karamian -->
|
||||
<component type="desktop-application">
|
||||
<id>com.helixnotes.HelixNotes</id>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<project_license>AGPL-3.0-or-later</project_license>
|
||||
<name>HelixNotes</name>
|
||||
<summary>Write and organize local Markdown notes</summary>
|
||||
<developer id="com.helixnotes">
|
||||
<name>Yuri Karamian</name>
|
||||
</developer>
|
||||
<description>
|
||||
<p>HelixNotes keeps your notes as Markdown files in a folder you choose.
|
||||
Organize them into notebooks, add tags, link related notes and search across
|
||||
your collection.</p>
|
||||
<p>The Tasks view brings together checklists from your notes in a list or
|
||||
calendar.</p>
|
||||
</description>
|
||||
<launchable type="desktop-id">com.helixnotes.HelixNotes.desktop</launchable>
|
||||
<url type="homepage">https://helixnotes.com</url>
|
||||
<url type="vcs-browser">https://gitlab.com/ArkHost/HelixNotes</url>
|
||||
<url type="bugtracker">https://gitlab.com/ArkHost/HelixNotes/-/issues</url>
|
||||
<content_rating type="oars-1.1"/>
|
||||
<releases>
|
||||
<release version="1.3.7" type="stable" date="2026-11-10">
|
||||
<description>
|
||||
<p>Add notebook and tag icons, ten themes, mobile layout fixes and a
|
||||
Flatpak package.</p>
|
||||
</description>
|
||||
</release>
|
||||
</releases>
|
||||
<provides>
|
||||
<binary>helixnotes</binary>
|
||||
</provides>
|
||||
<screenshots>
|
||||
<screenshot type="default">
|
||||
<caption>Markdown editor</caption>
|
||||
<image type="source">https://cdn.helixnotes.com/assets/screenshots/screenshot-1.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<caption>Tasks calendar</caption>
|
||||
<image type="source">https://cdn.helixnotes.com/assets/screenshots/screenshot-2.png</image>
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
</component>
|
||||
@@ -0,0 +1,71 @@
|
||||
app-id: com.helixnotes.HelixNotes
|
||||
runtime: org.gnome.Platform
|
||||
runtime-version: '51'
|
||||
sdk: org.gnome.Sdk
|
||||
branch: stable
|
||||
command: helixnotes
|
||||
sdk-extensions:
|
||||
- org.freedesktop.Sdk.Extension.node24
|
||||
- org.freedesktop.Sdk.Extension.rust-stable
|
||||
|
||||
finish-args:
|
||||
- --socket=wayland
|
||||
- --socket=fallback-x11
|
||||
- --share=ipc
|
||||
- --device=dri
|
||||
- --share=network
|
||||
- --filesystem=xdg-run/tray-icon:create
|
||||
- --talk-name=org.kde.StatusNotifierWatcher
|
||||
- --talk-name=org.freedesktop.FileManager1
|
||||
|
||||
build-options:
|
||||
append-path: /usr/lib/sdk/node24/bin:/usr/lib/sdk/rust-stable/bin
|
||||
|
||||
cleanup:
|
||||
- /include
|
||||
- /lib/pkgconfig
|
||||
- /lib/*.a
|
||||
- /lib/*.la
|
||||
|
||||
modules:
|
||||
- shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json
|
||||
|
||||
- name: pnpm
|
||||
buildsystem: simple
|
||||
build-commands:
|
||||
- mkdir -p /app/lib/pnpm /app/bin
|
||||
- cp -a . /app/lib/pnpm/
|
||||
- ln -s ../lib/pnpm/bin/pnpm.mjs /app/bin/pnpm
|
||||
cleanup:
|
||||
- '*'
|
||||
sources:
|
||||
- type: archive
|
||||
url: https://registry.npmjs.org/pnpm/-/pnpm-11.18.0.tgz
|
||||
sha256: 29c35ca8d2a287988fdee3e0f36e07d9b93783f567b579b7fd5b798a4563dd81
|
||||
|
||||
- name: helixnotes
|
||||
buildsystem: simple
|
||||
build-options:
|
||||
env:
|
||||
CARGO_HOME: /run/build/helixnotes/cargo
|
||||
CARGO_NET_OFFLINE: 'true'
|
||||
CARGO_BUILD_JOBS: '4'
|
||||
XDG_CACHE_HOME: /run/build/helixnotes/flatpak-node/cache
|
||||
HELIXNOTES_INSTALL_TYPE: flatpak
|
||||
build-commands:
|
||||
- pnpm install --offline --frozen-lockfile --trust-lockfile
|
||||
- pnpm tauri build --no-bundle --config '{"identifier":"com.helixnotes.HelixNotes"}'
|
||||
- install -Dm755 src-tauri/target/release/helixnotes /app/bin/helixnotes
|
||||
- install -Dm644 packaging/flatpak/com.helixnotes.HelixNotes.desktop /app/share/applications/com.helixnotes.HelixNotes.desktop
|
||||
- install -Dm644 packaging/flatpak/com.helixnotes.HelixNotes.metainfo.xml /app/share/metainfo/com.helixnotes.HelixNotes.metainfo.xml
|
||||
- install -Dm644 src-tauri/icons/icon.svg /app/share/icons/hicolor/scalable/apps/com.helixnotes.HelixNotes.svg
|
||||
- install -Dm644 src-tauri/icons/128x128.png /app/share/icons/hicolor/128x128/apps/com.helixnotes.HelixNotes.png
|
||||
- install -Dm644 src-tauri/icons/128x128@2x.png /app/share/icons/hicolor/256x256/apps/com.helixnotes.HelixNotes.png
|
||||
- install -Dm644 LICENSE /app/share/licenses/com.helixnotes.HelixNotes/LICENSE
|
||||
sources:
|
||||
- type: git
|
||||
url: https://gitlab.com/ArkHost/HelixNotes.git
|
||||
commit: d5dc7147ab9c8d3fa7a8ce034339e9f2a5b5e260
|
||||
disable-submodules: true
|
||||
- cargo-sources.json
|
||||
- node-sources.json
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"only-arches": ["x86_64"]
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
Executable
+235
@@ -0,0 +1,235 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Prepare a local ArkHost Flatpak repository; never upload or deploy it.
|
||||
|
||||
Signed example:
|
||||
./prepare-repository.py HelixNotes.flatpak --output /tmp/arkhost-signed \
|
||||
--gpg-key FULL_OPENPGP_FINGERPRINT
|
||||
|
||||
For an update, add --previous-directory /path/to/previous/output. Its repository
|
||||
is copied, preserving old commits and deltas; the previous output is untouched.
|
||||
The output must be a fresh directory outside the previous directory.
|
||||
|
||||
Use --unsigned for local staging while a signing key is unavailable. Unsigned
|
||||
staging produces no public-key files or installation descriptors. Prepare a new
|
||||
signed output before distribution; never disable client signature verification.
|
||||
|
||||
Requires Python 3, Flatpak, OSTree (CLI or Python GObject bindings) and, for
|
||||
signed output, GnuPG. Signing uses the normal
|
||||
GPG agent/pinentry. Only the public key is exported. The input bundle should be
|
||||
exported with collection ID com.arkhost.Flatpak and contain the canonical app's
|
||||
x86_64/stable ref. No packages are installed and no network commands are run.
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import base64
|
||||
import configparser
|
||||
import os
|
||||
from pathlib import Path
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
from urllib.parse import urlsplit
|
||||
|
||||
|
||||
APP_ID = "com.helixnotes.HelixNotes"
|
||||
APP_REF = f"app/{APP_ID}/x86_64/stable"
|
||||
COLLECTION_ID = "com.arkhost.Flatpak"
|
||||
RUNTIME_REPO = "https://dl.flathub.org/repo/flathub.flatpakrepo"
|
||||
DEFAULT_URL = "https://repo.arkhost.com/flatpak/"
|
||||
|
||||
|
||||
def run(*args, capture=False, binary=False):
|
||||
return subprocess.run(
|
||||
[str(arg) for arg in args],
|
||||
check=True,
|
||||
stdout=subprocess.PIPE if capture else None,
|
||||
text=not binary,
|
||||
env={**os.environ, "LC_ALL": "C"},
|
||||
).stdout
|
||||
|
||||
|
||||
def initialize_repository(repository):
|
||||
repository.mkdir(parents=True, exist_ok=False)
|
||||
if shutil.which("ostree"):
|
||||
run("ostree", f"--repo={repository}", "init", "--mode=archive-z2")
|
||||
else:
|
||||
# Fedora already supplies these native bindings with Flatpak. Keep the
|
||||
# fallback isolated so installations with the CLI do not require them.
|
||||
run(sys.executable, "-c", (
|
||||
"import sys, gi; gi.require_version('OSTree', '1.0'); "
|
||||
"from gi.repository import Gio, OSTree; "
|
||||
"repo = OSTree.Repo.new(Gio.File.new_for_path(sys.argv[1])); "
|
||||
"repo.create(OSTree.RepoMode.ARCHIVE_Z2, None)"
|
||||
), repository)
|
||||
run("flatpak", "build-update-repo", "--no-update-appstream",
|
||||
f"--collection-id={COLLECTION_ID}", repository)
|
||||
|
||||
|
||||
def validate_repository(repository):
|
||||
"""Inspect Flatpak's summary and app metadata, not the bundle's binary format."""
|
||||
branches = run("flatpak", "repo", "--branches", repository, capture=True)
|
||||
refs = {
|
||||
line.split()[0]
|
||||
for line in branches.splitlines()
|
||||
if line.split() and line.split()[0].startswith(("app/", "runtime/"))
|
||||
}
|
||||
if refs != {APP_REF}:
|
||||
raise ValueError(f"Expected only {APP_REF}; found {sorted(refs)}")
|
||||
metadata = configparser.ConfigParser(interpolation=None)
|
||||
metadata.read_string(
|
||||
run("flatpak", "repo", f"--metadata={APP_REF}", repository, capture=True)
|
||||
)
|
||||
if metadata.get("Application", "name", fallback="") != APP_ID:
|
||||
raise ValueError("Imported application metadata has an unexpected ID")
|
||||
runtime = metadata.get("Application", "runtime", fallback="")
|
||||
if not runtime.startswith("org.gnome.Platform/x86_64/"):
|
||||
raise ValueError(f"Expected the GNOME x86_64 runtime; found {runtime!r}")
|
||||
|
||||
|
||||
def write_descriptor(path, section, fields):
|
||||
descriptor = configparser.ConfigParser(interpolation=None)
|
||||
descriptor.optionxform = str
|
||||
descriptor[section] = fields
|
||||
with path.open("x", encoding="utf-8") as stream:
|
||||
descriptor.write(stream, space_around_delimiters=False)
|
||||
|
||||
|
||||
def prepare(args):
|
||||
bundle = args.bundle.expanduser().resolve(strict=True)
|
||||
output = args.output.expanduser().absolute()
|
||||
if not bundle.is_file():
|
||||
raise ValueError("The bundle must be a regular file")
|
||||
if os.path.lexists(output):
|
||||
raise ValueError("Output already exists; choose a fresh staging directory")
|
||||
previous = None
|
||||
if args.previous_directory:
|
||||
previous = args.previous_directory.expanduser().resolve(strict=True)
|
||||
if output.resolve().is_relative_to(previous):
|
||||
raise ValueError("Output must be outside the previous directory")
|
||||
if not (previous / "repo").is_dir():
|
||||
raise ValueError("Previous directory must contain a repo directory")
|
||||
validate_repository(previous / "repo")
|
||||
old_fingerprint = previous / "gpg-fingerprint.txt"
|
||||
if args.gpg_key and not old_fingerprint.exists():
|
||||
raise ValueError("Signing an update requires a previous signed output; omit --previous-directory for the first signed publication")
|
||||
if args.gpg_key:
|
||||
if old_fingerprint.read_text().strip().upper() != args.gpg_key:
|
||||
raise ValueError("Previous repository uses another signing key; key rotation requires a separate plan")
|
||||
for command in ("flatpak", "gpg") if args.gpg_key else ("flatpak",):
|
||||
if shutil.which(command) is None:
|
||||
raise ValueError(f"Required command not found: {command}")
|
||||
homedir = []
|
||||
if args.gpg_homedir:
|
||||
keyring = args.gpg_homedir.expanduser().resolve(strict=True)
|
||||
if not keyring.is_dir():
|
||||
raise ValueError("GPG homedir must be an existing directory")
|
||||
homedir = [f"--gpg-homedir={keyring}"]
|
||||
|
||||
output.mkdir(parents=True, exist_ok=False)
|
||||
incomplete = output / "INCOMPLETE.txt"
|
||||
incomplete.write_text("Local preparation has not completed. Do not publish this directory.\n")
|
||||
repository = output / "repo"
|
||||
# An empty temporary import makes it impossible for an old repo ref to mask
|
||||
# an input bundle with the wrong app, architecture or branch.
|
||||
with tempfile.TemporaryDirectory(prefix=".flatpak-import-", dir=output) as scratch:
|
||||
imported = Path(scratch) / "repo"
|
||||
initialize_repository(imported)
|
||||
print("Importing and checking the canonical application bundle", flush=True)
|
||||
run("flatpak", "build-import-bundle", "--no-update-summary", imported, bundle)
|
||||
# `flatpak repo` reads summary metadata, so create a private preflight
|
||||
# summary before inspecting the import. The signed summary comes later.
|
||||
run("flatpak", "build-update-repo", "--no-update-appstream", imported)
|
||||
validate_repository(imported)
|
||||
if previous:
|
||||
print("Copying the previous repository without pruning its history", flush=True)
|
||||
shutil.copytree(previous / "repo", repository, copy_function=shutil.copy2)
|
||||
else:
|
||||
initialize_repository(repository)
|
||||
# Recommit onto the hosted branch so each update descends from its last
|
||||
# published head and uses this repository's collection binding.
|
||||
run("flatpak", "build-commit-from", f"--src-repo={imported}",
|
||||
f"--src-ref={APP_REF}", "--no-update-summary", repository, APP_REF)
|
||||
|
||||
signing = []
|
||||
public_key = None
|
||||
if args.gpg_key:
|
||||
public_key = output / "arkhost-flatpak.gpg"
|
||||
gpg_homedir = []
|
||||
if args.gpg_homedir:
|
||||
gpg_homedir = ["--homedir", str(keyring)]
|
||||
exported = run("gpg", "--batch", *gpg_homedir, "--export", args.gpg_key,
|
||||
capture=True, binary=True)
|
||||
if not exported:
|
||||
raise ValueError("GPG exported no public key for the requested fingerprint")
|
||||
public_key.write_bytes(exported)
|
||||
signing = [f"--gpg-sign={args.gpg_key}", *homedir]
|
||||
print("Signing the application commit", flush=True)
|
||||
run("flatpak", "build-sign", "--arch=x86_64", *signing,
|
||||
repository, APP_ID, "stable")
|
||||
|
||||
print("Updating AppStream, summary and static deltas", flush=True)
|
||||
run("flatpak", "build-update-repo", "--generate-static-deltas",
|
||||
"--default-branch=stable", f"--collection-id={COLLECTION_ID}",
|
||||
"--title=ArkHost Flatpak Repository", "--homepage=https://arkhost.com",
|
||||
*signing, *([f"--gpg-import={public_key}"] if public_key else []), repository)
|
||||
validate_repository(repository)
|
||||
|
||||
if args.unsigned:
|
||||
(output / "UNSIGNED-STAGING.txt").write_text(
|
||||
"UNSIGNED LOCAL STAGING. Do not publish this repository.\n"
|
||||
"No installation descriptors or public-key files were generated.\n"
|
||||
"Prepare a fresh output with --gpg-key before distribution.\n"
|
||||
)
|
||||
print(f"Unsigned staging ready: {output}. No installation links generated.", flush=True)
|
||||
else:
|
||||
(output / "gpg-fingerprint.txt").write_text(args.gpg_key + "\n")
|
||||
encoded_key = base64.b64encode(exported).decode("ascii")
|
||||
repository_url = args.url.rstrip("/") + "/repo/"
|
||||
common = {"Url": repository_url, "GPGKey": encoded_key,
|
||||
"DeploySideloadCollectionID": COLLECTION_ID}
|
||||
write_descriptor(output / "arkhost.flatpakrepo", "Flatpak Repo", {
|
||||
"Title": "ArkHost Flatpak Repository", "Homepage": "https://arkhost.com",
|
||||
"DefaultBranch": "stable", **common,
|
||||
})
|
||||
write_descriptor(output / "HelixNotes.flatpakref", "Flatpak Ref", {
|
||||
"Title": "HelixNotes", "Name": APP_ID, "Branch": "stable",
|
||||
"IsRuntime": "false", "SuggestRemoteName": "arkhost",
|
||||
"RuntimeRepo": RUNTIME_REPO,
|
||||
"Description": "Local Markdown notes by Yuri Karamian.", **common,
|
||||
})
|
||||
print(f"Signed repository and installation descriptors ready: {output}", flush=True)
|
||||
incomplete.unlink()
|
||||
print("Nothing was uploaded, deployed or installed.", flush=True)
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
|
||||
parser.add_argument("bundle", type=Path, help="Canonical HelixNotes x86_64/stable .flatpak bundle")
|
||||
parser.add_argument("--output", required=True, type=Path, help="Fresh output directory")
|
||||
mode = parser.add_mutually_exclusive_group(required=True)
|
||||
mode.add_argument("--gpg-key", help="Full signing-key fingerprint (40 or 64 hexadecimal characters)")
|
||||
mode.add_argument("--unsigned", action="store_true", help="Local staging only; generate no installation descriptors")
|
||||
parser.add_argument("--gpg-homedir", type=Path, help="Existing GPG home; otherwise use the normal keyring")
|
||||
parser.add_argument("--url", default=DEFAULT_URL, help="Public base URL, excluding the repo/ suffix")
|
||||
parser.add_argument("--previous-directory", type=Path, help="Previous prepared output whose repo/history must be retained")
|
||||
args = parser.parse_args()
|
||||
if args.gpg_key:
|
||||
args.gpg_key = args.gpg_key.upper()
|
||||
if not re.fullmatch(r"(?:[0-9A-F]{40}|[0-9A-F]{64})", args.gpg_key):
|
||||
parser.error("--gpg-key must be a complete hexadecimal fingerprint")
|
||||
if args.gpg_homedir and args.unsigned:
|
||||
parser.error("--gpg-homedir requires --gpg-key")
|
||||
url = urlsplit(args.url)
|
||||
if (url.scheme != "https" or not url.netloc or url.username or url.password
|
||||
or url.query or url.fragment or any(ord(c) < 33 for c in args.url)):
|
||||
parser.error("--url must be an absolute HTTPS base URL without credentials, query or fragment")
|
||||
try:
|
||||
prepare(args)
|
||||
except (OSError, ValueError, configparser.Error, subprocess.CalledProcessError) as error:
|
||||
parser.exit(1, f"Preparation stopped: {error}\nAny partial output was preserved; choose a fresh output to retry.\n")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Submodule
+1
Submodule packaging/flatpak/shared-modules added at 6be1f986ac.
Generated
+12
@@ -110,6 +110,12 @@ importers:
|
||||
'@types/markdown-it':
|
||||
specifier: ^14.1.2
|
||||
version: 14.1.2
|
||||
diff:
|
||||
specifier: ^9.0.0
|
||||
version: 9.0.0
|
||||
dompurify:
|
||||
specifier: ^3.4.13
|
||||
version: 3.4.13
|
||||
highlight.js:
|
||||
specifier: ^11.11.1
|
||||
version: 11.11.1
|
||||
@@ -1373,6 +1379,10 @@ packages:
|
||||
devlop@1.1.0:
|
||||
resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
|
||||
|
||||
diff@9.0.0:
|
||||
resolution: {integrity: sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw==}
|
||||
engines: {node: '>=0.3.1'}
|
||||
|
||||
dompurify@3.4.13:
|
||||
resolution: {integrity: sha512-2vmYIoqjze2d+kakP8S/nS5shfsl587kzwEjcGlTdiksUVgFHnFCsLYDVj/JNqJVOQZGSYBTmuycv0PodwmnMQ==}
|
||||
|
||||
@@ -2946,6 +2956,8 @@ snapshots:
|
||||
dependencies:
|
||||
dequal: 2.0.3
|
||||
|
||||
diff@9.0.0: {}
|
||||
|
||||
dompurify@3.4.13:
|
||||
optionalDependencies:
|
||||
'@types/trusted-types': 2.0.7
|
||||
|
||||
Generated
+1
-1
@@ -1776,7 +1776,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "helixnotes"
|
||||
version = "1.3.6"
|
||||
version = "1.3.7"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"arboard",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "helixnotes"
|
||||
version = "1.3.6"
|
||||
version = "1.3.7"
|
||||
description = "Local markdown note-taking app"
|
||||
authors = ["HelixNotes"]
|
||||
license = "AGPL-3.0-or-later"
|
||||
|
||||
@@ -33,6 +33,9 @@ class MainActivity : TauriActivity() {
|
||||
// paragraph font-size and line-height from viewport heuristics and ignores our CSS (only
|
||||
// size + line-height were affected; font-family was fine). NORMAL turns it off. (#100)
|
||||
webView.settings.layoutAlgorithm = android.webkit.WebSettings.LayoutAlgorithm.NORMAL
|
||||
// Honor the viewport meta tag's scale, which is how the Interface Scale setting is applied
|
||||
// on Android (WebView zoom APIs are not exposed through Tauri here). (#288)
|
||||
webView.settings.useWideViewPort = true
|
||||
}
|
||||
|
||||
override fun onPause() {
|
||||
|
||||
@@ -1,5 +1,38 @@
|
||||
use std::path::Path;
|
||||
use tauri::{AppHandle, Manager, Runtime};
|
||||
use tauri_plugin_fs::FsExt;
|
||||
|
||||
/// Only configured user-selected vaults may provide an external note's vault-relative root.
|
||||
pub fn external_note_root<R: Runtime>(
|
||||
app: &AppHandle<R>,
|
||||
note_path: &Path,
|
||||
) -> Result<std::path::PathBuf, String> {
|
||||
let note = std::fs::canonicalize(note_path).map_err(|error| error.to_string())?;
|
||||
if let Some(state) = app.try_state::<crate::state::AppState>() {
|
||||
let (active, mut roots) = {
|
||||
let config = state.config.lock().map_err(|error| error.to_string())?;
|
||||
(
|
||||
config.active_vault.clone(),
|
||||
config
|
||||
.vaults
|
||||
.iter()
|
||||
.map(|vault| vault.path.clone())
|
||||
.collect::<Vec<_>>(),
|
||||
)
|
||||
};
|
||||
roots.sort_by_key(|root| std::cmp::Reverse(root.len()));
|
||||
for root in active.into_iter().chain(roots) {
|
||||
if let Ok(root) = std::fs::canonicalize(root) {
|
||||
if note.starts_with(&root) {
|
||||
return Ok(root);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
note.parent()
|
||||
.map(Path::to_path_buf)
|
||||
.ok_or_else(|| "External note has no parent directory".into())
|
||||
}
|
||||
|
||||
/// Grants asset-protocol access only to a vault selected by the user.
|
||||
/// `.helixnotes` is added explicitly because Unix glob matching excludes hidden paths.
|
||||
@@ -37,7 +70,23 @@ pub fn allow_external_note_assets<R: Runtime>(
|
||||
.ok_or_else(|| "External note has no parent directory".to_string())?;
|
||||
app.asset_protocol_scope()
|
||||
.allow_directory(parent, true)
|
||||
.map_err(|error| error.to_string())
|
||||
.map_err(|error| error.to_string())?;
|
||||
let root = external_note_root(app, ¬e)?;
|
||||
let attachments = root.join(".helixnotes/attachments");
|
||||
// Never follow a hidden attachment-directory symlink when extending either scope.
|
||||
if std::fs::canonicalize(&attachments)
|
||||
.is_ok_and(|canonical| canonical == attachments && canonical.is_dir())
|
||||
{
|
||||
app.asset_protocol_scope()
|
||||
.allow_directory(&attachments, true)
|
||||
.map_err(|error| error.to_string())?;
|
||||
if let Some(scope) = app.try_fs_scope() {
|
||||
scope
|
||||
.allow_directory(&attachments, true)
|
||||
.map_err(|error| error.to_string())?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -85,6 +134,101 @@ mod tests {
|
||||
fs::remove_dir_all(root).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn external_note_scopes_include_its_attachments_but_not_hidden_private_metadata() {
|
||||
use tauri_plugin_fs::FsExt;
|
||||
let root = tempfile::tempdir().unwrap();
|
||||
let parent = root.path().join("external");
|
||||
let attachments = parent.join(".helixnotes/attachments");
|
||||
fs::create_dir_all(&attachments).unwrap();
|
||||
fs::create_dir_all(parent.join(".helixnotes/history")).unwrap();
|
||||
fs::create_dir_all(parent.join(".ssh")).unwrap();
|
||||
let note = parent.join("Note.md");
|
||||
let image = attachments.join("image.png");
|
||||
let history = parent.join(".helixnotes/history/snapshot.md");
|
||||
let private = parent.join(".ssh/private.bin");
|
||||
for file in [¬e, &image, &history, &private] {
|
||||
fs::write(file, b"fixture").unwrap();
|
||||
}
|
||||
let app = tauri::test::mock_builder()
|
||||
.plugin(tauri_plugin_fs::init())
|
||||
.build(tauri::test::mock_context(tauri::test::noop_assets()))
|
||||
.unwrap();
|
||||
app.fs_scope().allow_file(¬e).unwrap();
|
||||
app.fs_scope().allow_directory(&parent, true).unwrap();
|
||||
let before_private = [
|
||||
app.fs_scope().is_allowed(&history),
|
||||
app.fs_scope().is_allowed(&private),
|
||||
];
|
||||
allow_external_note_assets(app.handle(), ¬e).unwrap();
|
||||
assert!(
|
||||
app.fs_scope().is_allowed(&image),
|
||||
"import must be able to read its managed attachments"
|
||||
);
|
||||
assert!(
|
||||
app.asset_protocol_scope().is_allowed(&image),
|
||||
"the viewer must display managed attachments"
|
||||
);
|
||||
for (file, previous) in [&history, &private].into_iter().zip(before_private) {
|
||||
assert_eq!(
|
||||
app.fs_scope().is_allowed(file),
|
||||
previous,
|
||||
"attachment grants must not widen private metadata access"
|
||||
);
|
||||
assert!(!app.asset_protocol_scope().is_allowed(file));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn external_notebook_uses_its_registered_vault_root_for_attachment_scopes() {
|
||||
use tauri_plugin_fs::FsExt;
|
||||
let root = tempfile::tempdir().unwrap();
|
||||
let vault = root.path().join("source");
|
||||
fs::create_dir_all(vault.join("Notebook")).unwrap();
|
||||
fs::create_dir_all(vault.join(".helixnotes/attachments")).unwrap();
|
||||
let note = vault.join("Notebook/Note.md");
|
||||
let image = vault.join(".helixnotes/attachments/image.png");
|
||||
fs::write(¬e, b"Note").unwrap();
|
||||
fs::write(&image, b"Image").unwrap();
|
||||
let app = tauri::test::mock_builder()
|
||||
.plugin(tauri_plugin_fs::init())
|
||||
.manage(crate::state::AppState::new(crate::types::AppConfig {
|
||||
vaults: vec![crate::types::VaultConfig {
|
||||
path: vault.to_string_lossy().into_owned(),
|
||||
..Default::default()
|
||||
}],
|
||||
..Default::default()
|
||||
}))
|
||||
.build(tauri::test::mock_context(tauri::test::noop_assets()))
|
||||
.unwrap();
|
||||
allow_external_note_assets(app.handle(), ¬e).unwrap();
|
||||
assert!(app.asset_protocol_scope().is_allowed(&image));
|
||||
assert!(app.fs_scope().is_allowed(&image));
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn external_attachment_scope_does_not_follow_hidden_directory_symlinks() {
|
||||
use tauri_plugin_fs::FsExt;
|
||||
let root = tempfile::tempdir().unwrap();
|
||||
let parent = root.path().join("external");
|
||||
let private = root.path().join("private");
|
||||
fs::create_dir_all(parent.join(".helixnotes")).unwrap();
|
||||
fs::create_dir(&private).unwrap();
|
||||
let note = parent.join("Note.md");
|
||||
let file = private.join("private.bin");
|
||||
fs::write(¬e, b"Note").unwrap();
|
||||
fs::write(&file, b"private fixture").unwrap();
|
||||
std::os::unix::fs::symlink(&private, parent.join(".helixnotes/attachments")).unwrap();
|
||||
let app = tauri::test::mock_builder()
|
||||
.plugin(tauri_plugin_fs::init())
|
||||
.build(tauri::test::mock_context(tauri::test::noop_assets()))
|
||||
.unwrap();
|
||||
allow_external_note_assets(app.handle(), ¬e).unwrap();
|
||||
assert!(!app.fs_scope().is_allowed(&file));
|
||||
assert!(!app.asset_protocol_scope().is_allowed(&file));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn external_note_scope_allows_relative_assets_only_below_its_directory() {
|
||||
let root = test_directory("external-note-assets");
|
||||
|
||||
+115
-5
@@ -54,7 +54,9 @@ fn excluded_path(path: &Path, vault: &Path, backup_dir: &Path, attachments: bool
|
||||
if path == vault {
|
||||
return false;
|
||||
}
|
||||
if path.starts_with(backup_dir) {
|
||||
// Only a backup folder inside the vault is skipped. One that contains the vault (its parent,
|
||||
// the home folder) used to match every path, leaving archives with nothing but the manifest.
|
||||
if backup_dir.starts_with(vault) && path.starts_with(backup_dir) {
|
||||
return true;
|
||||
}
|
||||
// Old configured backup folders may remain inside the vault after relocation.
|
||||
@@ -193,9 +195,8 @@ pub fn create_backup(
|
||||
Ok(())
|
||||
})();
|
||||
result?;
|
||||
// persist_noclobber does not replace an existing backup even on UUID collision.
|
||||
temporary
|
||||
.persist_noclobber(&backup_path)
|
||||
// Never replaces an existing backup, even on UUID collision.
|
||||
crate::vault::operations::persist_without_replacing(temporary, &backup_path)
|
||||
.map_err(|e| format!("Failed to publish backup: {}", e.error))?;
|
||||
let meta = fs::metadata(&backup_path).map_err(|e| e.to_string())?;
|
||||
Ok(BackupEntry {
|
||||
@@ -203,6 +204,7 @@ pub fn create_backup(
|
||||
path: backup_path.to_string_lossy().to_string(),
|
||||
size: meta.len(),
|
||||
created: now.to_rfc3339(),
|
||||
other_vault: false,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -243,12 +245,15 @@ fn list_owned_backups(
|
||||
}
|
||||
let filename = entry.file_name().to_string_lossy().to_string();
|
||||
if let Some((created, owned)) = archive_name(&filename, &id) {
|
||||
// Archives from before vault identities carry none, so they cannot be told apart.
|
||||
let names_a_vault = filename.len() > "helixnotes-backup-0000-00-00T00-00-00.zip".len();
|
||||
entries.push((
|
||||
BackupEntry {
|
||||
filename,
|
||||
path: path.to_string_lossy().to_string(),
|
||||
size: meta.len(),
|
||||
created,
|
||||
other_vault: names_a_vault && !owned,
|
||||
},
|
||||
owned,
|
||||
));
|
||||
@@ -262,7 +267,8 @@ fn list_owned_backups(
|
||||
Ok(entries)
|
||||
}
|
||||
|
||||
/// List backups from every vault; only automatic pruning uses vault identity.
|
||||
/// List backups from every vault, each marked when it belongs to another one; a vault that was
|
||||
/// moved or renamed must still be able to restore its earlier archives.
|
||||
pub fn list_backups(backup_dir: &Path, vault_path: &str) -> Result<Vec<BackupEntry>, String> {
|
||||
Ok(list_owned_backups(backup_dir, vault_path)?
|
||||
.into_iter()
|
||||
@@ -703,6 +709,12 @@ pub fn restore_backup(
|
||||
));
|
||||
}
|
||||
}
|
||||
// An archive holding only its manifest would replace the vault with nothing.
|
||||
if seen.keys().all(|entry| entry == Path::new(MANIFEST)) {
|
||||
return Err(
|
||||
"This backup contains no notes, so restoring it would empty the vault".to_string(),
|
||||
);
|
||||
}
|
||||
let attachments = if let Some(meta) = manifest {
|
||||
if meta.version != 1
|
||||
|| meta.vault.len() != 64
|
||||
@@ -1094,4 +1106,102 @@ mod tests {
|
||||
"source content"
|
||||
);
|
||||
}
|
||||
|
||||
fn archive_names(path: &str) -> Vec<String> {
|
||||
let mut archive = ZipArchive::new(File::open(path).unwrap()).unwrap();
|
||||
(0..archive.len())
|
||||
.map(|index| archive.by_index(index).unwrap().name().to_string())
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_backup_folder_that_contains_the_vault_still_archives_the_notes() {
|
||||
let root = tempdir().unwrap();
|
||||
let vault = root.path().join("Documents/Notes");
|
||||
fs::create_dir_all(vault.join("Sub")).unwrap();
|
||||
fs::write(vault.join("note.md"), "content").unwrap();
|
||||
fs::write(vault.join("Sub/deep.md"), "deep").unwrap();
|
||||
// The parent folder, and the folder above that.
|
||||
for output in [root.path().join("Documents"), root.path().to_path_buf()] {
|
||||
let entry = create_backup(&vault_string(&vault), &output, false).unwrap();
|
||||
let names = archive_names(&entry.path);
|
||||
assert!(names.iter().any(|name| name == "note.md"), "{names:?}");
|
||||
assert!(names.iter().any(|name| name == "Sub/deep.md"), "{names:?}");
|
||||
// A second run does not swallow the first archive, which now lies beside the vault.
|
||||
let again = create_backup(&vault_string(&vault), &output, false).unwrap();
|
||||
assert!(!archive_names(&again.path)
|
||||
.iter()
|
||||
.any(|name| name.ends_with(".zip")));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_archive_without_content_is_not_restored() {
|
||||
let root = tempdir().unwrap();
|
||||
let vault = root.path().join("vault");
|
||||
let output = root.path().join("backups");
|
||||
fs::create_dir_all(&vault).unwrap();
|
||||
fs::create_dir_all(&output).unwrap();
|
||||
fs::write(vault.join("note.md"), "keep me").unwrap();
|
||||
// What the old exclusion produced: nothing but the manifest.
|
||||
let empty = output.join(format!(
|
||||
"helixnotes-backup-2026-01-01T00-00-00-{}-{}.zip",
|
||||
"a".repeat(64),
|
||||
Uuid::new_v4()
|
||||
));
|
||||
let mut writer = ZipWriter::new(File::create(&empty).unwrap());
|
||||
writer
|
||||
.start_file(super::MANIFEST, SimpleFileOptions::default())
|
||||
.unwrap();
|
||||
writer
|
||||
.write_all(
|
||||
format!(
|
||||
r#"{{"version":1,"vault":"{}","attachments":false}}"#,
|
||||
"a".repeat(64)
|
||||
)
|
||||
.as_bytes(),
|
||||
)
|
||||
.unwrap();
|
||||
writer.finish().unwrap();
|
||||
let error =
|
||||
restore_backup(&vault_string(&vault), &output, &empty.to_string_lossy()).unwrap_err();
|
||||
assert!(error.contains("contains no notes"), "{error}");
|
||||
assert_eq!(
|
||||
fs::read_to_string(vault.join("note.md")).unwrap(),
|
||||
"keep me"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn backups_from_another_vault_are_marked() {
|
||||
let root = tempdir().unwrap();
|
||||
let output = root.path().join("backups");
|
||||
let first = root.path().join("first");
|
||||
let second = root.path().join("second");
|
||||
fs::create_dir_all(&first).unwrap();
|
||||
fs::create_dir_all(&second).unwrap();
|
||||
fs::write(first.join("note.md"), "one").unwrap();
|
||||
fs::write(second.join("note.md"), "two").unwrap();
|
||||
let own = create_backup(&vault_string(&first), &output, false).unwrap();
|
||||
let foreign = create_backup(&vault_string(&second), &output, false).unwrap();
|
||||
// An archive from before vault identities: it cannot be attributed, so it is not flagged.
|
||||
fs::copy(
|
||||
&own.path,
|
||||
output.join("helixnotes-backup-2020-01-01T00-00-00.zip"),
|
||||
)
|
||||
.unwrap();
|
||||
assert!(!own.other_vault);
|
||||
let listed = list_backups(&output, &vault_string(&first)).unwrap();
|
||||
let marked = |path: &str| {
|
||||
listed
|
||||
.iter()
|
||||
.find(|entry| entry.path == path)
|
||||
.unwrap()
|
||||
.other_vault
|
||||
};
|
||||
assert!(!marked(&own.path));
|
||||
assert!(marked(&foreign.path));
|
||||
assert!(listed.iter().filter(|entry| entry.other_vault).count() == 1);
|
||||
assert_eq!(listed.len(), 3);
|
||||
}
|
||||
}
|
||||
+1141
-185
File diff suppressed because it is too large.
Load diff
+107
-8
@@ -18,10 +18,44 @@ fn safe_path_component<'a>(value: &'a str, label: &str) -> Result<&'a str, Strin
|
||||
|
||||
/// Directory: .helixnotes/history/<note-id>/
|
||||
fn history_dir(vault_path: &str, note_id: &str) -> Result<PathBuf, String> {
|
||||
Ok(Path::new(vault_path)
|
||||
.join(".helixnotes")
|
||||
.join("history")
|
||||
.join(safe_path_component(note_id, "note ID")?))
|
||||
let mut dir = PathBuf::from(vault_path);
|
||||
// Each level must be a real folder. A link here (carried in by git, a file-sync tool or an
|
||||
// extracted archive) would send snapshots, and the pruning that deletes old ones, to whatever
|
||||
// folder it points at.
|
||||
for part in [
|
||||
".helixnotes",
|
||||
"history",
|
||||
safe_path_component(note_id, "note ID")?,
|
||||
] {
|
||||
dir.push(part);
|
||||
if fs::symlink_metadata(&dir).is_ok_and(|meta| !meta.file_type().is_dir()) {
|
||||
return Err("Version history folder is not a real folder".to_string());
|
||||
}
|
||||
}
|
||||
Ok(dir)
|
||||
}
|
||||
|
||||
/// `2026-01-02T03-04-05.md` or `2026-01-02T03-04-05.678.md`: the only names snapshots are given.
|
||||
fn is_snapshot_name(name: &str) -> bool {
|
||||
let Some(stem) = name.strip_suffix(".md") else {
|
||||
return false;
|
||||
};
|
||||
let (Some(time), Some(fraction)) = (stem.get(..19), stem.get(19..)) else {
|
||||
return false;
|
||||
};
|
||||
chrono::NaiveDateTime::parse_from_str(time, "%Y-%m-%dT%H-%M-%S").is_ok()
|
||||
&& (fraction.is_empty()
|
||||
|| fraction.strip_prefix('.').is_some_and(|digits| {
|
||||
!digits.is_empty() && digits.bytes().all(|b| b.is_ascii_digit())
|
||||
}))
|
||||
}
|
||||
|
||||
/// A snapshot the app wrote: a regular file (never a link) with a snapshot name.
|
||||
fn is_snapshot_file(path: &Path) -> bool {
|
||||
path.file_name()
|
||||
.and_then(|name| name.to_str())
|
||||
.is_some_and(is_snapshot_name)
|
||||
&& fs::symlink_metadata(path).is_ok_and(|meta| meta.file_type().is_file())
|
||||
}
|
||||
|
||||
fn snapshot_path(dir: &Path, raw_content: &str) -> Result<(), String> {
|
||||
@@ -43,7 +77,7 @@ fn snapshot_path(dir: &Path, raw_content: &str) -> Result<(), String> {
|
||||
// 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) {
|
||||
match crate::vault::operations::persist_without_replacing(temporary, &path) {
|
||||
Ok(_) => return Ok(()),
|
||||
Err(error) if error.error.kind() == std::io::ErrorKind::AlreadyExists => {
|
||||
temporary = error.file;
|
||||
@@ -167,7 +201,7 @@ pub fn list_versions(vault_path: &str, note_id: &str) -> Result<Vec<VersionEntry
|
||||
for entry in fs::read_dir(&dir).map_err(|e| e.to_string())? {
|
||||
let entry = entry.map_err(|e| e.to_string())?;
|
||||
let path = entry.path();
|
||||
if path.extension().is_some_and(|ext| ext == "md") {
|
||||
if is_snapshot_file(&path) {
|
||||
let filename = path
|
||||
.file_stem()
|
||||
.unwrap_or_default()
|
||||
@@ -195,6 +229,9 @@ pub fn get_version(vault_path: &str, note_id: &str, timestamp: &str) -> Result<S
|
||||
let filename = snapshot_filename(timestamp);
|
||||
|
||||
let path = history_dir(vault_path, note_id)?.join(&filename);
|
||||
if !is_snapshot_file(&path) {
|
||||
return Err("Version not found".to_string());
|
||||
}
|
||||
fs::read_to_string(&path).map_err(|e| format!("Version not found: {}", e))
|
||||
}
|
||||
|
||||
@@ -204,7 +241,8 @@ fn prune_versions(dir: &Path, max: u32) -> Result<(), String> {
|
||||
.map_err(|e| e.to_string())?
|
||||
.filter_map(|e| e.ok())
|
||||
.map(|e| e.path())
|
||||
.filter(|p| p.extension().is_some_and(|ext| ext == "md"))
|
||||
// Only snapshots are counted and removed, never other Markdown files that ended up here.
|
||||
.filter(|p| is_snapshot_file(p))
|
||||
.collect();
|
||||
|
||||
// Sort by name (timestamps sort lexicographically) - newest last
|
||||
@@ -279,7 +317,8 @@ mod tests {
|
||||
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);
|
||||
// The file that is not named like a snapshot is neither a version nor in the way.
|
||||
assert_eq!(versions.len(), 2);
|
||||
assert_eq!(
|
||||
get_version(root, "note", "2026-01-01T00:00:00Z").unwrap(),
|
||||
"legacy"
|
||||
@@ -289,4 +328,64 @@ mod tests {
|
||||
"new"
|
||||
);
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn a_linked_history_folder_is_never_written_to_or_pruned() {
|
||||
use std::os::unix::fs::symlink;
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let outside = tempfile::tempdir().unwrap();
|
||||
let root = vault.path().to_str().unwrap();
|
||||
// A folder of ordinary notes somewhere else, more than the pruning limit.
|
||||
for index in 0..25 {
|
||||
fs::write(
|
||||
outside.path().join(format!("note-{index:02}.md")),
|
||||
"precious",
|
||||
)
|
||||
.unwrap();
|
||||
}
|
||||
let history = vault.path().join(".helixnotes/history");
|
||||
fs::create_dir_all(&history).unwrap();
|
||||
symlink(outside.path(), history.join("linked")).unwrap();
|
||||
|
||||
assert!(super::force_snapshot(root, "linked", "new", 20).is_err());
|
||||
super::maybe_snapshot(root, "linked", "new", 20);
|
||||
assert!(list_versions(root, "linked").is_err());
|
||||
assert!(get_version(root, "linked", "note-00").is_err());
|
||||
assert_eq!(fs::read_dir(outside.path()).unwrap().count(), 25);
|
||||
|
||||
// The same when a higher level is the link.
|
||||
let second = tempfile::tempdir().unwrap();
|
||||
fs::create_dir_all(second.path().join(".helixnotes")).unwrap();
|
||||
symlink(outside.path(), second.path().join(".helixnotes/history")).unwrap();
|
||||
assert!(super::force_snapshot(second.path().to_str().unwrap(), "note", "new", 20).is_err());
|
||||
assert_eq!(fs::read_dir(outside.path()).unwrap().count(), 25);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn pruning_and_listing_only_touch_snapshots() {
|
||||
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();
|
||||
// Markdown files that are not snapshots, sorting before and after real ones.
|
||||
fs::write(history.join("README.md"), "keep").unwrap();
|
||||
fs::write(history.join("zz-00.md"), "keep").unwrap();
|
||||
fs::write(history.join("2026-01-01T00-00-00.md"), "old").unwrap();
|
||||
fs::write(history.join("2026-01-02T00-00-00.123.md"), "newer").unwrap();
|
||||
super::force_snapshot(root, "note", "newest", 2).unwrap();
|
||||
let versions = list_versions(root, "note").unwrap();
|
||||
assert_eq!(versions.len(), 2);
|
||||
assert!(!history.join("2026-01-01T00-00-00.md").exists());
|
||||
assert!(history.join("README.md").exists() && history.join("zz-00.md").exists());
|
||||
assert!(get_version(root, "note", "zz-00").is_err());
|
||||
#[cfg(unix)]
|
||||
{
|
||||
let target = vault.path().join("secret.md");
|
||||
fs::write(&target, "outside history").unwrap();
|
||||
std::os::unix::fs::symlink(&target, history.join("2026-01-03T00-00-00.md")).unwrap();
|
||||
assert!(get_version(root, "note", "2026-01-03T00:00:00Z").is_err());
|
||||
assert_eq!(list_versions(root, "note").unwrap().len(), 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,14 @@
|
||||
use reqwest::{blocking::Client, redirect::Policy, Url};
|
||||
use reqwest::{
|
||||
blocking::{Client, Response},
|
||||
redirect::Policy,
|
||||
StatusCode, Url,
|
||||
};
|
||||
use std::io::Read;
|
||||
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, ToSocketAddrs};
|
||||
use std::time::Duration;
|
||||
|
||||
const MAX_IMAGE_BYTES: u64 = 20 * 1024 * 1024;
|
||||
const MAX_REDIRECTS: usize = 5;
|
||||
|
||||
pub struct ImageResponse {
|
||||
pub content_type: String,
|
||||
@@ -136,37 +141,55 @@ fn resolve_public_host(url: &Url) -> Result<(String, Vec<SocketAddr>), ProxyErro
|
||||
Ok((host, addresses))
|
||||
}
|
||||
|
||||
// Redirects are followed by `fetch`, one hop at a time, so every hop gets the same checks.
|
||||
fn image_client(host: &str, addresses: &[SocketAddr]) -> Result<Client, ProxyError> {
|
||||
let redirect_host = host.to_string();
|
||||
Client::builder()
|
||||
.timeout(Duration::from_secs(30))
|
||||
.redirect(Policy::custom(move |attempt| {
|
||||
let redirected_elsewhere = match attempt.url().host_str() {
|
||||
Some(host) => normalized_host(host) != redirect_host,
|
||||
None => true,
|
||||
};
|
||||
if attempt.previous().len() >= 5
|
||||
|| redirected_elsewhere
|
||||
|| validate_url(attempt.url().as_str()).is_err()
|
||||
{
|
||||
attempt.stop()
|
||||
} else {
|
||||
attempt.follow()
|
||||
}
|
||||
}))
|
||||
.redirect(Policy::none())
|
||||
.resolve_to_addrs(host, addresses)
|
||||
.build()
|
||||
.map_err(|error| ProxyError::Fetch(format!("Could not create image client: {error}")))
|
||||
}
|
||||
|
||||
/// The validated target of a redirect response, or `None` when the response is not a redirect.
|
||||
fn redirect_target(
|
||||
url: &Url,
|
||||
status: StatusCode,
|
||||
location: Option<&str>,
|
||||
) -> Result<Option<Url>, ProxyError> {
|
||||
if !matches!(status.as_u16(), 301 | 302 | 303 | 307 | 308) {
|
||||
return Ok(None);
|
||||
}
|
||||
let target = location
|
||||
.and_then(|location| url.join(location).ok())
|
||||
.ok_or_else(|| ProxyError::Fetch("Image redirect has no usable target".into()))?;
|
||||
validate_url(target.as_str()).map(Some)
|
||||
}
|
||||
|
||||
pub fn fetch(raw_url: &str) -> Result<ImageResponse, ProxyError> {
|
||||
let url = validate_url(raw_url)?;
|
||||
let (host, addresses) = resolve_public_host(&url)?;
|
||||
let client = image_client(&host, &addresses)?;
|
||||
let mut response = client
|
||||
.get(url)
|
||||
.send()
|
||||
.map_err(|error| ProxyError::Fetch(format!("Image request failed: {error}")))?;
|
||||
let mut url = validate_url(raw_url)?;
|
||||
for _ in 0..=MAX_REDIRECTS {
|
||||
// Each hop is resolved, checked for private addresses and pinned to that answer,
|
||||
// so a redirect cannot reach a host that a direct image URL could not.
|
||||
let (host, addresses) = resolve_public_host(&url)?;
|
||||
let client = image_client(&host, &addresses)?;
|
||||
let response = client
|
||||
.get(url.clone())
|
||||
.send()
|
||||
.map_err(|error| ProxyError::Fetch(format!("Image request failed: {error}")))?;
|
||||
let location = response
|
||||
.headers()
|
||||
.get(reqwest::header::LOCATION)
|
||||
.and_then(|value| value.to_str().ok());
|
||||
match redirect_target(&url, response.status(), location)? {
|
||||
Some(target) => url = target,
|
||||
None => return read_image(response),
|
||||
}
|
||||
}
|
||||
Err(ProxyError::Fetch("Image redirected too many times".into()))
|
||||
}
|
||||
|
||||
fn read_image(mut response: Response) -> Result<ImageResponse, ProxyError> {
|
||||
if !response.status().is_success() {
|
||||
return Err(ProxyError::Fetch(format!(
|
||||
"Image server returned {}",
|
||||
@@ -204,7 +227,8 @@ pub fn fetch(raw_url: &str) -> Result<ImageResponse, ProxyError> {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::{is_public_ip, validate_url};
|
||||
use super::{is_public_ip, redirect_target, validate_url};
|
||||
use reqwest::{StatusCode, Url};
|
||||
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
|
||||
|
||||
#[test]
|
||||
@@ -242,4 +266,39 @@ mod tests {
|
||||
assert!(validate_url("https://example.com/image.png").is_ok());
|
||||
assert!(validate_url("http://93.184.216.34/image.png").is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn redirects_are_followed_to_other_public_hosts_only() {
|
||||
let url = Url::parse("https://example.com/a/image.png").unwrap();
|
||||
let target = |status: u16, location: Option<&str>| {
|
||||
redirect_target(&url, StatusCode::from_u16(status).unwrap(), location)
|
||||
};
|
||||
let ok = |status, location| target(status, Some(location)).ok().unwrap().unwrap();
|
||||
assert_eq!(
|
||||
ok(301, "https://cdn.example.net/image.png").as_str(),
|
||||
"https://cdn.example.net/image.png"
|
||||
);
|
||||
assert_eq!(
|
||||
ok(302, "/b/image.png").as_str(),
|
||||
"https://example.com/b/image.png"
|
||||
);
|
||||
assert_eq!(
|
||||
ok(307, "other.png").as_str(),
|
||||
"https://example.com/a/other.png"
|
||||
);
|
||||
assert!(target(200, None).ok().unwrap().is_none());
|
||||
assert!(target(304, None).ok().unwrap().is_none());
|
||||
for location in [
|
||||
"http://localhost/image.png",
|
||||
"http://127.0.0.1/image.png",
|
||||
"http://169.254.169.254/latest/meta-data",
|
||||
"http://[::1]/image.png",
|
||||
"https://example.net:8443/image.png",
|
||||
"https://user:pass@example.net/image.png",
|
||||
"file:///etc/passwd",
|
||||
] {
|
||||
assert!(target(302, Some(location)).is_err(), "{location}");
|
||||
}
|
||||
assert!(target(302, None).is_err());
|
||||
}
|
||||
}
|
||||
@@ -187,6 +187,7 @@ pub fn run() {
|
||||
commands::get_notes,
|
||||
commands::read_note,
|
||||
commands::save_note,
|
||||
commands::import_note,
|
||||
commands::create_note,
|
||||
commands::duplicate_note,
|
||||
commands::create_daily_note,
|
||||
@@ -211,6 +212,7 @@ pub fn run() {
|
||||
commands::load_vault_state,
|
||||
commands::save_vault_state,
|
||||
commands::copy_text_to_clipboard,
|
||||
commands::read_clipboard_contents,
|
||||
commands::read_clipboard_image,
|
||||
commands::copy_image_to_clipboard,
|
||||
commands::save_image,
|
||||
|
||||
+1214
-88
File diff suppressed because it is too large.
Load diff
+41
-2
@@ -102,6 +102,9 @@ pub struct VaultConfig {
|
||||
pub sync_on_change: bool,
|
||||
#[serde(default)]
|
||||
pub sync_interval_minutes: u32,
|
||||
/// Folders to list on the server at once; 0 means the default.
|
||||
#[serde(default)]
|
||||
pub sync_folder_requests: u32,
|
||||
#[serde(default)]
|
||||
pub last_sync_time: Option<String>,
|
||||
#[serde(default)]
|
||||
@@ -146,8 +149,36 @@ pub struct ToolbarLayout {
|
||||
pub more: Vec<String>,
|
||||
}
|
||||
|
||||
/// Keeps the entries of a list that still parse and drops the rest, so one damaged entry (a custom
|
||||
/// theme missing a color, say) does not make the whole configuration unreadable.
|
||||
fn lenient_list<'de, D, T>(deserializer: D) -> Result<Vec<T>, D::Error>
|
||||
where
|
||||
D: serde::Deserializer<'de>,
|
||||
T: serde::de::DeserializeOwned,
|
||||
{
|
||||
let values = Vec::<serde_json::Value>::deserialize(deserializer).unwrap_or_default();
|
||||
Ok(values
|
||||
.into_iter()
|
||||
.filter_map(|value| serde_json::from_value(value).ok())
|
||||
.collect())
|
||||
}
|
||||
|
||||
/// An optional setting that no longer parses is treated as not set.
|
||||
fn lenient_option<'de, D, T>(deserializer: D) -> Result<Option<T>, D::Error>
|
||||
where
|
||||
D: serde::Deserializer<'de>,
|
||||
T: serde::de::DeserializeOwned,
|
||||
{
|
||||
let value = serde_json::Value::deserialize(deserializer).unwrap_or(serde_json::Value::Null);
|
||||
Ok(serde_json::from_value(value).ok())
|
||||
}
|
||||
|
||||
// Missing keys take their default: a configuration written by an older version, or edited by
|
||||
// hand, must still load instead of being replaced by a blank one.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
#[serde(default)]
|
||||
pub struct AppConfig {
|
||||
#[serde(deserialize_with = "lenient_list")]
|
||||
pub vaults: Vec<VaultConfig>,
|
||||
pub active_vault: Option<String>,
|
||||
#[serde(default)]
|
||||
@@ -163,9 +194,13 @@ pub struct AppConfig {
|
||||
pub accent_color: Option<String>,
|
||||
#[serde(default)]
|
||||
pub font_size: Option<u32>,
|
||||
/// The size chosen in Appearance. Zooming changes `font_size` only, and resetting the zoom
|
||||
/// returns to this.
|
||||
#[serde(default)]
|
||||
pub preferred_font_size: Option<u32>,
|
||||
#[serde(default = "default_true")]
|
||||
pub scroll_to_change_font_size: bool,
|
||||
#[serde(default)]
|
||||
#[serde(default, deserialize_with = "lenient_option")]
|
||||
pub toolbar_layout: Option<ToolbarLayout>,
|
||||
#[serde(default)]
|
||||
pub font_family: Option<String>,
|
||||
@@ -274,7 +309,7 @@ pub struct AppConfig {
|
||||
pub sync_interval_minutes: u32,
|
||||
#[serde(default)]
|
||||
pub last_sync_time: Option<String>,
|
||||
#[serde(default)]
|
||||
#[serde(default, deserialize_with = "lenient_list")]
|
||||
pub custom_themes: Vec<CustomTheme>,
|
||||
}
|
||||
|
||||
@@ -337,6 +372,7 @@ impl Default for AppConfig {
|
||||
system_dark_theme: default_system_dark_theme(),
|
||||
accent_color: None,
|
||||
font_size: None,
|
||||
preferred_font_size: None,
|
||||
scroll_to_change_font_size: true,
|
||||
toolbar_layout: None,
|
||||
font_family: None,
|
||||
@@ -535,6 +571,9 @@ pub struct BackupEntry {
|
||||
pub path: String,
|
||||
pub size: u64,
|
||||
pub created: String,
|
||||
/// The archive was made from a different vault folder. All vaults share one backup folder.
|
||||
#[serde(default)]
|
||||
pub other_vault: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
|
||||
@@ -1,9 +1,70 @@
|
||||
use crate::types::NoteMeta;
|
||||
use chrono::{NaiveDate, NaiveDateTime, Utc};
|
||||
use gray_matter::engine::YAML;
|
||||
use gray_matter::Matter;
|
||||
use gray_matter::engine::{Engine, YAML as UnboundedYaml};
|
||||
use gray_matter::{Matter, Pod};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
const MAX_FRONTMATTER_BYTES: usize = 64 * 1024;
|
||||
const MAX_FRONTMATTER_ALIASES: usize = 16;
|
||||
const MAX_FRONTMATTER_INDENT: usize = 200;
|
||||
const MAX_FRONTMATTER_INDICATORS: usize = 32;
|
||||
|
||||
/// YAML frontmatter engine for notes, which are untrusted input (sync, import, shared vaults).
|
||||
/// The underlying loader expands every alias by copying and recurses once per nesting level, so a
|
||||
/// note of a few hundred bytes could take gigabytes or overflow the stack and take the app down
|
||||
/// at every start. Frontmatter outside these bounds is treated as carrying no metadata.
|
||||
pub struct BoundedYaml;
|
||||
|
||||
impl Engine for BoundedYaml {
|
||||
fn parse(content: &str) -> Pod {
|
||||
if frontmatter_within_bounds(content) {
|
||||
UnboundedYaml::parse(content)
|
||||
} else {
|
||||
Pod::Null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn frontmatter_within_bounds(content: &str) -> bool {
|
||||
if content.len() > MAX_FRONTMATTER_BYTES {
|
||||
return false;
|
||||
}
|
||||
// Aliases multiply: with few of them the expansion stays small whatever they point at.
|
||||
let bytes = content.as_bytes();
|
||||
let aliases = bytes
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter(|&(index, &byte)| {
|
||||
byte == b'*'
|
||||
&& (index == 0
|
||||
|| matches!(
|
||||
bytes[index - 1],
|
||||
b' ' | b'\t' | b'\n' | b'[' | b',' | b':' | b'-' | b'{'
|
||||
))
|
||||
&& bytes
|
||||
.get(index + 1)
|
||||
.is_some_and(|next| next.is_ascii_alphanumeric() || matches!(next, b'_' | b'-'))
|
||||
})
|
||||
.count();
|
||||
if aliases > MAX_FRONTMATTER_ALIASES {
|
||||
return false;
|
||||
}
|
||||
// Block nesting deepens by indentation, or by indicators chained on one line (`- - - x`).
|
||||
content.lines().all(|line| {
|
||||
let indent = line.len() - line.trim_start_matches(' ').len();
|
||||
let mut rest = &line.as_bytes()[indent..];
|
||||
let mut indicators = 0;
|
||||
while let [b'-' | b'?' | b':', b' ' | b'\t', tail @ ..] = rest {
|
||||
indicators += 1;
|
||||
rest = tail;
|
||||
while let [b' ' | b'\t', tail @ ..] = rest {
|
||||
rest = tail;
|
||||
}
|
||||
}
|
||||
indent <= MAX_FRONTMATTER_INDENT && indicators <= MAX_FRONTMATTER_INDICATORS
|
||||
})
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||
struct RawFrontmatter {
|
||||
id: Option<String>,
|
||||
@@ -40,14 +101,60 @@ pub fn parse_date_flexible(s: &str) -> Option<chrono::DateTime<Utc>> {
|
||||
None
|
||||
}
|
||||
|
||||
/// Reads the known keys one by one. Frontmatter written by other editors is often shaped a little
|
||||
/// differently (`tags: work`, `pinned: yes`, a numeric title or id); reading it as one strict
|
||||
/// record dropped every field when a single one did not fit, and the next save then wrote a new id,
|
||||
/// the file name as title and no tags over the originals.
|
||||
fn read_frontmatter(data: Option<Pod>) -> RawFrontmatter {
|
||||
let Some(serde_json::Value::Object(fields)) =
|
||||
data.and_then(|data| data.deserialize::<serde_json::Value>().ok())
|
||||
else {
|
||||
return RawFrontmatter::default();
|
||||
};
|
||||
let text = |value: &serde_json::Value| match value {
|
||||
serde_json::Value::String(text) => Some(text.clone()),
|
||||
serde_json::Value::Number(number) => Some(number.to_string()),
|
||||
serde_json::Value::Bool(flag) => Some(flag.to_string()),
|
||||
_ => None,
|
||||
};
|
||||
let tags = fields.get("tags").map(|value| match value {
|
||||
serde_json::Value::Array(items) => items.iter().filter_map(text).collect(),
|
||||
// `tags: work` and `tags: a, b` are common outside this app.
|
||||
other => text(other)
|
||||
.map(|joined| {
|
||||
joined
|
||||
.split(',')
|
||||
.map(|tag| tag.trim().to_string())
|
||||
.filter(|tag| !tag.is_empty())
|
||||
.collect()
|
||||
})
|
||||
.unwrap_or_default(),
|
||||
});
|
||||
let pinned = fields.get("pinned").and_then(|value| match value {
|
||||
serde_json::Value::Bool(flag) => Some(*flag),
|
||||
serde_json::Value::Number(number) => Some(number.as_f64() != Some(0.0)),
|
||||
serde_json::Value::String(word) => match word.trim().to_ascii_lowercase().as_str() {
|
||||
"true" | "yes" | "on" | "1" => Some(true),
|
||||
"false" | "no" | "off" | "0" => Some(false),
|
||||
_ => None,
|
||||
},
|
||||
_ => None,
|
||||
});
|
||||
RawFrontmatter {
|
||||
id: fields.get("id").and_then(text),
|
||||
title: fields.get("title").and_then(text),
|
||||
tags,
|
||||
pinned,
|
||||
created: fields.get("created").and_then(text),
|
||||
modified: fields.get("modified").and_then(text),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse_note(raw: &str, filename: &str) -> (NoteMeta, String) {
|
||||
let matter = Matter::<YAML>::new();
|
||||
let matter = Matter::<BoundedYaml>::new();
|
||||
let result = matter.parse(raw);
|
||||
|
||||
let fm: RawFrontmatter = result
|
||||
.data
|
||||
.and_then(|d| d.deserialize().ok())
|
||||
.unwrap_or_default();
|
||||
let fm = read_frontmatter(result.data);
|
||||
|
||||
let title = fm.title.unwrap_or_else(|| filename_to_title(filename));
|
||||
|
||||
@@ -77,18 +184,15 @@ pub fn parse_note(raw: &str, filename: &str) -> (NoteMeta, String) {
|
||||
(meta, content)
|
||||
}
|
||||
|
||||
/// Ensure the body starts with `# Title` heading for external app compatibility.
|
||||
/// If the body already starts with `# Title`, leave it as-is.
|
||||
/// Ensure the body starts with a top-level heading for external app compatibility, adding
|
||||
/// `# Title` when it has none. A body that already opens with a top-level heading is left alone
|
||||
/// even when that heading differs from the title: adding another one above it stacked a new
|
||||
/// heading on every title change (`# New`, `# Old`, ...).
|
||||
fn ensure_title_heading(body: &str, title: &str) -> String {
|
||||
let trimmed = body.trim_start();
|
||||
|
||||
// Check if body already starts with `# Title`
|
||||
if let Some(rest) = trimmed.strip_prefix("# ") {
|
||||
let first_line_end = rest.find('\n').unwrap_or(rest.len());
|
||||
let heading_text = rest[..first_line_end].trim();
|
||||
if heading_text.eq_ignore_ascii_case(title.trim()) {
|
||||
return body.to_string();
|
||||
}
|
||||
if trimmed.starts_with("# ") {
|
||||
return body.to_string();
|
||||
}
|
||||
|
||||
// Don't add heading to empty notes (new/blank notes)
|
||||
@@ -100,29 +204,24 @@ fn ensure_title_heading(body: &str, title: &str) -> String {
|
||||
format!("# {}\n\n{}", title, body)
|
||||
}
|
||||
|
||||
/// The frontmatter block for a note that has none yet. Written through the YAML serializer like
|
||||
/// `merge_frontmatter`: assembled by hand, a title with a backslash or a tag such as `2024`,
|
||||
/// `true` or `a: b` came out as YAML the app could not read back.
|
||||
pub fn serialize_frontmatter(meta: &NoteMeta) -> String {
|
||||
let tags_str = if meta.tags.is_empty() {
|
||||
"[]".to_string()
|
||||
} else {
|
||||
format!(
|
||||
"[{}]",
|
||||
meta.tags
|
||||
.iter()
|
||||
.map(|t| t.to_string())
|
||||
.collect::<Vec<_>>()
|
||||
.join(", ")
|
||||
)
|
||||
};
|
||||
|
||||
format!(
|
||||
"---\nid: \"{}\"\ntitle: \"{}\"\ntags: {}\npinned: {}\ncreated: {}\nmodified: {}\n---\n",
|
||||
meta.id,
|
||||
meta.title.replace('"', "\\\""),
|
||||
tags_str,
|
||||
meta.pinned,
|
||||
meta.created.to_rfc3339(),
|
||||
meta.modified.to_rfc3339(),
|
||||
)
|
||||
let text = |value: &str| serde_yaml::Value::String(value.to_string());
|
||||
let mut mapping = serde_yaml::Mapping::new();
|
||||
mapping.insert(text("id"), text(&meta.id));
|
||||
mapping.insert(text("title"), text(&meta.title));
|
||||
mapping.insert(
|
||||
text("tags"),
|
||||
serde_yaml::Value::Sequence(meta.tags.iter().map(|tag| text(tag)).collect()),
|
||||
);
|
||||
mapping.insert(text("pinned"), serde_yaml::Value::Bool(meta.pinned));
|
||||
mapping.insert(text("created"), text(&meta.created.to_rfc3339()));
|
||||
mapping.insert(text("modified"), text(&meta.modified.to_rfc3339()));
|
||||
let yaml = serde_yaml::to_string(&serde_yaml::Value::Mapping(mapping))
|
||||
.expect("strings, booleans and a list always serialize");
|
||||
format!("---\n{yaml}---\n")
|
||||
}
|
||||
|
||||
pub fn update_note_raw(meta: &NoteMeta, body: &str) -> String {
|
||||
@@ -134,7 +233,7 @@ pub fn update_note_raw(meta: &NoteMeta, body: &str) -> String {
|
||||
/// Merge NoteMeta fields into existing frontmatter, preserving unknown YAML keys.
|
||||
/// Falls back to serialize_frontmatter() if the original has no frontmatter.
|
||||
pub fn merge_frontmatter(original_raw: &str, meta: &NoteMeta, body: &str) -> String {
|
||||
let matter = Matter::<YAML>::new();
|
||||
let matter = Matter::<BoundedYaml>::new();
|
||||
let parsed = matter.parse(original_raw);
|
||||
|
||||
// If original had no frontmatter, use the simple serializer
|
||||
@@ -214,13 +313,9 @@ pub fn filename_to_title(filename: &str) -> String {
|
||||
|
||||
/// Quick title extraction from raw note content (frontmatter only, no full parse)
|
||||
pub fn extract_title(raw: &str) -> Option<String> {
|
||||
let matter = Matter::<YAML>::new();
|
||||
let matter = Matter::<BoundedYaml>::new();
|
||||
let result = matter.parse(raw);
|
||||
let fm: RawFrontmatter = result
|
||||
.data
|
||||
.and_then(|d| d.deserialize().ok())
|
||||
.unwrap_or_default();
|
||||
fm.title
|
||||
read_frontmatter(result.data).title
|
||||
}
|
||||
|
||||
pub fn extract_preview(content: &str, max_len: usize) -> String {
|
||||
@@ -422,4 +517,215 @@ mod tests {
|
||||
eprintln!("Stripped: {:?}", stripped);
|
||||
assert!(stripped.contains("Telefoonnummer"));
|
||||
}
|
||||
fn alias_bomb(levels: usize, width: usize) -> String {
|
||||
let mut note = format!(
|
||||
"---\ntitle: Bomb\na0: &a0 [{}]\n",
|
||||
vec!["1"; width].join(",")
|
||||
);
|
||||
for level in 1..levels {
|
||||
let alias = format!("*a{}", level - 1);
|
||||
note.push_str(&format!(
|
||||
"a{level}: &a{level} [{}]\n",
|
||||
vec![alias.as_str(); width].join(",")
|
||||
));
|
||||
}
|
||||
note.push_str("---\nbody\n");
|
||||
note
|
||||
}
|
||||
|
||||
/// Runs on a stack the size of the app's worker threads, where the unbounded loader overflowed.
|
||||
fn on_worker_stack<T: Send + 'static>(work: impl FnOnce() -> T + Send + 'static) -> T {
|
||||
std::thread::Builder::new()
|
||||
.stack_size(2 * 1024 * 1024)
|
||||
.spawn(work)
|
||||
.unwrap()
|
||||
.join()
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hostile_frontmatter_is_read_as_a_note_without_metadata() {
|
||||
let nested_on_one_line = format!("---\nt: {}x\n---\nbody\n", "- ".repeat(2400));
|
||||
let mut nested_by_indent = String::from("---\nt:\n");
|
||||
for depth in 0..400 {
|
||||
note_line(&mut nested_by_indent, depth);
|
||||
}
|
||||
nested_by_indent.push_str("---\nbody\n");
|
||||
let oversized = format!(
|
||||
"---\ntitle: Big\nfiller: \"{}\"\n---\nbody\n",
|
||||
"x".repeat(MAX_FRONTMATTER_BYTES)
|
||||
);
|
||||
for note in [
|
||||
alias_bomb(10, 8),
|
||||
alias_bomb(40, 2),
|
||||
nested_on_one_line,
|
||||
nested_by_indent,
|
||||
oversized,
|
||||
] {
|
||||
let started = std::time::Instant::now();
|
||||
let (title, content, extracted, merged) = on_worker_stack(move || {
|
||||
let (meta, content) = parse_note(¬e, "Fallback Name.md");
|
||||
let merged = merge_frontmatter(¬e, &meta, &content);
|
||||
(meta.title, content, extract_title(¬e), merged)
|
||||
});
|
||||
assert!(started.elapsed() < std::time::Duration::from_secs(2));
|
||||
// No metadata is taken from it, and the body is still split off as usual.
|
||||
assert_eq!(title, "Fallback Name");
|
||||
assert_eq!(content, "body");
|
||||
assert_eq!(extracted, None);
|
||||
assert!(
|
||||
merged.ends_with("body"),
|
||||
"{}",
|
||||
&merged[merged.len().saturating_sub(40)..]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
fn note_line(note: &mut String, depth: usize) {
|
||||
note.push_str(&" ".repeat(depth));
|
||||
note.push_str("-\n");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ordinary_frontmatter_is_unaffected_by_the_bounds() {
|
||||
let (meta, content) = parse_note(
|
||||
"---\nid: abc\ntitle: \"*Starred* title: 5*3\"\ntags:\n - one\n - two\npinned: true\n---\n# Body\n",
|
||||
"x.md",
|
||||
);
|
||||
assert_eq!(meta.id, "abc");
|
||||
assert_eq!(meta.title, "*Starred* title: 5*3");
|
||||
assert_eq!(meta.tags, vec!["one", "two"]);
|
||||
assert!(meta.pinned);
|
||||
assert_eq!(content, "# Body");
|
||||
// A few aliases and modest nesting are ordinary YAML.
|
||||
let (meta, _) = parse_note(
|
||||
"---\ntitle: Shared\nbase: &base [a, b]\ntags: *base\nextra:\n - - nested\n - list\n---\nbody\n",
|
||||
"x.md",
|
||||
);
|
||||
assert_eq!(meta.title, "Shared");
|
||||
assert_eq!(meta.tags, vec!["a", "b"]);
|
||||
assert!(frontmatter_within_bounds(&format!(
|
||||
"title: {}",
|
||||
"x".repeat(MAX_FRONTMATTER_BYTES - 16)
|
||||
)));
|
||||
}
|
||||
#[test]
|
||||
fn one_field_of_another_shape_no_longer_drops_the_rest() {
|
||||
let note = |extra: &str| format!("---\nid: keep-me\ntitle: Kept\n{extra}\n---\nbody\n");
|
||||
let (meta, _) = parse_note(¬e("tags: work"), "File.md");
|
||||
assert_eq!((meta.id.as_str(), meta.title.as_str()), ("keep-me", "Kept"));
|
||||
assert_eq!(meta.tags, vec!["work"]);
|
||||
let (meta, _) = parse_note(¬e("tags: a, b ,c\npinned: yes"), "File.md");
|
||||
assert_eq!(meta.tags, vec!["a", "b", "c"]);
|
||||
assert!(meta.pinned);
|
||||
assert_eq!(meta.id, "keep-me");
|
||||
// Numbers where text is expected are read as text.
|
||||
let (meta, _) = parse_note(
|
||||
"---\nid: 20231014\ntitle: 2024\ntags: [1, two, true]\npinned: 0\n---\nbody\n",
|
||||
"File.md",
|
||||
);
|
||||
assert_eq!(
|
||||
(meta.id.as_str(), meta.title.as_str()),
|
||||
("20231014", "2024")
|
||||
);
|
||||
assert_eq!(meta.tags, vec!["1", "two", "true"]);
|
||||
assert!(!meta.pinned);
|
||||
assert_eq!(
|
||||
extract_title("---\ntitle: 2024\ntags: work\n---\nbody\n").as_deref(),
|
||||
Some("2024")
|
||||
);
|
||||
// A field that makes no sense is skipped on its own.
|
||||
let (meta, _) = parse_note(¬e("tags: {a: b}\npinned: maybe"), "File.md");
|
||||
assert_eq!(meta.id, "keep-me");
|
||||
assert!(meta.tags.is_empty());
|
||||
assert!(!meta.pinned);
|
||||
// Saving keeps the identity and writes the tags as a list.
|
||||
let (meta, content) = parse_note(¬e("tags: work\naliases: [x]"), "File.md");
|
||||
let saved = merge_frontmatter(¬e("tags: work\naliases: [x]"), &meta, &content);
|
||||
let (again, _) = parse_note(&saved, "File.md");
|
||||
assert_eq!(
|
||||
(again.id.as_str(), again.title.as_str()),
|
||||
("keep-me", "Kept")
|
||||
);
|
||||
assert_eq!(again.tags, vec!["work"]);
|
||||
assert!(saved.contains("aliases:"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn new_frontmatter_reads_back_whatever_the_title_and_tags_contain() {
|
||||
for (title, tags) in [
|
||||
("C:\\Users\\tom", vec!["2024", "true"]),
|
||||
("Plain", vec!["foo: bar", "a,b"]),
|
||||
("Say \"hi\" and 'bye'", vec!["#hash", "- dash"]),
|
||||
("\\sum x", vec!["null", "~", "1.5"]),
|
||||
(
|
||||
"Tab\there: colon # hash",
|
||||
vec!["[x]", "{y}", "*star", "&"],
|
||||
),
|
||||
("- leading dash", vec![]),
|
||||
("", vec!["yes"]),
|
||||
] {
|
||||
let meta = NoteMeta {
|
||||
id: "the-id".into(),
|
||||
title: title.into(),
|
||||
tags: tags.iter().map(|tag| tag.to_string()).collect(),
|
||||
pinned: true,
|
||||
created: Utc::now(),
|
||||
modified: Utc::now(),
|
||||
};
|
||||
let raw = update_note_raw(&meta, "body\n");
|
||||
let (back, content) = parse_note(&raw, "Fallback.md");
|
||||
assert_eq!(back.id, "the-id", "{raw}");
|
||||
assert_eq!(back.title, title, "{raw}");
|
||||
assert_eq!(back.tags, meta.tags, "{raw}");
|
||||
assert!(back.pinned);
|
||||
assert_eq!(back.created.timestamp(), meta.created.timestamp());
|
||||
assert!(content.ends_with("body"));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_title_heading_is_added_only_when_the_body_has_no_top_level_heading() {
|
||||
let meta = |title: &str| NoteMeta {
|
||||
id: "id".into(),
|
||||
title: title.into(),
|
||||
tags: vec![],
|
||||
pinned: false,
|
||||
created: Utc::now(),
|
||||
modified: Utc::now(),
|
||||
};
|
||||
let body_of = |raw: String| parse_note(&raw, "x.md").1;
|
||||
// No heading yet: the title becomes one.
|
||||
assert_eq!(
|
||||
body_of(update_note_raw(&meta("New"), "Text.\n")),
|
||||
"# New\n\nText."
|
||||
);
|
||||
// A heading that differs from the title is not buried under a second one.
|
||||
assert_eq!(
|
||||
body_of(update_note_raw(&meta("New"), "# Old\n\nText.\n")),
|
||||
"# Old\n\nText."
|
||||
);
|
||||
let original = "---\nid: id\ntitle: Old\n---\n# Old\n\nText.\n";
|
||||
assert_eq!(
|
||||
body_of(merge_frontmatter(
|
||||
original,
|
||||
&meta("New"),
|
||||
"# Old\n\nText.\n"
|
||||
)),
|
||||
"# Old\n\nText."
|
||||
);
|
||||
// Saving again and again never grows the note.
|
||||
let once = merge_frontmatter(original, &meta("New"), "# Old\n\nText.\n");
|
||||
let (_, body) = parse_note(&once, "x.md");
|
||||
assert_eq!(
|
||||
body_of(merge_frontmatter(&once, &meta("Newer"), &body)),
|
||||
"# Old\n\nText."
|
||||
);
|
||||
// Lower-level headings and empty notes behave as before.
|
||||
assert_eq!(
|
||||
body_of(update_note_raw(&meta("New"), "## Section\n")),
|
||||
"# New\n\n## Section"
|
||||
);
|
||||
assert!(update_note_raw(&meta("New"), "\n").ends_with("---\n\n"));
|
||||
}
|
||||
}
|
||||
+137
-32
@@ -3,8 +3,8 @@ use std::fs::OpenOptions;
|
||||
use std::io;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use crate::vault::frontmatter::BoundedYaml;
|
||||
use chrono::Utc;
|
||||
use gray_matter::engine::YAML;
|
||||
use gray_matter::Matter;
|
||||
use regex::Regex;
|
||||
use uuid::Uuid;
|
||||
@@ -15,6 +15,9 @@ use crate::vault::operations::replace_file_atomically;
|
||||
|
||||
pub fn import(vault_path: &str) -> Result<ImportResult, String> {
|
||||
let vault = Path::new(vault_path);
|
||||
// Folders that are empty before the import are notebooks the user made; only folders the
|
||||
// import itself empties are removed afterwards.
|
||||
let already_empty = empty_dirs(vault)?;
|
||||
|
||||
let file_index = build_file_index(vault)?;
|
||||
|
||||
@@ -204,16 +207,18 @@ pub fn import(vault_path: &str) -> Result<ImportResult, String> {
|
||||
}
|
||||
}
|
||||
|
||||
cleanup_empty_dirs(vault)?;
|
||||
cleanup_empty_dirs(vault, &already_empty)?;
|
||||
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
fn is_excluded_dir(path: &Path) -> bool {
|
||||
matches!(
|
||||
path.file_name().and_then(|name| name.to_str()),
|
||||
Some(".helixnotes" | ".obsidian" | ".trash" | ".stfolder" | ".claude")
|
||||
)
|
||||
/// Hidden files and folders are never imported, moved or cleaned up. The app's own `.helixnotes`
|
||||
/// and Obsidian's `.obsidian` and `.trash` are among them, and so is `.git`: every file that is
|
||||
/// not a note becomes an attachment and its original is deleted, which took a repository apart.
|
||||
fn is_hidden_entry(path: &Path) -> bool {
|
||||
path.file_name()
|
||||
.and_then(|name| name.to_str())
|
||||
.is_some_and(|name| name.starts_with('.'))
|
||||
}
|
||||
|
||||
fn vault_entries(
|
||||
@@ -221,9 +226,7 @@ fn vault_entries(
|
||||
) -> impl Iterator<Item = Result<walkdir::DirEntry, walkdir::Error>> + '_ {
|
||||
walkdir::WalkDir::new(vault)
|
||||
.into_iter()
|
||||
.filter_entry(|entry| {
|
||||
entry.depth() == 0 || !entry.file_type().is_dir() || !is_excluded_dir(entry.path())
|
||||
})
|
||||
.filter_entry(|entry| entry.depth() == 0 || !is_hidden_entry(entry.path()))
|
||||
}
|
||||
|
||||
fn scanned_files(vault: &Path) -> Result<Vec<PathBuf>, String> {
|
||||
@@ -259,7 +262,7 @@ fn build_file_index(vault: &Path) -> Result<HashMap<String, String>, String> {
|
||||
}
|
||||
|
||||
fn rename_deprecated_properties(raw: &str) -> String {
|
||||
let matter = Matter::<YAML>::new();
|
||||
let matter = Matter::<BoundedYaml>::new();
|
||||
let result = matter.parse(raw);
|
||||
|
||||
if result.matter.trim().is_empty() {
|
||||
@@ -298,7 +301,7 @@ fn rename_deprecated_properties(raw: &str) -> String {
|
||||
}
|
||||
|
||||
fn normalize_frontmatter(raw: &str, path: &Path) -> (NoteMeta, String) {
|
||||
let matter = Matter::<YAML>::new();
|
||||
let matter = Matter::<BoundedYaml>::new();
|
||||
let result = matter.parse(raw);
|
||||
let yaml_str = result.matter.trim();
|
||||
|
||||
@@ -782,7 +785,20 @@ fn resolve_relative_ref(base: &Path, reference: &str) -> Option<String> {
|
||||
Some(rel.to_string_lossy().replace('\\', "/"))
|
||||
}
|
||||
|
||||
fn cleanup_empty_dirs(root: &Path) -> Result<(), String> {
|
||||
fn empty_dirs(root: &Path) -> Result<HashSet<PathBuf>, String> {
|
||||
let mut empty = HashSet::new();
|
||||
for entry in vault_entries(root) {
|
||||
let entry = entry.map_err(|e| format!("Scanning {}: {e}", root.display()))?;
|
||||
if entry.file_type().is_dir()
|
||||
&& std::fs::read_dir(entry.path()).is_ok_and(|mut entries| entries.next().is_none())
|
||||
{
|
||||
empty.insert(entry.into_path());
|
||||
}
|
||||
}
|
||||
Ok(empty)
|
||||
}
|
||||
|
||||
fn cleanup_empty_dirs(root: &Path, keep: &HashSet<PathBuf>) -> 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())),
|
||||
@@ -795,7 +811,7 @@ fn cleanup_empty_dirs(root: &Path) -> Result<(), String> {
|
||||
dirs.sort_by_key(|path| std::cmp::Reverse(path.components().count()));
|
||||
|
||||
for dir in dirs {
|
||||
if dir == root {
|
||||
if dir == root || keep.contains(&dir) {
|
||||
continue;
|
||||
}
|
||||
let mut entries =
|
||||
@@ -883,30 +899,119 @@ fn pathdiff(target: &str, base: &str) -> Result<String, ()> {
|
||||
}
|
||||
|
||||
fn percent_decode(s: &str) -> String {
|
||||
let mut result = String::with_capacity(s.len());
|
||||
let mut chars = s.bytes();
|
||||
while let Some(b) = chars.next() {
|
||||
if b == b'%' {
|
||||
let hi = chars.next();
|
||||
let lo = chars.next();
|
||||
if let (Some(h), Some(l)) = (hi, lo) {
|
||||
if let Ok(byte) = u8::from_str_radix(&format!("{}{}", h as char, l as char), 16) {
|
||||
result.push(byte as char);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
result.push('%');
|
||||
} else {
|
||||
result.push(b as char);
|
||||
}
|
||||
}
|
||||
result
|
||||
// Keep the complete original reference if escaped bytes are not valid UTF-8.
|
||||
urlencoding::decode(s)
|
||||
.map(|decoded| decoded.into_owned())
|
||||
.unwrap_or_else(|_| s.to_string())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn percent_decode_preserves_unicode_plus_and_malformed_escapes() {
|
||||
for (input, expected) in [
|
||||
("café 雪+.png", "café 雪+.png"),
|
||||
("caf%C3%A9%20%E9%9B%AA+.png", "café 雪+.png"),
|
||||
("bad%GG%20name.png", "bad%GG name.png"),
|
||||
("tail%", "tail%"),
|
||||
("tail%2", "tail%2"),
|
||||
("雪%FF%20+%GG", "雪%FF%20+%GG"),
|
||||
("%E9%9B", "%E9%9B"),
|
||||
] {
|
||||
assert_eq!(percent_decode(input), expected, "input {input:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn import_leaves_hidden_files_and_existing_empty_folders_alone() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let root = vault.path();
|
||||
// A git-backed vault with dotfiles, an empty notebook, and a folder of attachments only.
|
||||
std::fs::create_dir_all(root.join(".git/objects/ab")).unwrap();
|
||||
std::fs::write(root.join(".git/HEAD"), "ref: refs/heads/main\n").unwrap();
|
||||
std::fs::write(root.join(".git/objects/ab/cdef"), b"blob").unwrap();
|
||||
std::fs::write(root.join(".gitignore"), ".obsidian/workspace.json\n").unwrap();
|
||||
std::fs::create_dir_all(root.join(".stversions")).unwrap();
|
||||
std::fs::write(root.join(".stversions/old.png"), b"old").unwrap();
|
||||
std::fs::create_dir(root.join("Empty notebook")).unwrap();
|
||||
std::fs::create_dir(root.join("Pictures")).unwrap();
|
||||
std::fs::write(root.join("Pictures/photo.png"), b"png").unwrap();
|
||||
std::fs::write(root.join("Note.md"), "# Note\n\n\n").unwrap();
|
||||
|
||||
let result = import(root.to_str().unwrap()).unwrap();
|
||||
|
||||
assert_eq!(result.attachments_moved, 1);
|
||||
assert_eq!(
|
||||
std::fs::read_to_string(root.join(".git/HEAD")).unwrap(),
|
||||
"ref: refs/heads/main\n"
|
||||
);
|
||||
assert_eq!(
|
||||
std::fs::read(root.join(".git/objects/ab/cdef")).unwrap(),
|
||||
b"blob"
|
||||
);
|
||||
assert!(root.join(".gitignore").is_file());
|
||||
assert!(root.join(".stversions/old.png").is_file());
|
||||
// Nothing hidden was copied into the attachments either.
|
||||
assert!(!root.join(".helixnotes/attachments/.git").exists());
|
||||
assert!(!root.join(".helixnotes/attachments/.gitignore").exists());
|
||||
// The folder the import emptied is gone; the one that was empty already is kept.
|
||||
assert!(!root.join("Pictures").exists());
|
||||
assert!(root.join("Empty notebook").is_dir());
|
||||
assert!(root
|
||||
.join(".helixnotes/attachments/Pictures/photo.png")
|
||||
.is_file());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn import_rewrites_unicode_encoded_and_malformed_attachment_references() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let root = vault.path();
|
||||
let note_dir = root.join("笔记");
|
||||
std::fs::create_dir(¬e_dir).unwrap();
|
||||
let attachments = [
|
||||
"café 雪+.png",
|
||||
"bad%GG.png",
|
||||
"tail%.png",
|
||||
"tail%2.png",
|
||||
"bytes%FF%20.png",
|
||||
];
|
||||
for name in attachments {
|
||||
std::fs::write(note_dir.join(name), name.as_bytes()).unwrap();
|
||||
}
|
||||
let note_path = note_dir.join("Entry.md");
|
||||
std::fs::write(
|
||||
¬e_path,
|
||||
"# Entry\n\n\n\
|
||||
[encoded](caf%C3%A9%20%E9%9B%AA+.png#preview)\n\
|
||||
\n\n\
|
||||
[short](tail%2.png)\n[invalid UTF-8](bytes%FF%20.png)\n",
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
let result = import(root.to_str().unwrap()).unwrap();
|
||||
assert_eq!(result.attachments_moved, attachments.len() as u64);
|
||||
let note = std::fs::read_to_string(¬e_path).unwrap();
|
||||
for reference in [
|
||||
"",
|
||||
"[encoded](../.helixnotes/attachments/笔记/café%20雪+.png#preview)",
|
||||
"",
|
||||
"",
|
||||
"[short](../.helixnotes/attachments/笔记/tail%2.png)",
|
||||
"[invalid UTF-8](../.helixnotes/attachments/笔记/bytes%FF%20.png)",
|
||||
] {
|
||||
assert!(note.contains(reference), "missing {reference:?} in {note}");
|
||||
}
|
||||
for name in attachments {
|
||||
assert!(!note_dir.join(name).exists());
|
||||
assert_eq!(
|
||||
std::fs::read(root.join(".helixnotes/attachments/笔记").join(name)).unwrap(),
|
||||
name.as_bytes()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_normalize_tags_comma_string() {
|
||||
let mapping: serde_yaml::Mapping = serde_yaml::from_str("tags: \"a, b, c\"").unwrap();
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
pub mod frontmatter;
|
||||
pub mod import;
|
||||
pub mod operations;
|
||||
#[cfg(target_os = "linux")]
|
||||
mod portal_watcher;
|
||||
pub mod watcher;
|
||||
|
||||
#[cfg(test)]
|
||||
mod note_import_tests;
|
||||
@@ -0,0 +1,495 @@
|
||||
use super::operations::{
|
||||
ensure_vault_structure, import_note as import_from_root, ExternalNoteReference,
|
||||
};
|
||||
|
||||
fn import_note(
|
||||
vault: &str,
|
||||
source: &str,
|
||||
notebook: Option<&str>,
|
||||
raw: &str,
|
||||
references: Vec<ExternalNoteReference>,
|
||||
authorize: impl Fn(&Path) -> Result<(), String>,
|
||||
) -> Result<crate::types::NoteContent, String> {
|
||||
import_from_root(
|
||||
vault,
|
||||
source,
|
||||
Path::new(source).parent().unwrap(),
|
||||
notebook,
|
||||
raw,
|
||||
references,
|
||||
authorize,
|
||||
)
|
||||
}
|
||||
use std::fs;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
fn reference(raw: &str, original: &str, href: &str, html: bool) -> ExternalNoteReference {
|
||||
let from = raw.find(original).unwrap();
|
||||
ExternalNoteReference {
|
||||
from,
|
||||
to: from + original.len(),
|
||||
href: href.into(),
|
||||
html,
|
||||
pdf: false,
|
||||
}
|
||||
}
|
||||
|
||||
fn fixture(raw: &str) -> (tempfile::TempDir, String, PathBuf) {
|
||||
let root = tempfile::tempdir().unwrap();
|
||||
let vault = root.path().join("vault").to_string_lossy().into_owned();
|
||||
ensure_vault_structure(&vault).unwrap();
|
||||
let external = root.path().join("external");
|
||||
fs::create_dir_all(external.join("images")).unwrap();
|
||||
let source = external.join("External.md");
|
||||
fs::write(&source, raw).unwrap();
|
||||
(root, vault, source)
|
||||
}
|
||||
|
||||
fn attachments(vault: &str) -> Vec<PathBuf> {
|
||||
fs::read_dir(Path::new(vault).join(".helixnotes/attachments"))
|
||||
.unwrap()
|
||||
.map(|entry| entry.unwrap().path())
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn imports_relative_files_once_preserving_originals_frontmatter_and_literal_content() {
|
||||
let raw = "---\r\ntitle: Portable\r\ncustom: 雪 📝\r\n---\r\n\r\n\r\n<a href=\"images/report.pdf#page=2&mode=fit\">PDF</a>\r\n\r\n~~~md\r\n\r\n~~~\r\n";
|
||||
for notebook in [None, Some("Projects/Nested")] {
|
||||
let (_root, vault, source) = fixture(raw);
|
||||
let parent = source.parent().unwrap();
|
||||
fs::write(parent.join("images/café 雪.png"), b"image bytes").unwrap();
|
||||
fs::write(parent.join("images/report.pdf"), b"pdf bytes").unwrap();
|
||||
fs::create_dir_all(Path::new(&vault).join("Projects/Nested")).unwrap();
|
||||
let references = vec![
|
||||
reference(raw, "images/café%20雪.png", "images/café%20雪.png", false),
|
||||
reference(
|
||||
raw,
|
||||
"images/./café%20雪.png",
|
||||
"images/./café%20雪.png",
|
||||
false,
|
||||
),
|
||||
reference(
|
||||
raw,
|
||||
"images/report.pdf#page=2&mode=fit",
|
||||
"images/report.pdf#page=2&mode=fit",
|
||||
true,
|
||||
),
|
||||
];
|
||||
let note = import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
notebook,
|
||||
raw,
|
||||
references,
|
||||
|path| {
|
||||
if path.starts_with(parent) {
|
||||
Ok(())
|
||||
} else {
|
||||
Err("Not selected".into())
|
||||
}
|
||||
},
|
||||
)
|
||||
.unwrap();
|
||||
assert!(note
|
||||
.raw
|
||||
.starts_with("---\r\ntitle: Portable\r\ncustom: 雪 📝\r\n---\r\n"));
|
||||
assert!(note.raw.contains(""));
|
||||
assert!(note.raw.contains("#page=2&mode=fit"));
|
||||
assert_eq!(fs::read_to_string(&source).unwrap(), raw);
|
||||
assert_eq!(fs::read_to_string(¬e.path).unwrap(), note.raw);
|
||||
let files = attachments(&vault);
|
||||
assert_eq!(
|
||||
files.len(),
|
||||
2,
|
||||
"aliases of one file share one portable copy"
|
||||
);
|
||||
for file in files {
|
||||
let filename = urlencoding::encode(file.file_name().unwrap().to_str().unwrap());
|
||||
let relative = format!(".helixnotes/attachments/{filename}");
|
||||
assert!(note.raw.contains(&relative));
|
||||
assert!(Path::new(&vault)
|
||||
.join(urlencoding::decode(&relative).unwrap().as_ref())
|
||||
.is_file());
|
||||
}
|
||||
assert_eq!(
|
||||
fs::read(parent.join("images/café 雪.png")).unwrap(),
|
||||
b"image bytes"
|
||||
);
|
||||
assert_eq!(
|
||||
fs::read(parent.join("images/report.pdf")).unwrap(),
|
||||
b"pdf bytes"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn imported_pdf_embeds_keep_the_vault_root_path_convention_in_nested_notebooks() {
|
||||
let raw = "<div data-pdf-src=\"images/report.pdf\" data-pdf-name=\"Report\"></div>";
|
||||
let (_root, vault, source) = fixture(raw);
|
||||
fs::write(source.parent().unwrap().join("images/report.pdf"), b"pdf").unwrap();
|
||||
fs::create_dir_all(Path::new(&vault).join("Projects/Nested")).unwrap();
|
||||
let mut pdf = reference(raw, "images/report.pdf", "images/report.pdf", true);
|
||||
pdf.pdf = true;
|
||||
let note = import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
Some("Projects/Nested"),
|
||||
raw,
|
||||
vec![pdf],
|
||||
|_| Ok(()),
|
||||
)
|
||||
.unwrap();
|
||||
assert!(note.raw.contains("data-pdf-src=\".helixnotes/attachments/"));
|
||||
assert!(note.raw.contains("data-pdf-name=\"Report\""));
|
||||
assert_eq!(attachments(&vault).len(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn imported_document_links_remain_managed_and_stable_after_note_and_notebook_moves() {
|
||||
let raw = "[Report](images/report.pdf#page=2)";
|
||||
let (_root, vault, source) = fixture(raw);
|
||||
fs::write(source.parent().unwrap().join("images/report.pdf"), b"pdf").unwrap();
|
||||
fs::create_dir_all(Path::new(&vault).join("Projects/Nested")).unwrap();
|
||||
fs::create_dir_all(Path::new(&vault).join("Archive")).unwrap();
|
||||
let note = import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
Some("Projects/Nested"),
|
||||
raw,
|
||||
vec![reference(
|
||||
raw,
|
||||
"images/report.pdf#page=2",
|
||||
"images/report.pdf#page=2",
|
||||
false,
|
||||
)],
|
||||
|_| Ok(()),
|
||||
)
|
||||
.unwrap();
|
||||
assert!(
|
||||
note.raw.starts_with("[Report](.helixnotes/attachments/"),
|
||||
"managed links must not depend on notebook depth"
|
||||
);
|
||||
let href = note
|
||||
.raw
|
||||
.strip_prefix("[Report](")
|
||||
.unwrap()
|
||||
.strip_suffix(')')
|
||||
.unwrap();
|
||||
let attachment = Path::new(&vault).join(
|
||||
urlencoding::decode(href.split('#').next().unwrap())
|
||||
.unwrap()
|
||||
.as_ref(),
|
||||
);
|
||||
assert_eq!(fs::read(attachment).unwrap(), b"pdf");
|
||||
let moved = super::operations::move_note(&vault, ¬e.path, &vault)
|
||||
.unwrap()
|
||||
.0;
|
||||
assert_eq!(fs::read_to_string(moved).unwrap(), note.raw);
|
||||
// Imported managed paths remain stable when their containing notebook is moved too.
|
||||
let second = import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
Some("Projects/Nested"),
|
||||
raw,
|
||||
vec![reference(
|
||||
raw,
|
||||
"images/report.pdf#page=2",
|
||||
"images/report.pdf#page=2",
|
||||
false,
|
||||
)],
|
||||
|_| Ok(()),
|
||||
)
|
||||
.unwrap();
|
||||
super::operations::move_notebook(
|
||||
&vault,
|
||||
Path::new(&vault).join("Projects").to_str().unwrap(),
|
||||
Path::new(&vault).join("Archive").to_str().unwrap(),
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
fs::read_to_string(Path::new(&vault).join("Archive/Projects/Nested/External.md")).unwrap(),
|
||||
second.raw
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn import_does_not_replace_existing_note_or_same_named_attachment() {
|
||||
let raw = "";
|
||||
let (_root, vault, source) = fixture(raw);
|
||||
fs::write(
|
||||
source.parent().unwrap().join("images/photo.png"),
|
||||
b"new image",
|
||||
)
|
||||
.unwrap();
|
||||
fs::write(Path::new(&vault).join("External.md"), b"keep note").unwrap();
|
||||
fs::write(
|
||||
Path::new(&vault).join(".helixnotes/attachments/photo.png"),
|
||||
b"keep image",
|
||||
)
|
||||
.unwrap();
|
||||
let note = import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
None,
|
||||
raw,
|
||||
vec![reference(
|
||||
raw,
|
||||
"images/photo.png",
|
||||
"images/photo.png",
|
||||
false,
|
||||
)],
|
||||
|_| Ok(()),
|
||||
)
|
||||
.unwrap();
|
||||
assert!(note.path.ends_with("External (2).md"));
|
||||
assert_eq!(
|
||||
fs::read(Path::new(&vault).join("External.md")).unwrap(),
|
||||
b"keep note"
|
||||
);
|
||||
assert_eq!(
|
||||
fs::read(Path::new(&vault).join(".helixnotes/attachments/photo.png")).unwrap(),
|
||||
b"keep image"
|
||||
);
|
||||
assert_eq!(attachments(&vault).len(), 2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stale_sources_missing_files_and_denied_attachments_publish_nothing() {
|
||||
let raw = "";
|
||||
let (_root, vault, source) = fixture(raw);
|
||||
let plan = || {
|
||||
vec![reference(
|
||||
raw,
|
||||
"images/photo.png",
|
||||
"images/photo.png",
|
||||
false,
|
||||
)]
|
||||
};
|
||||
assert!(import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
None,
|
||||
"stale",
|
||||
plan(),
|
||||
|_| Ok(())
|
||||
)
|
||||
.is_err());
|
||||
assert!(
|
||||
import_note(&vault, source.to_str().unwrap(), None, raw, plan(), |_| Ok(
|
||||
()
|
||||
))
|
||||
.is_err()
|
||||
);
|
||||
fs::write(source.parent().unwrap().join("images/photo.png"), b"image").unwrap();
|
||||
let denied = import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
None,
|
||||
raw,
|
||||
plan(),
|
||||
|path| {
|
||||
if path == source {
|
||||
Ok(())
|
||||
} else {
|
||||
Err("Attachment not selected".into())
|
||||
}
|
||||
},
|
||||
);
|
||||
assert!(denied.unwrap_err().contains("not selected"));
|
||||
assert!(attachments(&vault).is_empty());
|
||||
assert!(!Path::new(&vault).join("External.md").exists());
|
||||
assert_eq!(fs::read_to_string(&source).unwrap(), raw);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn invalid_destinations_ranges_and_absolute_references_are_rejected() {
|
||||
let raw = "雪 ";
|
||||
let (_root, vault, source) = fixture(raw);
|
||||
fs::write(source.parent().unwrap().join("images/photo.png"), b"image").unwrap();
|
||||
assert!(import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
Some("../escape"),
|
||||
raw,
|
||||
vec![],
|
||||
|_| Ok(())
|
||||
)
|
||||
.is_err());
|
||||
for href in [
|
||||
"/private.png",
|
||||
"%2Fprivate.png",
|
||||
"C:/private.png",
|
||||
"https://example.com/file.png",
|
||||
"Related.md",
|
||||
] {
|
||||
assert!(import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
None,
|
||||
raw,
|
||||
vec![reference(raw, "images/photo.png", href, false)],
|
||||
|_| Ok(())
|
||||
)
|
||||
.is_err());
|
||||
}
|
||||
assert!(import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
None,
|
||||
raw,
|
||||
vec![ExternalNoteReference {
|
||||
from: 1,
|
||||
to: 3,
|
||||
href: "images/photo.png".into(),
|
||||
html: false,
|
||||
pdf: false,
|
||||
}],
|
||||
|_| Ok(())
|
||||
)
|
||||
.is_err());
|
||||
let plan = vec![
|
||||
reference(raw, "images/photo.png", "images/photo.png", false),
|
||||
reference(raw, "images/photo.png", "images/photo.png", false),
|
||||
];
|
||||
assert!(import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
None,
|
||||
raw,
|
||||
plan,
|
||||
|_| Ok(())
|
||||
)
|
||||
.is_err());
|
||||
assert!(attachments(&vault).is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn failed_note_publication_removes_only_its_new_attachments() {
|
||||
let raw = "";
|
||||
let (_root, vault, source) = fixture(raw);
|
||||
fs::write(source.parent().unwrap().join("images/photo.png"), b"image").unwrap();
|
||||
fs::write(Path::new(&vault).join("External.md"), b"keep").unwrap();
|
||||
for number in 2..=100 {
|
||||
fs::write(
|
||||
Path::new(&vault).join(format!("External ({number}).md")),
|
||||
b"keep",
|
||||
)
|
||||
.unwrap();
|
||||
}
|
||||
let original_asset = Path::new(&vault).join(".helixnotes/attachments/original.png");
|
||||
fs::write(&original_asset, b"keep attachment").unwrap();
|
||||
assert!(import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
None,
|
||||
raw,
|
||||
vec![reference(
|
||||
raw,
|
||||
"images/photo.png",
|
||||
"images/photo.png",
|
||||
false
|
||||
)],
|
||||
|_| Ok(())
|
||||
)
|
||||
.is_err());
|
||||
assert_eq!(attachments(&vault), vec![original_asset]);
|
||||
assert_eq!(
|
||||
fs::read(Path::new(&vault).join("External.md")).unwrap(),
|
||||
b"keep"
|
||||
);
|
||||
assert_eq!(fs::read_to_string(&source).unwrap(), raw);
|
||||
assert!(!fs::read_dir(&vault).unwrap().any(|entry| entry
|
||||
.unwrap()
|
||||
.file_name()
|
||||
.to_string_lossy()
|
||||
.starts_with(".helixnotes-import-")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn note_content_cannot_import_parent_files_or_hidden_secrets_from_a_broad_scope() {
|
||||
let raw = "[File](asset.bin)";
|
||||
let (root, vault, source) = fixture(raw);
|
||||
let parent = source.parent().unwrap();
|
||||
for name in [
|
||||
".ssh/key.bin",
|
||||
".helixnotes/history/private.bin",
|
||||
".helixnotes/attachments/photo.bin",
|
||||
] {
|
||||
let file = parent.join(name);
|
||||
fs::create_dir_all(file.parent().unwrap()).unwrap();
|
||||
fs::write(file, b"private fixture").unwrap();
|
||||
}
|
||||
fs::write(root.path().join("private.bin"), b"private outside fixture").unwrap();
|
||||
for href in [
|
||||
"../private.bin",
|
||||
".ssh/key.bin",
|
||||
".helixnotes/history/private.bin",
|
||||
] {
|
||||
assert!(import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
None,
|
||||
raw,
|
||||
vec![reference(raw, "asset.bin", href, false)],
|
||||
|_| Ok(())
|
||||
)
|
||||
.is_err());
|
||||
assert!(attachments(&vault).is_empty());
|
||||
assert!(!Path::new(&vault).join("External.md").exists());
|
||||
}
|
||||
let note = import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
None,
|
||||
raw,
|
||||
vec![reference(
|
||||
raw,
|
||||
"asset.bin",
|
||||
".helixnotes/attachments/photo.bin",
|
||||
false,
|
||||
)],
|
||||
|_| Ok(()),
|
||||
)
|
||||
.unwrap();
|
||||
assert!(note.raw.contains(".helixnotes/attachments/"));
|
||||
assert_eq!(attachments(&vault).len(), 1);
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn import_rejects_attachment_and_notebook_destinations_that_follow_symlinks() {
|
||||
let raw = "";
|
||||
let (root, vault, source) = fixture(raw);
|
||||
fs::write(source.parent().unwrap().join("images/photo.png"), b"image").unwrap();
|
||||
let outside = root.path().join("outside");
|
||||
fs::create_dir(&outside).unwrap();
|
||||
std::os::unix::fs::symlink(&outside, Path::new(&vault).join("Notebook")).unwrap();
|
||||
assert!(import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
Some("Notebook"),
|
||||
raw,
|
||||
vec![],
|
||||
|_| Ok(())
|
||||
)
|
||||
.is_err());
|
||||
let directory = Path::new(&vault).join(".helixnotes/attachments");
|
||||
fs::remove_dir(&directory).unwrap();
|
||||
std::os::unix::fs::symlink(&outside, &directory).unwrap();
|
||||
assert!(import_note(
|
||||
&vault,
|
||||
source.to_str().unwrap(),
|
||||
None,
|
||||
raw,
|
||||
vec![reference(
|
||||
raw,
|
||||
"images/photo.png",
|
||||
"images/photo.png",
|
||||
false
|
||||
)],
|
||||
|_| Ok(())
|
||||
)
|
||||
.is_err());
|
||||
assert!(fs::read_dir(outside).unwrap().next().is_none());
|
||||
}
|
||||
+1649
-155
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,353 @@
|
||||
//! Metadata polling for portal directories that do not forward host inotify events.
|
||||
use notify::event::{CreateKind, ModifyKind, RemoveKind};
|
||||
use notify::{Event, EventKind};
|
||||
use std::collections::HashMap;
|
||||
use std::fs::{self, Metadata};
|
||||
use std::io::ErrorKind;
|
||||
use std::os::unix::fs::MetadataExt;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::mpsc::{self, RecvTimeoutError};
|
||||
use std::time::{Duration, Instant};
|
||||
use walkdir::WalkDir;
|
||||
|
||||
use super::operations::is_hidden;
|
||||
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
enum Fingerprint {
|
||||
Directory,
|
||||
Note {
|
||||
size: u64,
|
||||
modified: (i64, i64),
|
||||
changed: (i64, i64),
|
||||
},
|
||||
}
|
||||
|
||||
impl Fingerprint {
|
||||
fn from_metadata(metadata: &Metadata) -> Self {
|
||||
if metadata.is_dir() {
|
||||
// Track directory presence, not child mutations or synthetic portal inode IDs.
|
||||
Self::Directory
|
||||
} else {
|
||||
Self::Note {
|
||||
size: metadata.len(),
|
||||
modified: (metadata.mtime(), metadata.mtime_nsec()),
|
||||
changed: (metadata.ctime(), metadata.ctime_nsec()),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
type Snapshot = HashMap<PathBuf, Fingerprint>;
|
||||
|
||||
fn scan(root: &Path) -> notify::Result<Snapshot> {
|
||||
let metadata =
|
||||
fs::metadata(root).map_err(|error| notify::Error::io(error).add_path(root.to_owned()))?;
|
||||
if !metadata.is_dir() {
|
||||
return Err(
|
||||
notify::Error::generic("Vault root is not a directory").add_path(root.to_owned())
|
||||
);
|
||||
}
|
||||
let mut snapshot = Snapshot::new();
|
||||
let entries = WalkDir::new(root)
|
||||
.follow_links(false)
|
||||
.into_iter()
|
||||
.filter_entry(|entry| entry.depth() == 0 || !is_hidden(entry.path()));
|
||||
for entry in entries {
|
||||
let entry = match entry {
|
||||
Ok(entry) => entry,
|
||||
Err(error)
|
||||
if error.depth() > 0
|
||||
&& error
|
||||
.io_error()
|
||||
.is_some_and(|error| error.kind() == ErrorKind::NotFound) =>
|
||||
{
|
||||
continue;
|
||||
}
|
||||
Err(error) => {
|
||||
return Err(notify::Error::generic(&error.to_string())
|
||||
.add_path(error.path().unwrap_or(root).to_owned()));
|
||||
}
|
||||
};
|
||||
let path = entry.path();
|
||||
if !entry.file_type().is_dir()
|
||||
&& path.extension().and_then(|extension| extension.to_str()) != Some("md")
|
||||
{
|
||||
continue;
|
||||
}
|
||||
let metadata = match fs::metadata(path) {
|
||||
Ok(metadata) => metadata,
|
||||
Err(error) if entry.depth() > 0 && error.kind() == ErrorKind::NotFound => continue,
|
||||
Err(error) => return Err(notify::Error::io(error).add_path(path.to_owned())),
|
||||
};
|
||||
// Match note scanning's file symlinks without traversing directory symlinks.
|
||||
if metadata.is_file() || (metadata.is_dir() && !entry.file_type().is_symlink()) {
|
||||
snapshot.insert(path.to_owned(), Fingerprint::from_metadata(&metadata));
|
||||
}
|
||||
}
|
||||
Ok(snapshot)
|
||||
}
|
||||
|
||||
fn changes(before: &Snapshot, after: &Snapshot) -> Vec<Event> {
|
||||
let mut events = Vec::new();
|
||||
for (path, fingerprint) in after {
|
||||
let kind = match before.get(path) {
|
||||
None => EventKind::Create(CreateKind::Any),
|
||||
Some(previous) if previous != fingerprint => EventKind::Modify(ModifyKind::Any),
|
||||
Some(_) => continue,
|
||||
};
|
||||
events.push(Event::new(kind).add_path(path.clone()));
|
||||
}
|
||||
for path in before.keys().filter(|path| !after.contains_key(*path)) {
|
||||
events.push(Event::new(EventKind::Remove(RemoveKind::Any)).add_path(path.clone()));
|
||||
}
|
||||
events
|
||||
}
|
||||
|
||||
pub struct PortalWatcher {
|
||||
_stop: mpsc::Sender<()>,
|
||||
}
|
||||
|
||||
impl PortalWatcher {
|
||||
pub fn start(
|
||||
root: PathBuf,
|
||||
events: mpsc::Sender<notify::Result<Event>>,
|
||||
interval: Duration,
|
||||
) -> Result<Self, String> {
|
||||
let started = Instant::now();
|
||||
let mut previous = scan(&root).map_err(|error| error.to_string())?;
|
||||
// Portal metadata calls consume host daemon CPU too. Large vaults trade
|
||||
// detection latency for idle time instead of scanning continuously.
|
||||
let mut delay = interval.max(started.elapsed().saturating_mul(20));
|
||||
let (stop, stopped) = mpsc::channel();
|
||||
std::thread::Builder::new()
|
||||
.name("portal-vault-watch".into())
|
||||
.spawn(move || {
|
||||
while matches!(stopped.recv_timeout(delay), Err(RecvTimeoutError::Timeout)) {
|
||||
let started = Instant::now();
|
||||
match scan(&root) {
|
||||
Ok(current) => {
|
||||
for event in changes(&previous, ¤t) {
|
||||
if events.send(Ok(event)).is_err() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
previous = current;
|
||||
}
|
||||
Err(error) => {
|
||||
// A partial or inaccessible scan cannot prove that notes were deleted.
|
||||
if events.send(Err(error)).is_err() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
delay = interval.max(started.elapsed().saturating_mul(20));
|
||||
}
|
||||
})
|
||||
.map_err(|error| error.to_string())?;
|
||||
Ok(Self { _stop: stop })
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::fs::{File, FileTimes};
|
||||
use std::os::unix::fs::symlink;
|
||||
use std::time::{Instant, SystemTime, UNIX_EPOCH};
|
||||
|
||||
fn set_modified(path: &Path, time: SystemTime) {
|
||||
File::options()
|
||||
.write(true)
|
||||
.open(path)
|
||||
.unwrap()
|
||||
.set_times(FileTimes::new().set_modified(time))
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
fn assert_modified(before: &Snapshot, root: &Path, note: &Path) {
|
||||
let events = changes(before, &scan(root).unwrap());
|
||||
assert_eq!(events.len(), 1, "{events:?}");
|
||||
assert_eq!(events[0].paths, [note]);
|
||||
assert_eq!(events[0].kind, EventKind::Modify(ModifyKind::Any));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn same_size_edit_with_restored_mtime_uses_ctime() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let note = vault.path().join("Note.md");
|
||||
fs::write(¬e, "before").unwrap();
|
||||
let modified = fs::metadata(¬e).unwrap().modified().unwrap();
|
||||
let before = scan(vault.path()).unwrap();
|
||||
std::thread::sleep(Duration::from_millis(2));
|
||||
fs::write(¬e, "after!").unwrap();
|
||||
set_modified(¬e, modified);
|
||||
assert_eq!(fs::metadata(¬e).unwrap().modified().unwrap(), modified);
|
||||
assert_modified(&before, vault.path(), ¬e);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn backdated_and_fractional_modification_times_are_detected() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let note = vault.path().join("Note.md");
|
||||
fs::write(¬e, "before").unwrap();
|
||||
set_modified(¬e, UNIX_EPOCH + Duration::new(1000, 100));
|
||||
let before = scan(vault.path()).unwrap();
|
||||
fs::write(¬e, "after!").unwrap();
|
||||
set_modified(¬e, UNIX_EPOCH + Duration::new(1000, 200));
|
||||
let metadata = fs::metadata(¬e).unwrap();
|
||||
assert_eq!((metadata.mtime(), metadata.mtime_nsec()), (1000, 200));
|
||||
assert_modified(&before, vault.path(), ¬e);
|
||||
let before = scan(vault.path()).unwrap();
|
||||
set_modified(¬e, UNIX_EPOCH + Duration::from_secs(10));
|
||||
assert_modified(&before, vault.path(), ¬e);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn atomic_replacement_with_preserved_mtime_changes_ctime() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let note = vault.path().join("Note.md");
|
||||
let temporary = vault.path().join(".replacement");
|
||||
fs::write(¬e, "before").unwrap();
|
||||
let metadata = fs::metadata(¬e).unwrap();
|
||||
let before = scan(vault.path()).unwrap();
|
||||
std::thread::sleep(Duration::from_millis(2));
|
||||
fs::write(&temporary, "after!").unwrap();
|
||||
set_modified(&temporary, metadata.modified().unwrap());
|
||||
fs::rename(&temporary, ¬e).unwrap();
|
||||
let replaced = fs::metadata(¬e).unwrap();
|
||||
assert_eq!(replaced.modified().unwrap(), metadata.modified().unwrap());
|
||||
assert_ne!(
|
||||
(replaced.ctime(), replaced.ctime_nsec()),
|
||||
(metadata.ctime(), metadata.ctime_nsec())
|
||||
);
|
||||
assert_modified(&before, vault.path(), ¬e);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn nested_directory_create_rename_and_remove_keep_both_sides() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let before = scan(vault.path()).unwrap();
|
||||
let old = vault.path().join("Old");
|
||||
fs::create_dir_all(old.join("Nested")).unwrap();
|
||||
fs::write(old.join("Nested/Note.md"), "note").unwrap();
|
||||
let current = scan(vault.path()).unwrap();
|
||||
let created = changes(&before, ¤t);
|
||||
assert_eq!(created.len(), 3);
|
||||
assert!(created.iter().all(|event| event.kind.is_create()));
|
||||
let new = vault.path().join("New");
|
||||
fs::rename(&old, &new).unwrap();
|
||||
let renamed = scan(vault.path()).unwrap();
|
||||
let events = changes(¤t, &renamed);
|
||||
assert_eq!(
|
||||
events.iter().filter(|event| event.kind.is_create()).count(),
|
||||
3
|
||||
);
|
||||
assert_eq!(
|
||||
events.iter().filter(|event| event.kind.is_remove()).count(),
|
||||
3
|
||||
);
|
||||
fs::remove_dir_all(&new).unwrap();
|
||||
let events = changes(&renamed, &scan(vault.path()).unwrap());
|
||||
assert_eq!(events.len(), 3);
|
||||
assert!(events.iter().all(|event| event.kind.is_remove()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hidden_resources_and_attachment_changes_are_excluded() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
for name in [
|
||||
".helixnotes",
|
||||
".hidden",
|
||||
"assets",
|
||||
"_attachments",
|
||||
"node_modules",
|
||||
] {
|
||||
fs::create_dir(vault.path().join(name)).unwrap();
|
||||
fs::write(vault.path().join(name).join("Hidden.md"), "hidden").unwrap();
|
||||
}
|
||||
let before = scan(vault.path()).unwrap();
|
||||
assert_eq!(
|
||||
before.len(),
|
||||
1,
|
||||
"only the explicitly selected vault root should be present"
|
||||
);
|
||||
fs::write(vault.path().join("image.png"), "attachment").unwrap();
|
||||
fs::write(vault.path().join(".hidden.md"), "hidden").unwrap();
|
||||
assert!(changes(&before, &scan(vault.path()).unwrap()).is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn note_symlinks_are_watched_without_following_directory_symlinks() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let outside = tempfile::tempdir().unwrap();
|
||||
let note = vault.path().join("Note.md");
|
||||
let alias = vault.path().join("Alias.md");
|
||||
fs::write(¬e, "before").unwrap();
|
||||
fs::write(outside.path().join("Outside.md"), "outside").unwrap();
|
||||
symlink(¬e, &alias).unwrap();
|
||||
symlink(outside.path(), vault.path().join("Directory.md")).unwrap();
|
||||
symlink(
|
||||
vault.path().join("Missing.md"),
|
||||
vault.path().join("Broken.md"),
|
||||
)
|
||||
.unwrap();
|
||||
let before = scan(vault.path()).unwrap();
|
||||
assert_eq!(before.len(), 3);
|
||||
assert!(before.contains_key(&alias));
|
||||
set_modified(¬e, UNIX_EPOCH + Duration::from_secs(1000));
|
||||
let events = changes(&before, &scan(vault.path()).unwrap());
|
||||
assert_eq!(events.len(), 2);
|
||||
assert!(events.iter().all(|event| event.kind.is_modify()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scan_errors_do_not_publish_partial_snapshots_and_recovery_detects_edits() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let note = vault.path().join("Note.md");
|
||||
fs::write(¬e, "before").unwrap();
|
||||
let (sender, receiver) = mpsc::channel();
|
||||
let watcher =
|
||||
PortalWatcher::start(vault.path().to_owned(), sender, Duration::from_millis(20))
|
||||
.unwrap();
|
||||
let broken = vault.path().join("Loop.md");
|
||||
symlink(&broken, &broken).unwrap();
|
||||
assert!(receiver
|
||||
.recv_timeout(Duration::from_secs(2))
|
||||
.unwrap()
|
||||
.is_err());
|
||||
set_modified(¬e, UNIX_EPOCH + Duration::from_secs(1000));
|
||||
fs::remove_file(&broken).unwrap();
|
||||
let deadline = Instant::now() + Duration::from_secs(2);
|
||||
loop {
|
||||
let event = receiver
|
||||
.recv_timeout(deadline.saturating_duration_since(Instant::now()))
|
||||
.unwrap();
|
||||
if let Ok(event) = event {
|
||||
assert_eq!(event.paths.as_slice(), std::slice::from_ref(¬e));
|
||||
assert!(event.kind.is_modify());
|
||||
break;
|
||||
}
|
||||
}
|
||||
drop(watcher);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn initial_failure_is_synchronous_and_drop_wakes_a_long_poll() {
|
||||
let vault = tempfile::tempdir().unwrap();
|
||||
let (sender, _receiver) = mpsc::channel();
|
||||
assert!(PortalWatcher::start(
|
||||
vault.path().join("Missing"),
|
||||
sender,
|
||||
Duration::from_secs(60)
|
||||
)
|
||||
.is_err());
|
||||
let (sender, receiver) = mpsc::channel();
|
||||
let watcher =
|
||||
PortalWatcher::start(vault.path().to_owned(), sender, Duration::from_secs(60)).unwrap();
|
||||
drop(watcher);
|
||||
assert!(matches!(
|
||||
receiver.recv_timeout(Duration::from_secs(2)),
|
||||
Err(mpsc::RecvTimeoutError::Disconnected)
|
||||
));
|
||||
}
|
||||
}
|
||||
@@ -9,8 +9,11 @@ use tauri::{AppHandle, Emitter, Manager};
|
||||
use crate::state::AppState;
|
||||
use crate::types::FileEvent;
|
||||
use crate::vault::operations::{is_hidden, read_note_entry_fast};
|
||||
#[cfg(target_os = "linux")]
|
||||
use crate::vault::portal_watcher::PortalWatcher;
|
||||
|
||||
const IOS_POLL_INTERVAL: Duration = Duration::from_secs(10);
|
||||
const FLATPAK_POLL_INTERVAL: Duration = Duration::from_secs(2);
|
||||
const NATIVE_POLL_INTERVAL: Duration = Duration::from_secs(1);
|
||||
const EVENT_BATCH_INTERVAL: Duration = Duration::from_millis(50);
|
||||
|
||||
@@ -18,35 +21,48 @@ const EVENT_BATCH_INTERVAL: Duration = Duration::from_millis(50);
|
||||
enum WatcherBackend {
|
||||
Recommended,
|
||||
Poll,
|
||||
#[cfg(target_os = "linux")]
|
||||
Portal,
|
||||
}
|
||||
|
||||
const fn watcher_backend_for_target(is_ios: bool) -> WatcherBackend {
|
||||
const fn watcher_backend_for_target(is_ios: bool, is_flatpak: bool) -> WatcherBackend {
|
||||
if is_ios {
|
||||
WatcherBackend::Poll
|
||||
} else if is_flatpak {
|
||||
#[cfg(target_os = "linux")]
|
||||
{
|
||||
WatcherBackend::Portal
|
||||
}
|
||||
#[cfg(not(target_os = "linux"))]
|
||||
{
|
||||
WatcherBackend::Poll
|
||||
}
|
||||
} else {
|
||||
WatcherBackend::Recommended
|
||||
}
|
||||
}
|
||||
|
||||
const fn poll_interval_for_backend(backend: WatcherBackend) -> Duration {
|
||||
match backend {
|
||||
WatcherBackend::Recommended => NATIVE_POLL_INTERVAL,
|
||||
WatcherBackend::Poll => IOS_POLL_INTERVAL,
|
||||
const fn poll_interval_for_target(is_ios: bool, is_flatpak: bool) -> Duration {
|
||||
if is_ios {
|
||||
IOS_POLL_INTERVAL
|
||||
} else if is_flatpak {
|
||||
FLATPAK_POLL_INTERVAL
|
||||
} else {
|
||||
NATIVE_POLL_INTERVAL
|
||||
}
|
||||
}
|
||||
|
||||
pub enum VaultWatcher {
|
||||
Recommended(RecommendedWatcher),
|
||||
Poll(PollWatcher),
|
||||
}
|
||||
|
||||
impl VaultWatcher {
|
||||
fn watch(&mut self, path: &Path, recursive_mode: RecursiveMode) -> notify::Result<()> {
|
||||
match self {
|
||||
Self::Recommended(watcher) => watcher.watch(path, recursive_mode),
|
||||
Self::Poll(watcher) => watcher.watch(path, recursive_mode),
|
||||
}
|
||||
}
|
||||
Recommended {
|
||||
_watcher: RecommendedWatcher,
|
||||
},
|
||||
Poll {
|
||||
_watcher: PollWatcher,
|
||||
},
|
||||
#[cfg(target_os = "linux")]
|
||||
Portal {
|
||||
_watcher: PortalWatcher,
|
||||
},
|
||||
}
|
||||
|
||||
fn collect_changes(event: Event, vault_root: &Path, changes: &mut HashMap<PathBuf, &'static str>) {
|
||||
@@ -115,21 +131,33 @@ pub(crate) fn changed_entry(path: PathBuf, event_type: &str, vault_root: &Path)
|
||||
pub fn start_watcher(app: AppHandle, vault_path: String) -> Result<VaultWatcher, String> {
|
||||
let (tx, rx) = mpsc::channel();
|
||||
|
||||
let backend = watcher_backend_for_target(cfg!(target_os = "ios"));
|
||||
let config = Config::default().with_poll_interval(poll_interval_for_backend(backend));
|
||||
let mut watcher = match backend {
|
||||
WatcherBackend::Recommended => VaultWatcher::Recommended(
|
||||
RecommendedWatcher::new(tx, config).map_err(|e| e.to_string())?,
|
||||
),
|
||||
WatcherBackend::Poll => {
|
||||
VaultWatcher::Poll(PollWatcher::new(tx, config).map_err(|e| e.to_string())?)
|
||||
let is_ios = cfg!(target_os = "ios");
|
||||
// Portal paths do not forward inotify events. Their precise change times
|
||||
// detect external writes even when a sync client preserves modification time.
|
||||
let is_flatpak = option_env!("HELIXNOTES_INSTALL_TYPE") == Some("flatpak");
|
||||
let backend = watcher_backend_for_target(is_ios, is_flatpak);
|
||||
let config = Config::default().with_poll_interval(poll_interval_for_target(is_ios, is_flatpak));
|
||||
let watcher = match backend {
|
||||
WatcherBackend::Recommended => {
|
||||
let mut watcher = RecommendedWatcher::new(tx, config).map_err(|e| e.to_string())?;
|
||||
watcher
|
||||
.watch(Path::new(&vault_path), RecursiveMode::Recursive)
|
||||
.map_err(|e| e.to_string())?;
|
||||
VaultWatcher::Recommended { _watcher: watcher }
|
||||
}
|
||||
WatcherBackend::Poll => {
|
||||
let mut watcher = PollWatcher::new(tx, config).map_err(|e| e.to_string())?;
|
||||
watcher
|
||||
.watch(Path::new(&vault_path), RecursiveMode::Recursive)
|
||||
.map_err(|e| e.to_string())?;
|
||||
VaultWatcher::Poll { _watcher: watcher }
|
||||
}
|
||||
#[cfg(target_os = "linux")]
|
||||
WatcherBackend::Portal => VaultWatcher::Portal {
|
||||
_watcher: PortalWatcher::start(PathBuf::from(&vault_path), tx, FLATPAK_POLL_INTERVAL)?,
|
||||
},
|
||||
};
|
||||
|
||||
watcher
|
||||
.watch(Path::new(&vault_path), RecursiveMode::Recursive)
|
||||
.map_err(|e| e.to_string())?;
|
||||
|
||||
std::thread::spawn(move || {
|
||||
let vault_root = Path::new(&vault_path);
|
||||
let mut changes = HashMap::new();
|
||||
@@ -222,25 +250,32 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn ios_uses_polling_backend() {
|
||||
assert_eq!(watcher_backend_for_target(true), WatcherBackend::Poll);
|
||||
assert_eq!(
|
||||
watcher_backend_for_target(true, false),
|
||||
WatcherBackend::Poll
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn other_platforms_keep_recommended_backend() {
|
||||
assert_eq!(
|
||||
watcher_backend_for_target(false),
|
||||
watcher_backend_for_target(false, false),
|
||||
WatcherBackend::Recommended
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn watcher_backends_use_the_expected_intervals() {
|
||||
fn watcher_targets_use_the_expected_intervals() {
|
||||
assert_eq!(
|
||||
poll_interval_for_backend(WatcherBackend::Poll),
|
||||
poll_interval_for_target(true, false),
|
||||
Duration::from_secs(10)
|
||||
);
|
||||
assert_eq!(
|
||||
poll_interval_for_backend(WatcherBackend::Recommended),
|
||||
poll_interval_for_target(false, true),
|
||||
Duration::from_secs(2)
|
||||
);
|
||||
assert_eq!(
|
||||
poll_interval_for_target(false, false),
|
||||
Duration::from_secs(1)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||
"productName": "HelixNotes",
|
||||
"version": "1.3.6",
|
||||
"version": "1.3.7",
|
||||
"identifier": "com.helixnotes.app",
|
||||
"build": {
|
||||
"frontendDist": "../build",
|
||||
|
||||
+328
@@ -152,6 +152,65 @@
|
||||
src: url("/fonts/open-sans/OpenSans-BoldItalic.woff2") format("woff2");
|
||||
}
|
||||
|
||||
/* Ubuntu families - unmodified upstream fonts, Ubuntu Font Licence 1.0.
|
||||
Copyright and licence notices are bundled beside each family's local assets. */
|
||||
@font-face {
|
||||
font-family: "Ubuntu";
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
font-display: swap;
|
||||
src: url("/fonts/ubuntu/Ubuntu-R.ttf") format("truetype");
|
||||
}
|
||||
@font-face {
|
||||
font-family: "Ubuntu";
|
||||
font-style: normal;
|
||||
font-weight: 700;
|
||||
font-display: swap;
|
||||
src: url("/fonts/ubuntu/Ubuntu-B.ttf") format("truetype");
|
||||
}
|
||||
@font-face {
|
||||
font-family: "Ubuntu";
|
||||
font-style: italic;
|
||||
font-weight: 400;
|
||||
font-display: swap;
|
||||
src: url("/fonts/ubuntu/Ubuntu-RI.ttf") format("truetype");
|
||||
}
|
||||
@font-face {
|
||||
font-family: "Ubuntu";
|
||||
font-style: italic;
|
||||
font-weight: 700;
|
||||
font-display: swap;
|
||||
src: url("/fonts/ubuntu/Ubuntu-BI.ttf") format("truetype");
|
||||
}
|
||||
@font-face {
|
||||
font-family: "Ubuntu Mono";
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
font-display: swap;
|
||||
src: url("/fonts/ubuntu-mono/UbuntuMono-R.ttf") format("truetype");
|
||||
}
|
||||
@font-face {
|
||||
font-family: "Ubuntu Mono";
|
||||
font-style: normal;
|
||||
font-weight: 700;
|
||||
font-display: swap;
|
||||
src: url("/fonts/ubuntu-mono/UbuntuMono-B.ttf") format("truetype");
|
||||
}
|
||||
@font-face {
|
||||
font-family: "Ubuntu Mono";
|
||||
font-style: italic;
|
||||
font-weight: 400;
|
||||
font-display: swap;
|
||||
src: url("/fonts/ubuntu-mono/UbuntuMono-RI.ttf") format("truetype");
|
||||
}
|
||||
@font-face {
|
||||
font-family: "Ubuntu Mono";
|
||||
font-style: italic;
|
||||
font-weight: 700;
|
||||
font-display: swap;
|
||||
src: url("/fonts/ubuntu-mono/UbuntuMono-BI.ttf") format("truetype");
|
||||
}
|
||||
|
||||
:root {
|
||||
/* Light theme */
|
||||
--bg-primary: #ffffff;
|
||||
@@ -1015,6 +1074,256 @@
|
||||
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
:root[data-theme="matrix"] {
|
||||
--bg-primary: #0a0f0a;
|
||||
--bg-secondary: #060a06;
|
||||
--bg-tertiary: #0e150e;
|
||||
--bg-hover: #142014;
|
||||
--bg-active: #1a2a1a;
|
||||
--bg-editor: #0a0f0a;
|
||||
--text-primary: #b8f5b8;
|
||||
--text-secondary: #5fb95f;
|
||||
--text-tertiary: #3a7a3a;
|
||||
--text-accent: #00ff66;
|
||||
--border-color: #142014;
|
||||
--border-light: #0e150e;
|
||||
--accent: #00ff66;
|
||||
--accent-hover: #00e65c;
|
||||
--accent-light: color-mix(in srgb, #00ff66 12%, transparent);
|
||||
--danger: #ff5f56;
|
||||
--danger-hover: #e84a42;
|
||||
--success: #00ff66;
|
||||
--warning: #ffd700;
|
||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.5);
|
||||
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.6);
|
||||
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.7);
|
||||
}
|
||||
|
||||
:root[data-theme="amber-crt"] {
|
||||
--bg-primary: #180f00;
|
||||
--bg-secondary: #120b00;
|
||||
--bg-tertiary: #201600;
|
||||
--bg-hover: #2a1e00;
|
||||
--bg-active: #352700;
|
||||
--bg-editor: #180f00;
|
||||
--text-primary: #ffcf70;
|
||||
--text-secondary: #c99a3e;
|
||||
--text-tertiary: #8a6a28;
|
||||
--text-accent: #ffb000;
|
||||
--border-color: #2a1e00;
|
||||
--border-light: #201600;
|
||||
--accent: #ffb000;
|
||||
--accent-hover: #e89e00;
|
||||
--accent-light: color-mix(in srgb, #ffb000 12%, transparent);
|
||||
--danger: #ff6b4a;
|
||||
--danger-hover: #e85638;
|
||||
--success: #b8c900;
|
||||
--warning: #ffd700;
|
||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.5);
|
||||
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.6);
|
||||
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.7);
|
||||
}
|
||||
|
||||
:root[data-theme="sepia"] {
|
||||
--bg-primary: #f4ecd8;
|
||||
--bg-secondary: #ebe0c7;
|
||||
--bg-tertiary: #e2d5b5;
|
||||
--bg-hover: #d9c9a3;
|
||||
--bg-active: #cebc92;
|
||||
--bg-editor: #f4ecd8;
|
||||
--text-primary: #433422;
|
||||
--text-secondary: #6b5538;
|
||||
--text-tertiary: #937a56;
|
||||
--text-accent: #9a6a3a;
|
||||
--border-color: #ddcdab;
|
||||
--border-light: #e2d5b5;
|
||||
--accent: #9a6a3a;
|
||||
--accent-hover: #875b2f;
|
||||
--accent-light: color-mix(in srgb, #9a6a3a 8%, transparent);
|
||||
--danger: #b5452f;
|
||||
--danger-hover: #9f3c29;
|
||||
--success: #6b8e23;
|
||||
--warning: #c08a2c;
|
||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.08);
|
||||
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.12);
|
||||
}
|
||||
|
||||
:root[data-theme="deep-ocean"] {
|
||||
--bg-primary: #081821;
|
||||
--bg-secondary: #05121a;
|
||||
--bg-tertiary: #0b2330;
|
||||
--bg-hover: #103040;
|
||||
--bg-active: #153c4e;
|
||||
--bg-editor: #081821;
|
||||
--text-primary: #cfeef5;
|
||||
--text-secondary: #86b8c4;
|
||||
--text-tertiary: #4f8290;
|
||||
--text-accent: #35c4d4;
|
||||
--border-color: #103040;
|
||||
--border-light: #0b2330;
|
||||
--accent: #35c4d4;
|
||||
--accent-hover: #26b0c0;
|
||||
--accent-light: color-mix(in srgb, #35c4d4 12%, transparent);
|
||||
--danger: #ff6b7d;
|
||||
--danger-hover: #e85566;
|
||||
--success: #4fd4a8;
|
||||
--warning: #f5c56b;
|
||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.4);
|
||||
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.5);
|
||||
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
|
||||
:root[data-theme="sandstone"] {
|
||||
--bg-primary: #faf3e8;
|
||||
--bg-secondary: #f1e6d3;
|
||||
--bg-tertiary: #e8d9c0;
|
||||
--bg-hover: #ddcaab;
|
||||
--bg-active: #d1bb98;
|
||||
--bg-editor: #faf3e8;
|
||||
--text-primary: #3a2c1c;
|
||||
--text-secondary: #6a543c;
|
||||
--text-tertiary: #9a8160;
|
||||
--text-accent: #c76b3f;
|
||||
--border-color: #e2d2b8;
|
||||
--border-light: #e8d9c0;
|
||||
--accent: #c76b3f;
|
||||
--accent-hover: #b45a30;
|
||||
--accent-light: color-mix(in srgb, #c76b3f 8%, transparent);
|
||||
--danger: #c0392b;
|
||||
--danger-hover: #a93226;
|
||||
--success: #7a8c3a;
|
||||
--warning: #d98e2b;
|
||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.08);
|
||||
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.12);
|
||||
}
|
||||
|
||||
:root[data-theme="lavender"] {
|
||||
--bg-primary: #f6f3fc;
|
||||
--bg-secondary: #ece6f7;
|
||||
--bg-tertiary: #e1d8f0;
|
||||
--bg-hover: #d4c8e8;
|
||||
--bg-active: #c6b6df;
|
||||
--bg-editor: #f6f3fc;
|
||||
--text-primary: #2e2540;
|
||||
--text-secondary: #564a70;
|
||||
--text-tertiary: #8577a0;
|
||||
--text-accent: #7c5cc4;
|
||||
--border-color: #ddd3ee;
|
||||
--border-light: #e1d8f0;
|
||||
--accent: #7c5cc4;
|
||||
--accent-hover: #6b4bb0;
|
||||
--accent-light: color-mix(in srgb, #7c5cc4 8%, transparent);
|
||||
--danger: #d14d6a;
|
||||
--danger-hover: #ba4259;
|
||||
--success: #4fa06a;
|
||||
--warning: #d99a2b;
|
||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.08);
|
||||
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.12);
|
||||
}
|
||||
|
||||
:root[data-theme="graphite"] {
|
||||
--bg-primary: #17181a;
|
||||
--bg-secondary: #121315;
|
||||
--bg-tertiary: #1e2023;
|
||||
--bg-hover: #26282c;
|
||||
--bg-active: #303339;
|
||||
--bg-editor: #17181a;
|
||||
--text-primary: #d6d9dd;
|
||||
--text-secondary: #9ca0a6;
|
||||
--text-tertiary: #5f636a;
|
||||
--text-accent: #7f9cb3;
|
||||
--border-color: #26282c;
|
||||
--border-light: #1e2023;
|
||||
--accent: #7f9cb3;
|
||||
--accent-hover: #6d8aa1;
|
||||
--accent-light: color-mix(in srgb, #7f9cb3 12%, transparent);
|
||||
--danger: #e06c6c;
|
||||
--danger-hover: #cc5959;
|
||||
--success: #7fb37f;
|
||||
--warning: #d4b36b;
|
||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.4);
|
||||
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.5);
|
||||
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
|
||||
:root[data-theme="nebula"] {
|
||||
--bg-primary: #14102a;
|
||||
--bg-secondary: #0f0c21;
|
||||
--bg-tertiary: #1c1738;
|
||||
--bg-hover: #251e48;
|
||||
--bg-active: #2f2659;
|
||||
--bg-editor: #14102a;
|
||||
--text-primary: #e4ddf5;
|
||||
--text-secondary: #aba0cf;
|
||||
--text-tertiary: #6f6494;
|
||||
--text-accent: #b388ff;
|
||||
--border-color: #251e48;
|
||||
--border-light: #1c1738;
|
||||
--accent: #b388ff;
|
||||
--accent-hover: #9f73f0;
|
||||
--accent-light: color-mix(in srgb, #b388ff 14%, transparent);
|
||||
--danger: #ff6b8a;
|
||||
--danger-hover: #e85674;
|
||||
--success: #5fd4b0;
|
||||
--warning: #ffc46b;
|
||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.4);
|
||||
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.5);
|
||||
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
|
||||
:root[data-theme="wine"] {
|
||||
--bg-primary: #1c0f14;
|
||||
--bg-secondary: #160b10;
|
||||
--bg-tertiary: #26151c;
|
||||
--bg-hover: #311b24;
|
||||
--bg-active: #3d222c;
|
||||
--bg-editor: #1c0f14;
|
||||
--text-primary: #f0dde3;
|
||||
--text-secondary: #c49aa6;
|
||||
--text-tertiary: #8a606c;
|
||||
--text-accent: #d98ca0;
|
||||
--border-color: #311b24;
|
||||
--border-light: #26151c;
|
||||
--accent: #d98ca0;
|
||||
--accent-hover: #c8788d;
|
||||
--accent-light: color-mix(in srgb, #d98ca0 12%, transparent);
|
||||
--danger: #e85c5c;
|
||||
--danger-hover: #d14a4a;
|
||||
--success: #8cbf8c;
|
||||
--warning: #d9b36b;
|
||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.4);
|
||||
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.5);
|
||||
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
|
||||
:root[data-theme="jade"] {
|
||||
--bg-primary: #0b1a15;
|
||||
--bg-secondary: #071410;
|
||||
--bg-tertiary: #10261f;
|
||||
--bg-hover: #163128;
|
||||
--bg-active: #1d3d32;
|
||||
--bg-editor: #0b1a15;
|
||||
--text-primary: #d4f0e3;
|
||||
--text-secondary: #8cc4ac;
|
||||
--text-tertiary: #517a69;
|
||||
--text-accent: #2bbd8e;
|
||||
--border-color: #163128;
|
||||
--border-light: #10261f;
|
||||
--accent: #2bbd8e;
|
||||
--accent-hover: #22a87d;
|
||||
--accent-light: color-mix(in srgb, #2bbd8e 12%, transparent);
|
||||
--danger: #ff6b6b;
|
||||
--danger-hover: #e85656;
|
||||
--success: #2bbd8e;
|
||||
--warning: #e8c46b;
|
||||
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.4);
|
||||
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.5);
|
||||
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
|
||||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
@@ -1232,6 +1541,25 @@ body.resizing {
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
|
||||
/* Image grids print as compact 2-column rows without their editing controls. */
|
||||
.ProseMirror .img-grid-header {
|
||||
display: none !important;
|
||||
}
|
||||
.ProseMirror .img-grid,
|
||||
.ProseMirror .img-grid[data-layout='masonry'] {
|
||||
display: grid !important;
|
||||
grid-template-columns: repeat(2, 1fr) !important;
|
||||
columns: auto !important;
|
||||
gap: 8px !important;
|
||||
break-inside: avoid;
|
||||
}
|
||||
.ProseMirror .img-grid img {
|
||||
margin: 0 !important;
|
||||
width: 100% !important;
|
||||
max-width: 100% !important;
|
||||
break-inside: avoid;
|
||||
}
|
||||
|
||||
/* Avoid breaking inside these elements */
|
||||
h1,
|
||||
h2,
|
||||
|
||||
+25
-3
@@ -1,4 +1,5 @@
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import type { ExternalNoteReference } from "./editor/externalNote";
|
||||
import type {
|
||||
AppConfig,
|
||||
CustomTheme,
|
||||
@@ -79,8 +80,9 @@ export async function importCustomThemes(path: string): Promise<CustomTheme[]> {
|
||||
return invoke("import_custom_themes", { path });
|
||||
}
|
||||
|
||||
export async function setFontSize(size: number): Promise<void> {
|
||||
return invoke("set_font_size", { size });
|
||||
/** `preferred` marks a choice made in Appearance, which is what resetting the zoom returns to. */
|
||||
export async function setFontSize(size: number, preferred = false): Promise<void> {
|
||||
return invoke("set_font_size", { size, preferred });
|
||||
}
|
||||
|
||||
export async function setScrollToChangeFontSize(enabled: boolean): Promise<void> {
|
||||
@@ -163,6 +165,16 @@ export async function saveNote(
|
||||
return invoke("save_note", { vaultPath, path, meta, body, expectedRaw });
|
||||
}
|
||||
|
||||
export async function importNote(
|
||||
vaultPath: string,
|
||||
sourcePath: string,
|
||||
notebookRelative: string | null,
|
||||
expectedRaw: string,
|
||||
references: ExternalNoteReference[],
|
||||
): Promise<NoteContent> {
|
||||
return invoke("import_note", { vaultPath, sourcePath, notebookRelative, expectedRaw, references });
|
||||
}
|
||||
|
||||
export async function createNote(
|
||||
vaultPath: string,
|
||||
notebookRelative: string | null,
|
||||
@@ -269,6 +281,15 @@ export async function readClipboardImage(): Promise<number[]> {
|
||||
return invoke("read_clipboard_image");
|
||||
}
|
||||
|
||||
export interface ClipboardContents {
|
||||
text: string | null;
|
||||
html: string | null;
|
||||
}
|
||||
|
||||
export async function readClipboardContents(): Promise<ClipboardContents> {
|
||||
return invoke("read_clipboard_contents");
|
||||
}
|
||||
|
||||
export async function copyImageToClipboard(path: string): Promise<void> {
|
||||
return invoke("copy_image_to_clipboard", { path });
|
||||
}
|
||||
@@ -532,8 +553,9 @@ export async function setSyncSettings(
|
||||
syncOnOpen: boolean,
|
||||
syncOnChange: boolean,
|
||||
syncIntervalMinutes: number,
|
||||
syncFolderRequests: number,
|
||||
): Promise<void> {
|
||||
return invoke("set_sync_settings", { provider, url, username, password, syncOnOpen, syncOnChange, syncIntervalMinutes });
|
||||
return invoke("set_sync_settings", { provider, url, username, password, syncOnOpen, syncOnChange, syncIntervalMinutes, syncFolderRequests });
|
||||
}
|
||||
|
||||
export async function testSyncConnection(): Promise<void> {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { onMount, onDestroy, tick, untrack } from 'svelte';
|
||||
import { MediaQuery } from 'svelte/reactivity';
|
||||
import { listen } from '@tauri-apps/api/event';
|
||||
import Sidebar from './Sidebar.svelte';
|
||||
import NoteList from './NoteList.svelte';
|
||||
@@ -56,6 +57,7 @@
|
||||
notebookOrder,
|
||||
noteOrder,
|
||||
syncState,
|
||||
type SyncSummary,
|
||||
platformIsMobile,
|
||||
activeVaultConfig,
|
||||
activateVaultData,
|
||||
@@ -65,6 +67,19 @@
|
||||
const appWindow = getCurrentWindow();
|
||||
const isMac = navigator.platform.startsWith('Mac');
|
||||
const isMobile = $derived($platformIsMobile);
|
||||
// A tablet in landscape has room for the editor next to the navigation: the notebooks or the
|
||||
// note list stay on the left instead of replacing the note. Narrower windows (phones, a tablet
|
||||
// in portrait or in a split screen) keep one panel at a time.
|
||||
const wideMobileQuery = new MediaQuery('(min-width: 900px)');
|
||||
const tabletLayout = $derived(isMobile && wideMobileQuery.current);
|
||||
// Kept on the device: the vault state is shared with desktops, where collapsing means something else.
|
||||
let tabletNavHidden = $state(localStorage.getItem('helix-tablet-nav-hidden') === '1');
|
||||
const tabletNavShown = $derived(tabletLayout && !tabletNavHidden);
|
||||
|
||||
function setTabletNavHidden(hidden: boolean) {
|
||||
tabletNavHidden = hidden;
|
||||
localStorage.setItem('helix-tablet-nav-hidden', hidden ? '1' : '0');
|
||||
}
|
||||
import { loadVaultState, saveVaultState, readNote, deleteNote, createDailyNote, createBackup, getPendingOpenFile, ackPendingOpenFile, addQuickAccess, removeQuickAccess, getQuickAccess, setTheme, syncNow, setTaskDone, setTaskPriority, setTaskDue } from '$lib/api';
|
||||
import { darkThemes, isAndroid } from '$lib/platform';
|
||||
import { openNoteWindow } from '$lib/utils/window';
|
||||
@@ -89,6 +104,77 @@
|
||||
let sidebar = $state<Sidebar>();
|
||||
let noteList = $state<NoteList>();
|
||||
let editor = $state<Editor>();
|
||||
let outlineOpen = $state(false);
|
||||
let outlinePanelId = $state('');
|
||||
let mobileNoteMenuOpen = $state(false);
|
||||
let mobileNoteMenuWrapper = $state<HTMLDivElement>();
|
||||
let mobileNoteMenuTrigger = $state<HTMLButtonElement>();
|
||||
let mobileNoteMenu = $state<HTMLDivElement>();
|
||||
let mobileBackButton = $state<HTMLButtonElement>();
|
||||
|
||||
function closeMobileNoteMenu(restoreTriggerFocus = false) {
|
||||
const wasOpen = mobileNoteMenuOpen;
|
||||
mobileNoteMenuOpen = false;
|
||||
if (wasOpen && restoreTriggerFocus) mobileNoteMenuTrigger?.focus();
|
||||
}
|
||||
|
||||
async function toggleMobileNoteMenu() {
|
||||
if (mobileNoteMenuOpen) {
|
||||
closeMobileNoteMenu(true);
|
||||
return;
|
||||
}
|
||||
mobileNoteMenuOpen = true;
|
||||
await tick();
|
||||
if (mobileNoteMenuOpen) mobileNoteMenu?.querySelector<HTMLButtonElement>('button:not(:disabled)')?.focus();
|
||||
}
|
||||
|
||||
function handleMobileNoteMenuKeydown(event: KeyboardEvent) {
|
||||
if (event.key === 'Tab') {
|
||||
closeMobileNoteMenu(true);
|
||||
return;
|
||||
}
|
||||
if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return;
|
||||
const buttons = Array.from(mobileNoteMenu?.querySelectorAll<HTMLButtonElement>('button:not(:disabled)') ?? []);
|
||||
if (!buttons.length) return;
|
||||
event.preventDefault();
|
||||
const current = buttons.indexOf(document.activeElement as HTMLButtonElement);
|
||||
const next = event.key === 'Home' ? 0 : event.key === 'End' ? buttons.length - 1
|
||||
: event.key === 'ArrowDown' ? (current + 1) % buttons.length
|
||||
: current < 0 ? buttons.length - 1 : (current - 1 + buttons.length) % buttons.length;
|
||||
buttons[next].focus();
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
$activeNotePath;
|
||||
$mobileView;
|
||||
tabletLayout;
|
||||
mobileNoteMenuOpen = false;
|
||||
});
|
||||
|
||||
$effect(() => {
|
||||
if (!mobileNoteMenuOpen) return;
|
||||
const handleOutsidePointerDown = (event: PointerEvent) => {
|
||||
const target = event.target as Node;
|
||||
if (!mobileNoteMenuWrapper?.contains(target) && !mobileBackButton?.contains(target)) closeMobileNoteMenu();
|
||||
};
|
||||
const handleEscape = (event: KeyboardEvent) => {
|
||||
if (event.key !== 'Escape') return;
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
closeMobileNoteMenu(true);
|
||||
};
|
||||
document.addEventListener('pointerdown', handleOutsidePointerDown, true);
|
||||
document.addEventListener('keydown', handleEscape, true);
|
||||
return () => {
|
||||
document.removeEventListener('pointerdown', handleOutsidePointerDown, true);
|
||||
document.removeEventListener('keydown', handleEscape, true);
|
||||
};
|
||||
});
|
||||
|
||||
function handleOutlineChange(open: boolean, panelId: string) {
|
||||
outlineOpen = open;
|
||||
outlinePanelId = panelId;
|
||||
}
|
||||
let pendingSearchReveal = $state<{ path: string; token: number } | null>(null);
|
||||
let unlistenFileChange: (() => void) | null = null;
|
||||
let unlistenClose: (() => void) | null = null;
|
||||
@@ -213,6 +299,7 @@
|
||||
|
||||
function parseFrequencyMs(freq: string): number {
|
||||
switch (freq) {
|
||||
case '1h': return 60 * 60 * 1000;
|
||||
case '6h': return 6 * 60 * 60 * 1000;
|
||||
case '12h': return 12 * 60 * 60 * 1000;
|
||||
case '7d': return 7 * 24 * 60 * 60 * 1000;
|
||||
@@ -555,6 +642,14 @@
|
||||
});
|
||||
});
|
||||
|
||||
/** A tag clicked under a note's title: browse that tag's notes, like picking it in the sidebar. */
|
||||
function showTagNotes(tag: string) {
|
||||
$viewMode = 'tag';
|
||||
$activeTag = tag;
|
||||
$activeNotebook = null;
|
||||
handleViewChanged();
|
||||
}
|
||||
|
||||
function handleViewChanged() {
|
||||
if (!ownerIsCurrent()) return;
|
||||
beginNavigation();
|
||||
@@ -638,12 +733,16 @@
|
||||
// sidebar=0, notelist=1, editor=2. Each forward nav pushes, back pops.
|
||||
let historyDepth = 0;
|
||||
let navFromPopstate = false;
|
||||
let lastMobileView = get(mobileView);
|
||||
|
||||
if (get(platformIsMobile)) {
|
||||
history.replaceState({ mobileView: 'sidebar', depth: 0 }, '');
|
||||
|
||||
$effect(() => {
|
||||
const view = $mobileView;
|
||||
// Going to the notebooks or the note list brings a hidden column back.
|
||||
if (view !== 'editor' && view !== untrack(() => lastMobileView)) untrack(() => setTabletNavHidden(false));
|
||||
lastMobileView = view;
|
||||
if (navFromPopstate) {
|
||||
navFromPopstate = false;
|
||||
return;
|
||||
@@ -671,7 +770,8 @@
|
||||
return;
|
||||
}
|
||||
// If a modal is open, close it instead of navigating
|
||||
if ($showSettings || $showInfo || $showSearch || $showCommandPalette) {
|
||||
if (mobileNoteMenuOpen || $showSettings || $showInfo || $showSearch || $showCommandPalette) {
|
||||
closeMobileNoteMenu(true);
|
||||
$showSettings = false;
|
||||
$showInfo = false;
|
||||
$showSearch = false;
|
||||
@@ -682,7 +782,13 @@
|
||||
}
|
||||
const state = e.state;
|
||||
const targetDepth = state?.depth ?? 0;
|
||||
const leavingEditor = $mobileView === 'editor';
|
||||
historyDepth = targetDepth;
|
||||
if (tabletLayout && leavingEditor && targetDepth === 1) {
|
||||
// The note list is already showing beside the note, so back goes on to the notebooks.
|
||||
$mobileView = 'sidebar';
|
||||
return;
|
||||
}
|
||||
navFromPopstate = true;
|
||||
if (targetDepth === 0) $mobileView = 'sidebar';
|
||||
else if (targetDepth === 1) $mobileView = 'notelist';
|
||||
@@ -693,8 +799,12 @@
|
||||
}
|
||||
|
||||
function mobileBack() {
|
||||
if ($mobileView === 'editor') $mobileView = 'notelist';
|
||||
else if ($mobileView === 'notelist') $mobileView = 'sidebar';
|
||||
if (mobileNoteMenuOpen) {
|
||||
closeMobileNoteMenu(true);
|
||||
return;
|
||||
}
|
||||
if ($mobileView === 'editor' && !tabletLayout) $mobileView = 'notelist';
|
||||
else $mobileView = 'sidebar';
|
||||
}
|
||||
|
||||
async function trashOpenNote(path: string): Promise<boolean> {
|
||||
@@ -725,6 +835,14 @@
|
||||
if (e.button === 4) { e.preventDefault(); navigateHistory(1); }
|
||||
}
|
||||
|
||||
// True when the event is going to a text field or editor. App-wide
|
||||
// shortcuts must leave those keys alone so editing keeps working - for
|
||||
// example Alt+Left/Right moves by word in the editor and in inputs.
|
||||
function isEditableTarget(target: EventTarget | null): boolean {
|
||||
if (!(target instanceof HTMLElement)) return false;
|
||||
return target.isContentEditable || !!target.closest('input, textarea, .cm-editor');
|
||||
}
|
||||
|
||||
function handleKeydown(e: KeyboardEvent) {
|
||||
const mod = e.ctrlKey || e.metaKey;
|
||||
const code = e.code;
|
||||
@@ -744,6 +862,10 @@
|
||||
|
||||
const action = matchAction(e, $keybindings);
|
||||
if (action) {
|
||||
// History navigation is bound to Alt+Left/Right by default. While the
|
||||
// user is editing, those keys belong to the editor (word movement),
|
||||
// so skip the app shortcut and let the editable surface handle them.
|
||||
if ((action === 'nav-back' || action === 'nav-forward') && isEditableTarget(e.target)) return;
|
||||
e.preventDefault();
|
||||
switch (action) {
|
||||
case 'nav-back':
|
||||
@@ -773,6 +895,9 @@
|
||||
$showSearch = true;
|
||||
}
|
||||
return;
|
||||
case 'replace-in-note':
|
||||
if ($activeNotePath) editor?.openNoteSearch(true);
|
||||
return;
|
||||
case 'quick-open':
|
||||
$showCommandPalette = true;
|
||||
return;
|
||||
@@ -979,7 +1104,9 @@
|
||||
if (!ownerIsCurrent()) return;
|
||||
$sidebarWidth = state.sidebar_width;
|
||||
$notelistWidth = state.notelist_width;
|
||||
if (typeof state.outline_width === 'number') $outlineWidth = state.outline_width;
|
||||
if (typeof state.outline_width === 'number' && Number.isFinite(state.outline_width)) {
|
||||
$outlineWidth = Math.max(160, Math.min(500, state.outline_width));
|
||||
}
|
||||
$sidebarCollapsed = state.sidebar_collapsed;
|
||||
$notelistCollapsed = state.notelist_collapsed ?? false;
|
||||
$collapsedNotebooks = state.collapsed_notebooks ?? [];
|
||||
@@ -1050,12 +1177,13 @@
|
||||
|
||||
// ── WebDAV sync: global status + auto-sync triggers ──
|
||||
unlistenSync.push(await listen<{ vault_path: string }>('sync-progress', ({ payload }) => {
|
||||
if (ownerIsCurrent() && payload.vault_path === ownerVault) syncState.set({ running: true, error: null });
|
||||
if (ownerIsCurrent() && payload.vault_path === ownerVault) syncState.set({ running: true, error: null, result: null });
|
||||
}));
|
||||
if (!ownerIsCurrent()) { unlistenSync.pop()?.(); return; }
|
||||
unlistenSync.push(await listen<{ vault_path: string; bookmark_id?: string | null; success: boolean; last_sync_time?: string | null }>('sync-done', ({ payload }) => {
|
||||
unlistenSync.push(await listen<{ vault_path: string; bookmark_id?: string | null; success: boolean; summary?: SyncSummary; last_sync_time?: string | null }>('sync-done', ({ payload }) => {
|
||||
if (!ownerIsCurrent() || payload.vault_path !== ownerVault) return;
|
||||
syncState.set({ running: false, error: null });
|
||||
syncState.set({ running: false, error: null,
|
||||
result: payload.success ? { vault: payload.vault_path, summary: payload.summary ?? {} } : null });
|
||||
if (!payload.success || !payload.last_sync_time) return;
|
||||
const current = get(appConfig);
|
||||
const active = activeVaultConfig(current);
|
||||
@@ -1066,7 +1194,7 @@
|
||||
}));
|
||||
if (!ownerIsCurrent()) { unlistenSync.pop()?.(); return; }
|
||||
unlistenSync.push(await listen<{ vault_path: string; error?: string }>('sync-error', ({ payload }) => {
|
||||
if (ownerIsCurrent() && payload.vault_path === ownerVault) syncState.set({ running: false, error: payload.error ?? 'Sync failed' });
|
||||
if (ownerIsCurrent() && payload.vault_path === ownerVault) syncState.set({ running: false, error: payload.error ?? 'Sync failed', result: null });
|
||||
}));
|
||||
if (!ownerIsCurrent()) { unlistenSync.pop()?.(); return; }
|
||||
|
||||
@@ -1123,8 +1251,18 @@
|
||||
<div class="mobile-shell">
|
||||
<!-- Mobile Header -->
|
||||
<div class="mobile-header">
|
||||
{#if $mobileView !== 'sidebar'}
|
||||
<button class="mobile-header-btn" onclick={mobileBack} aria-label="Go back">
|
||||
{#if tabletLayout}
|
||||
<button class="mobile-header-btn" class:active={!tabletNavHidden} onclick={() => setTabletNavHidden(!tabletNavHidden)}
|
||||
title={tabletNavHidden ? 'Show side panel' : 'Hide side panel'} aria-label={tabletNavHidden ? 'Show side panel' : 'Hide side panel'} aria-pressed={!tabletNavHidden}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<rect x="3" y="3" width="18" height="18" rx="2"/><line x1="9" y1="3" x2="9" y2="21"/>
|
||||
</svg>
|
||||
</button>
|
||||
{/if}
|
||||
{#if tabletLayout && tabletNavHidden}
|
||||
<!-- The hidden column has no title or back step to show. -->
|
||||
{:else if $mobileView !== 'sidebar'}
|
||||
<button class="mobile-header-btn" bind:this={mobileBackButton} onclick={mobileBack} aria-label="Go back">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M15 18l-6-6 6-6"/>
|
||||
</svg>
|
||||
@@ -1140,7 +1278,7 @@
|
||||
</svg>
|
||||
</div>
|
||||
{/if}
|
||||
{#if $mobileView !== 'editor'}
|
||||
{#if tabletNavShown || (!tabletLayout && $mobileView !== 'editor')}
|
||||
<span class="mobile-header-title">
|
||||
{#if $mobileView === 'sidebar'}
|
||||
HelixNotes
|
||||
@@ -1155,8 +1293,8 @@
|
||||
{/if}
|
||||
{/if}
|
||||
<div class="mobile-header-actions">
|
||||
{#if $mobileView === 'editor'}
|
||||
<button class="mobile-header-btn" class:active={$readOnly} disabled={isTrashedNote($activeNotePath, ownerVault)} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? 'Edit' : 'View'}>
|
||||
{#if $mobileView === 'editor' || (tabletLayout && $activeNotePath)}
|
||||
<button class="mobile-header-btn" class:active={$readOnly} disabled={isTrashedNote($activeNotePath, ownerVault)} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? 'Edit' : 'View'} aria-label={$readOnly ? 'Edit' : 'View'}>
|
||||
<svg width="18" height="18" 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" />
|
||||
@@ -1167,17 +1305,19 @@
|
||||
{/if}
|
||||
</svg>
|
||||
</button>
|
||||
<button class="mobile-header-btn" onclick={() => editor?.openNoteSearch()} title="Find in note">
|
||||
<button class="mobile-header-btn" onclick={() => editor?.openNoteSearch()} title="Find in note" aria-label="Find in note">
|
||||
<svg width="18" height="18" 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"/><line x1="21" y1="21" x2="16.65" y2="16.65"/>
|
||||
</svg>
|
||||
</button>
|
||||
<button class="mobile-header-btn" class:active={$activeNote?.meta.pinned} onclick={() => { if ($activeNote) { $activeNote.meta.pinned = !$activeNote.meta.pinned; editor?.markEdited(); } }} title="Pin">
|
||||
{#snippet secondaryNoteActions(inMenu: boolean)}
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitemcheckbox' : undefined} aria-checked={inMenu ? !!$activeNote?.meta.pinned : undefined} class:active={$activeNote?.meta.pinned} onclick={() => { if ($activeNote) { $activeNote.meta.pinned = !$activeNote.meta.pinned; editor?.markEdited(); } }} title="Pin">
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M12 17v5"/><path d="M9 2h6l-1 7h4l-2 4H8l-2-4h4L9 2z"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>Pin</span>{/if}
|
||||
</button>
|
||||
<button class="mobile-header-btn" class:active={isQuickAccess} onclick={async () => {
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitemcheckbox' : undefined} aria-checked={inMenu ? isQuickAccess : undefined} class:active={isQuickAccess} onclick={async () => {
|
||||
if (!noteRelativePath) return;
|
||||
try {
|
||||
if (isQuickAccess) { await removeQuickAccess(ownerVault!, noteRelativePath); } else { await addQuickAccess(ownerVault!, noteRelativePath); }
|
||||
@@ -1189,45 +1329,73 @@
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill={isQuickAccess ? 'currentColor' : 'none'} stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2" />
|
||||
</svg>
|
||||
{#if inMenu}<span>Quick Access</span>{/if}
|
||||
</button>
|
||||
<button class="mobile-header-btn" onclick={() => editor?.toggleOutlinePanel()} title="Outline">
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} class:active={outlineOpen} onclick={() => editor?.toggleOutlinePanel()}
|
||||
title="Outline" aria-label="Outline" aria-expanded={outlineOpen} aria-controls={outlinePanelId || undefined}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<line x1="4" y1="6" x2="20" y2="6"/><line x1="8" y1="12" x2="20" y2="12"/><line x1="8" y1="18" x2="20" y2="18"/><circle cx="4" cy="12" r="1" fill="currentColor"/><circle cx="4" cy="18" r="1" fill="currentColor"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>Outline</span>{/if}
|
||||
</button>
|
||||
<button class="mobile-header-btn" onclick={() => editor?.toggleHistoryPanel()} title="History">
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} onclick={() => editor?.toggleHistoryPanel()} title="History">
|
||||
<svg width="18" height="18" 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"/><polyline points="12 6 12 12 16 14"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>History</span>{/if}
|
||||
</button>
|
||||
{#if $appConfig?.enable_wiki_links}
|
||||
<button class="mobile-header-btn" onclick={() => editor?.toggleGraphView()} title="Graph View">
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} onclick={() => editor?.toggleGraphView()} title="Graph View">
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="6" cy="6" r="3"/><circle cx="18" cy="6" r="3"/><circle cx="6" cy="18" r="3"/><circle cx="18" cy="18" r="3"/>
|
||||
<line x1="8.5" y1="7.5" x2="15.5" y2="16.5"/><line x1="15.5" y1="7.5" x2="8.5" y2="16.5"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>Graph View</span>{/if}
|
||||
</button>
|
||||
{/if}
|
||||
{#if $appConfig?.ai_provider}
|
||||
<button class="mobile-header-btn" onclick={() => editor?.triggerAiMenu()} title="AI Actions">
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} onclick={() => editor?.triggerAiMenu()} title="AI Actions">
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M12 8V4l-2-2"/><rect x="4" y="8" width="16" height="12" rx="2"/><path d="M2 14h2"/><path d="M20 14h2"/><path d="M9 13v2"/><path d="M15 13v2"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>AI Actions</span>{/if}
|
||||
</button>
|
||||
{/if}
|
||||
{#if activeVaultConfig($appConfig)?.sync_provider === 'webdav'}
|
||||
<button class="mobile-header-btn" class:active={$syncState.running} onclick={triggerSyncNow} disabled={$syncState.running} title={$syncState.error ? `Sync error: ${$syncState.error}` : ($syncState.running ? 'Syncing...' : 'Sync now')}>
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} class:active={$syncState.running} onclick={triggerSyncNow} disabled={$syncState.running} title={$syncState.error ? `Sync error: ${$syncState.error}` : ($syncState.running ? 'Syncing...' : 'Sync now')}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class:sync-spin={$syncState.running}>
|
||||
<path d="M21 2v6h-6"/><path d="M3 12a9 9 0 0115-6.7L21 8"/><path d="M3 22v-6h6"/><path d="M21 12a9 9 0 01-15 6.7L3 16"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>{$syncState.running ? 'Syncing...' : $syncState.error ? 'Sync error: retry' : 'Sync now'}</span>{/if}
|
||||
</button>
|
||||
{/if}
|
||||
<button class="mobile-header-btn" class:active={$sourceMode} onclick={() => ($sourceMode = !$sourceMode)} title={$sourceMode ? 'Rich Editor' : 'Source Mode'}>
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} class:active={$sourceMode} onclick={() => ($sourceMode = !$sourceMode)} title={$sourceMode ? 'Rich Editor' : 'Source Mode'}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polyline points="16 18 22 12 16 6" /><polyline points="8 6 2 12 8 18" />
|
||||
</svg>
|
||||
{#if inMenu}<span>{$sourceMode ? 'Rich Editor' : 'Source Mode'}</span>{/if}
|
||||
</button>
|
||||
{:else}
|
||||
{/snippet}
|
||||
{#if tabletLayout}
|
||||
{@render secondaryNoteActions(false)}
|
||||
{:else}
|
||||
<div class="mobile-note-menu-wrapper" bind:this={mobileNoteMenuWrapper}>
|
||||
<button class="mobile-header-btn" class:active={mobileNoteMenuOpen} type="button" bind:this={mobileNoteMenuTrigger}
|
||||
title="More note actions" aria-label="More note actions" aria-haspopup="menu" aria-expanded={mobileNoteMenuOpen} aria-controls="mobile-note-menu" onclick={toggleMobileNoteMenu}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
|
||||
<circle cx="5" cy="12" r="2"/><circle cx="12" cy="12" r="2"/><circle cx="19" cy="12" r="2"/>
|
||||
</svg>
|
||||
</button>
|
||||
{#if mobileNoteMenuOpen}
|
||||
<div class="mobile-note-menu" id="mobile-note-menu" bind:this={mobileNoteMenu} role="menu" aria-label="Note actions" tabindex="-1"
|
||||
onkeydown={handleMobileNoteMenuKeydown} onclickcapture={() => closeMobileNoteMenu(true)}>
|
||||
{@render secondaryNoteActions(true)}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
{#if tabletLayout || $mobileView !== 'editor'}
|
||||
<button class="mobile-header-btn" onclick={() => ($showSearch = true)} title="Search">
|
||||
<svg width="18" height="18" 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" />
|
||||
@@ -1260,15 +1428,15 @@
|
||||
</div>
|
||||
|
||||
<!-- Mobile Content -->
|
||||
<div class="mobile-content">
|
||||
<div class="mobile-panel" class:active={$mobileView === 'sidebar'}>
|
||||
<div class="mobile-content" class:tablet={tabletLayout} class:nav-hidden={tabletLayout && tabletNavHidden}>
|
||||
<div class="mobile-panel" class:active={$mobileView === 'sidebar' && (!tabletLayout || tabletNavShown)}>
|
||||
<Sidebar bind:this={sidebar} onViewChanged={handleViewChanged} onBeforeNoteChange={() => editor?.flushSave() ?? Promise.resolve(true)} onBeforePathMutation={() => editor?.beginPathMutation() ?? Promise.resolve(() => {})} onPathsMoved={handlePathsMoved} />
|
||||
</div>
|
||||
<div class="mobile-panel" class:active={$mobileView === 'notelist'}>
|
||||
<div class="mobile-panel" class:active={tabletLayout ? tabletNavShown && $mobileView !== 'sidebar' : $mobileView === 'notelist'}>
|
||||
<NoteList bind:this={noteList} onNoteSelected={handleNoteSelected} onBeforeNoteSwitch={() => editor?.flushSave() ?? Promise.resolve(true)} onBeforeNoteDuplicate={() => editor?.forceSave() ?? Promise.resolve(true)} onBeforePathMutation={() => editor?.beginPathMutation() ?? Promise.resolve(() => {})} onPathsMoved={handlePathsMoved} onUpdateActiveNote={updateActiveNoteMetadata} onTagsChanged={handleTagsChanged} onRefreshTags={() => { if (!isMobile) void sidebar?.refreshTags(); }} onNoteMoved={() => sidebar?.refresh()} onNoteCreated={(token) => { editor?.focusTitle(token); }} onToggleTask={toggleTask} onSetTaskPriority={changeTaskPriority} onSetTaskDue={changeTaskDue} />
|
||||
</div>
|
||||
<div class="mobile-panel" class:active={$mobileView === 'editor'}>
|
||||
<Editor bind:this={editor} onMoveToTrash={trashOpenNote} />
|
||||
<div class="mobile-panel mobile-editor-panel" class:active={$mobileView === 'editor' || tabletLayout}>
|
||||
<Editor bind:this={editor} onMoveToTrash={trashOpenNote} onOutlineChange={handleOutlineChange} onShowTag={showTagNotes} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1345,7 +1513,7 @@
|
||||
{/if}
|
||||
|
||||
<div class="editor-panel">
|
||||
<Editor bind:this={editor} onMoveToTrash={trashOpenNote} />
|
||||
<Editor bind:this={editor} onMoveToTrash={trashOpenNote} onShowTag={showTagNotes} />
|
||||
{#if $viewMode === 'tasks' && !taskNoteOpened}
|
||||
<div class="tasks-editor-placeholder">
|
||||
<svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
|
||||
@@ -1521,8 +1689,8 @@
|
||||
.mobile-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 52px;
|
||||
padding: 0 8px;
|
||||
min-height: 52px;
|
||||
padding: 8px;
|
||||
background: var(--bg-secondary);
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
flex-shrink: 0;
|
||||
@@ -1566,12 +1734,16 @@
|
||||
.mobile-header-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
flex-wrap: wrap;
|
||||
min-width: 0;
|
||||
gap: 2px;
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
.mobile-header-btn {
|
||||
display: flex;
|
||||
flex-shrink: 0;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 34px;
|
||||
@@ -1596,6 +1768,70 @@
|
||||
color: var(--accent);
|
||||
}
|
||||
|
||||
.mobile-note-menu-wrapper {
|
||||
position: relative;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.mobile-note-menu {
|
||||
position: absolute;
|
||||
top: calc(100% + 8px);
|
||||
right: 0;
|
||||
z-index: 1000;
|
||||
width: min(260px, calc(100vw - 24px));
|
||||
max-height: calc(100dvh - env(safe-area-inset-top, 0px) - env(safe-area-inset-bottom, 0px) - 72px);
|
||||
overflow-y: auto;
|
||||
overscroll-behavior: contain;
|
||||
padding: 6px;
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 10px;
|
||||
background: var(--bg-secondary);
|
||||
box-shadow: 0 12px 30px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
.mobile-note-menu-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
width: 100%;
|
||||
min-height: 42px;
|
||||
padding: 8px 10px;
|
||||
border: none;
|
||||
border-radius: 7px;
|
||||
background: none;
|
||||
color: var(--text-primary);
|
||||
font: inherit;
|
||||
font-size: 14px;
|
||||
text-align: left;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.mobile-note-menu-item svg {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.mobile-note-menu-item:hover {
|
||||
background: var(--bg-hover);
|
||||
}
|
||||
|
||||
.mobile-note-menu-item.active {
|
||||
color: var(--accent);
|
||||
background: var(--accent-light);
|
||||
}
|
||||
|
||||
.mobile-note-menu-item:disabled {
|
||||
opacity: 0.5;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.mobile-header-btn:focus-visible,
|
||||
.mobile-note-menu-item:focus-visible {
|
||||
outline: 2px solid var(--accent);
|
||||
outline-offset: -2px;
|
||||
}
|
||||
|
||||
.mobile-content {
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
@@ -1617,4 +1853,21 @@
|
||||
pointer-events: auto;
|
||||
}
|
||||
|
||||
.mobile-content.tablet .mobile-panel {
|
||||
right: auto;
|
||||
width: 320px;
|
||||
border-right: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
.mobile-content.tablet .mobile-editor-panel {
|
||||
left: 320px;
|
||||
right: 0;
|
||||
width: auto;
|
||||
border-right: none;
|
||||
}
|
||||
|
||||
.mobile-content.tablet.nav-hidden .mobile-editor-panel {
|
||||
left: 0;
|
||||
}
|
||||
|
||||
</style>
|
||||
@@ -184,7 +184,7 @@
|
||||
}
|
||||
|
||||
function applyTheme(t: string) {
|
||||
const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula', 'blueberry', 'forest-green', 'gruvbox', 'midnight-tide', 'cherry-blossom', 'synthwave', 'ember', 'moonlit', 'light-coffee', 'dark-coffee', 'cotton-candy', 'crimson', 'cloud', 'peach', 'material-dark', 'material-light', 'monokai', 'rose-pine', 'everforest', 'horizon', 'cyberpunk', 'black', 'one-dark'];
|
||||
const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula', 'blueberry', 'forest-green', 'gruvbox', 'midnight-tide', 'cherry-blossom', 'synthwave', 'ember', 'moonlit', 'light-coffee', 'dark-coffee', 'cotton-candy', 'crimson', 'cloud', 'peach', 'material-dark', 'material-light', 'monokai', 'rose-pine', 'everforest', 'horizon', 'cyberpunk', 'black', 'one-dark', 'matrix', 'amber-crt', 'sepia', 'deep-ocean', 'sandstone', 'lavender', 'graphite', 'nebula', 'wine', 'jade'];
|
||||
const root = document.documentElement;
|
||||
root.classList.remove('dark');
|
||||
root.removeAttribute('data-theme');
|
||||
|
||||
+1796
-597
File diff suppressed because it is too large.
Load diff
@@ -4,6 +4,7 @@
|
||||
import { activeNotePath, appConfig } from '$lib/stores/app';
|
||||
import { isMobile } from '$lib/platform';
|
||||
import { applyGraphRepulsion } from '$lib/utils/graph-layout';
|
||||
import { buildGraphTopology, getGraphNeighborhood } from '$lib/utils/graph-topology';
|
||||
|
||||
let { onclose, onnavigate }: {
|
||||
onclose: () => void;
|
||||
@@ -26,6 +27,7 @@
|
||||
let nodeIndexMap: Map<string, number> = new Map();
|
||||
let connectedSet: Set<number> = new Set();
|
||||
let nodeDegree: number[] = [];
|
||||
let incidentEdges = $state.raw<number[][]>([]);
|
||||
let searchMatchSet = $state.raw<Set<number> | null>(null);
|
||||
let folderColorMap = new Map<string, string>();
|
||||
|
||||
@@ -41,6 +43,8 @@
|
||||
let hoveredNeighborSet: Set<number> = new Set();
|
||||
let hoveredEdgeSet: Set<number> = new Set();
|
||||
let activeNodeIdx = $state(-1);
|
||||
// Svelte caches this until the active node or graph topology changes.
|
||||
let localNeighborhood = $derived(getGraphNeighborhood(activeNodeIdx, edges, incidentEdges));
|
||||
let navigatedFromGraph = false;
|
||||
|
||||
// Physics runs in short yielded batches; the completed graph is static.
|
||||
@@ -49,6 +53,7 @@
|
||||
const layoutChannel = new MessageChannel();
|
||||
let layoutScheduled = false;
|
||||
let disposed = false;
|
||||
let drawFrame: number | null = null;
|
||||
|
||||
// DPI fix
|
||||
let dpr = 1;
|
||||
@@ -115,35 +120,9 @@
|
||||
function updateHoveredState(node: GraphNode | null) {
|
||||
hoveredNode = node;
|
||||
hoveredIdx = node ? nodes.indexOf(node) : -1;
|
||||
hoveredNeighborSet = new Set();
|
||||
hoveredEdgeSet = new Set();
|
||||
if (hoveredIdx < 0) return;
|
||||
hoveredNeighborSet.add(hoveredIdx);
|
||||
for (let i = 0; i < edges.length; i++) {
|
||||
const e = edges[i];
|
||||
if (e.sourceIdx === hoveredIdx || e.targetIdx === hoveredIdx) {
|
||||
hoveredEdgeSet.add(i);
|
||||
hoveredNeighborSet.add(e.sourceIdx);
|
||||
hoveredNeighborSet.add(e.targetIdx);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Nodes/edges visible in local mode (active note + direct neighbours)
|
||||
function computeLocalSets(): { nodeSet: Set<number>; edgeSet: Set<number> } {
|
||||
const nodeSet = new Set<number>();
|
||||
const edgeSet = new Set<number>();
|
||||
if (activeNodeIdx < 0) return { nodeSet, edgeSet };
|
||||
nodeSet.add(activeNodeIdx);
|
||||
for (let i = 0; i < edges.length; i++) {
|
||||
const e = edges[i];
|
||||
if (e.sourceIdx === activeNodeIdx || e.targetIdx === activeNodeIdx) {
|
||||
edgeSet.add(i);
|
||||
nodeSet.add(e.sourceIdx);
|
||||
nodeSet.add(e.targetIdx);
|
||||
}
|
||||
}
|
||||
return { nodeSet, edgeSet };
|
||||
const neighborhood = getGraphNeighborhood(hoveredIdx, edges, incidentEdges);
|
||||
hoveredNeighborSet = neighborhood.nodeSet;
|
||||
hoveredEdgeSet = neighborhood.edgeSet;
|
||||
}
|
||||
|
||||
function updateSearchMatch() {
|
||||
@@ -175,15 +154,13 @@
|
||||
};
|
||||
});
|
||||
|
||||
connectedSet = new Set();
|
||||
nodeDegree = new Array(nodes.length).fill(0);
|
||||
edges = data.edges.map(e => {
|
||||
connectedSet.add(e.source);
|
||||
connectedSet.add(e.target);
|
||||
nodeDegree[e.source] = (nodeDegree[e.source] || 0) + 1;
|
||||
nodeDegree[e.target] = (nodeDegree[e.target] || 0) + 1;
|
||||
return { sourceIdx: e.source, targetIdx: e.target, bidirectional: e.bidirectional };
|
||||
});
|
||||
edges = data.edges.map(e => ({
|
||||
sourceIdx: e.source, targetIdx: e.target, bidirectional: e.bidirectional,
|
||||
}));
|
||||
const topology = buildGraphTopology(nodes.length, edges);
|
||||
connectedSet = topology.connectedSet;
|
||||
nodeDegree = topology.nodeDegree;
|
||||
incidentEdges = topology.incidentEdges;
|
||||
|
||||
buildFolderColors();
|
||||
updateSearchMatch();
|
||||
@@ -196,15 +173,11 @@
|
||||
|
||||
function centerOnActiveNote() {
|
||||
if (!canvas || nodes.length === 0 || activeNodeIdx < 0) return;
|
||||
const activeNode = nodes[activeNodeIdx];
|
||||
const neighborhood: GraphNode[] = [activeNode];
|
||||
for (const edge of edges) {
|
||||
if (edge.sourceIdx === activeNodeIdx) neighborhood.push(nodes[edge.targetIdx]);
|
||||
else if (edge.targetIdx === activeNodeIdx) neighborhood.push(nodes[edge.sourceIdx]);
|
||||
}
|
||||
const neighborhood = localNeighborhood.nodeSet;
|
||||
const w = canvasW, h = canvasH, padding = 100;
|
||||
let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
|
||||
for (const n of neighborhood) {
|
||||
for (const i of neighborhood) {
|
||||
const n = nodes[i];
|
||||
if (n.x < minX) minX = n.x; if (n.y < minY) minY = n.y;
|
||||
if (n.x > maxX) maxX = n.x; if (n.y > maxY) maxY = n.y;
|
||||
}
|
||||
@@ -230,7 +203,7 @@
|
||||
|
||||
function focusActive() {
|
||||
if (activeNodeIdx >= 0) centerOnActiveNote(); else fitToView();
|
||||
draw();
|
||||
requestDraw();
|
||||
}
|
||||
|
||||
function startSimulation() {
|
||||
@@ -239,7 +212,7 @@
|
||||
physicsStep = null;
|
||||
if (physicsRemaining === 0) {
|
||||
loading = false;
|
||||
draw();
|
||||
requestDraw();
|
||||
} else {
|
||||
startLayoutLoop();
|
||||
}
|
||||
@@ -264,7 +237,7 @@
|
||||
if (physicsRemaining === 0) {
|
||||
loading = false;
|
||||
if (activeNodeIdx >= 0) centerOnActiveNote(); else fitToView();
|
||||
draw();
|
||||
requestDraw();
|
||||
} else {
|
||||
layoutScheduled = true;
|
||||
layoutChannel.port2.postMessage(null);
|
||||
@@ -311,8 +284,16 @@
|
||||
}
|
||||
}
|
||||
|
||||
function requestDraw() {
|
||||
if (disposed || drawFrame !== null) return;
|
||||
drawFrame = requestAnimationFrame(() => {
|
||||
drawFrame = null;
|
||||
draw();
|
||||
});
|
||||
}
|
||||
|
||||
function draw() {
|
||||
if (!canvas || loading) return;
|
||||
if (disposed || !canvas || loading) return;
|
||||
const ctx = canvas.getContext('2d');
|
||||
if (!ctx) return;
|
||||
|
||||
@@ -328,14 +309,18 @@
|
||||
const isSearching = searchMatchSet !== null;
|
||||
|
||||
// Local mode: restrict which nodes/edges are visible
|
||||
const { nodeSet: localNodeSet, edgeSet: localEdgeSet } = localMode ? computeLocalSets() : { nodeSet: null as Set<number> | null, edgeSet: null as Set<number> | null };
|
||||
const localNodeSet = localMode ? localNeighborhood.nodeSet : null;
|
||||
const localEdgeSet = localMode ? localNeighborhood.edgeSet : null;
|
||||
// Edge strokes and arrowheads keep their screen size when zoomed out; scaled with the
|
||||
// graph they thin out below a pixel and the links fade away from the nodes.
|
||||
const edgeScale = 1 / Math.min(zoom, 1);
|
||||
|
||||
// ── Edges ──────────────────────────────────────────────────────────────
|
||||
if (isHovering) {
|
||||
// Dimmed non-connected edges
|
||||
ctx.globalAlpha = 0.06;
|
||||
ctx.strokeStyle = borderColor;
|
||||
ctx.lineWidth = 1;
|
||||
ctx.lineWidth = edgeScale;
|
||||
ctx.beginPath();
|
||||
for (let i = 0; i < edges.length; i++) {
|
||||
if (hoveredEdgeSet.has(i)) continue;
|
||||
@@ -348,9 +333,11 @@
|
||||
// Highlighted connected edges
|
||||
ctx.globalAlpha = 0.8;
|
||||
ctx.strokeStyle = accent;
|
||||
ctx.lineWidth = 1.5;
|
||||
ctx.lineWidth = 1.5 * edgeScale;
|
||||
ctx.beginPath();
|
||||
for (const i of hoveredEdgeSet) {
|
||||
// A neighbour's links to notes outside the local graph have no node to end on.
|
||||
if (localEdgeSet && !localEdgeSet.has(i)) continue;
|
||||
ctx.moveTo(nodes[edges[i].sourceIdx].x, nodes[edges[i].sourceIdx].y);
|
||||
ctx.lineTo(nodes[edges[i].targetIdx].x, nodes[edges[i].targetIdx].y);
|
||||
}
|
||||
@@ -359,16 +346,18 @@
|
||||
// Arrowheads on highlighted edges
|
||||
ctx.fillStyle = accent;
|
||||
ctx.globalAlpha = 0.8;
|
||||
const al = 7 * edgeScale, aw = 3.5 * edgeScale;
|
||||
const drawArrow = (tipX: number, tipY: number, ux: number, uy: number) => {
|
||||
const bx = tipX - ux * 7, by = tipY - uy * 7;
|
||||
const bx = tipX - ux * al, by = tipY - uy * al;
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(tipX, tipY);
|
||||
ctx.lineTo(bx - uy * 3.5, by + ux * 3.5);
|
||||
ctx.lineTo(bx + uy * 3.5, by - ux * 3.5);
|
||||
ctx.lineTo(bx - uy * aw, by + ux * aw);
|
||||
ctx.lineTo(bx + uy * aw, by - ux * aw);
|
||||
ctx.closePath();
|
||||
ctx.fill();
|
||||
};
|
||||
for (const i of hoveredEdgeSet) {
|
||||
if (localEdgeSet && !localEdgeSet.has(i)) continue;
|
||||
const e = edges[i];
|
||||
const src = nodes[e.sourceIdx];
|
||||
const tgt = nodes[e.targetIdx];
|
||||
@@ -388,7 +377,7 @@
|
||||
} else if (isSearching) {
|
||||
// All visible edges faint
|
||||
ctx.strokeStyle = borderColor;
|
||||
ctx.lineWidth = 1;
|
||||
ctx.lineWidth = edgeScale;
|
||||
ctx.globalAlpha = 0.07;
|
||||
ctx.beginPath();
|
||||
for (let i = 0; i < edges.length; i++) {
|
||||
@@ -410,7 +399,7 @@
|
||||
ctx.stroke();
|
||||
} else {
|
||||
ctx.strokeStyle = borderColor;
|
||||
ctx.lineWidth = isMobile ? 1.5 : 1;
|
||||
ctx.lineWidth = (isMobile ? 1.5 : 1) * edgeScale;
|
||||
ctx.globalAlpha = isMobile ? 0.65 : 0.35;
|
||||
ctx.beginPath();
|
||||
for (let i = 0; i < edges.length; i++) {
|
||||
@@ -594,17 +583,17 @@
|
||||
dragging.x = (e.clientX - rect.left - pan.x) / zoom;
|
||||
dragging.y = (e.clientY - rect.top - pan.y) / zoom;
|
||||
dragging.vx = 0; dragging.vy = 0;
|
||||
draw();
|
||||
requestDraw();
|
||||
} else if (panning) {
|
||||
pan.x = e.clientX - panStart.x;
|
||||
pan.y = e.clientY - panStart.y;
|
||||
draw();
|
||||
requestDraw();
|
||||
} else if (!dragging) {
|
||||
const node = getNodeAt(e.clientX, e.clientY);
|
||||
if (node !== hoveredNode) {
|
||||
updateHoveredState(node);
|
||||
if (canvas) canvas.style.cursor = node ? 'pointer' : 'grab';
|
||||
if (!layoutScheduled) draw();
|
||||
if (!layoutScheduled) requestDraw();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -629,7 +618,7 @@
|
||||
zoom = Math.max(0.2, Math.min(5, zoom * (e.deltaY > 0 ? 0.9 : 1.1)));
|
||||
pan.x = mx - (mx - pan.x) * (zoom / oldZoom);
|
||||
pan.y = my - (my - pan.y) * (zoom / oldZoom);
|
||||
draw();
|
||||
requestDraw();
|
||||
}
|
||||
|
||||
function handleKeydown(e: KeyboardEvent) {
|
||||
@@ -668,11 +657,11 @@
|
||||
dragging.x = (t.clientX - rect.left - pan.x) / zoom;
|
||||
dragging.y = (t.clientY - rect.top - pan.y) / zoom;
|
||||
dragging.vx = 0; dragging.vy = 0;
|
||||
draw();
|
||||
requestDraw();
|
||||
} else if (panning) {
|
||||
pan.x = t.clientX - panStart.x;
|
||||
pan.y = t.clientY - panStart.y;
|
||||
draw();
|
||||
requestDraw();
|
||||
}
|
||||
} else if (e.touches.length === 2) {
|
||||
const dx = e.touches[0].clientX - e.touches[1].clientX;
|
||||
@@ -687,7 +676,7 @@
|
||||
zoom = Math.max(0.2, Math.min(5, zoom * (dist / lastTouchDist)));
|
||||
pan.x = mx - (mx - pan.x) * (zoom / oldZoom);
|
||||
pan.y = my - (my - pan.y) * (zoom / oldZoom);
|
||||
draw();
|
||||
requestDraw();
|
||||
}
|
||||
lastTouchDist = dist;
|
||||
}
|
||||
@@ -730,18 +719,20 @@
|
||||
navigatedFromGraph = false;
|
||||
centerOnActiveNote();
|
||||
}
|
||||
if (!layoutScheduled && canvas) untrack(draw);
|
||||
if (!layoutScheduled && canvas) untrack(requestDraw);
|
||||
});
|
||||
|
||||
// React to search query changes
|
||||
$effect(() => {
|
||||
const _q = searchQuery; // track
|
||||
updateSearchMatch();
|
||||
if (canvas && !layoutScheduled) untrack(draw);
|
||||
if (canvas && !layoutScheduled) untrack(requestDraw);
|
||||
});
|
||||
|
||||
onDestroy(() => {
|
||||
disposed = true;
|
||||
if (drawFrame !== null) cancelAnimationFrame(drawFrame);
|
||||
drawFrame = null;
|
||||
layoutChannel.port1.onmessage = null;
|
||||
layoutChannel.port1.close();
|
||||
layoutChannel.port2.close();
|
||||
@@ -775,7 +766,7 @@
|
||||
<div class="graph-stats">
|
||||
{#if !loading}
|
||||
{#if localMode && activeNodeIdx >= 0}
|
||||
{computeLocalSets().nodeSet.size} notes · {computeLocalSets().edgeSet.size} links
|
||||
{localNeighborhood.nodeSet.size} notes · {localNeighborhood.edgeSet.size} links
|
||||
{:else}
|
||||
{nodes.length} notes · {edges.length} links
|
||||
{/if}
|
||||
|
||||
@@ -0,0 +1,189 @@
|
||||
<script lang="ts">
|
||||
import { tick } from 'svelte';
|
||||
import SnapshotDocument from './SnapshotDocument.svelte';
|
||||
import { comparableBody, compareHistory, splitSnapshot, type HistoryComparison, type HistoryRow } from '$lib/utils/history-comparison';
|
||||
|
||||
let { raw, current, selected, loading, error, canRestore, onRetry, onRestore, renderSnapshot }: {
|
||||
raw: string | null;
|
||||
current: string;
|
||||
selected: string | null;
|
||||
loading: boolean;
|
||||
error: string | null;
|
||||
canRestore: boolean;
|
||||
onRetry: () => void;
|
||||
onRestore: () => void;
|
||||
renderSnapshot: (body: string) => string;
|
||||
} = $props();
|
||||
|
||||
let view = $state<'changes' | 'snapshot'>('changes');
|
||||
let source = $state(false);
|
||||
let comparison = $state<HistoryComparison | null>(null);
|
||||
let comparing = $state(false);
|
||||
let comparisonError = $state<string | null>(null);
|
||||
let request = 0;
|
||||
const snapshot = $derived(splitSnapshot(raw ?? ''));
|
||||
const rendered = $derived.by(() => {
|
||||
if (view !== 'snapshot' || source || raw === null) return { html: '', error: '' };
|
||||
try {
|
||||
return { html: renderSnapshot(snapshot.body), error: '' };
|
||||
} catch (cause) {
|
||||
return { html: '', error: `Could not render this snapshot: ${String(cause)}` };
|
||||
}
|
||||
});
|
||||
|
||||
$effect(() => {
|
||||
const content = raw;
|
||||
const working = current;
|
||||
const body = snapshot.body;
|
||||
const generation = ++request;
|
||||
comparison = null;
|
||||
comparisonError = null;
|
||||
comparing = content !== null;
|
||||
if (content !== null) {
|
||||
compareHistory(comparableBody(working), comparableBody(body)).then((result) => {
|
||||
if (generation !== request) return;
|
||||
comparison = result;
|
||||
}).catch((cause) => {
|
||||
if (generation === request) comparisonError = `Could not compare this version: ${String(cause)}`;
|
||||
}).finally(() => {
|
||||
if (generation === request) comparing = false;
|
||||
});
|
||||
}
|
||||
return () => { request++; };
|
||||
});
|
||||
|
||||
async function navigateTabs(event: KeyboardEvent) {
|
||||
if (!['ArrowLeft', 'ArrowRight', 'Home', 'End'].includes(event.key)) return;
|
||||
event.preventDefault();
|
||||
view = event.key === 'Home' ? 'changes' : event.key === 'End' ? 'snapshot' : view === 'changes' ? 'snapshot' : 'changes';
|
||||
await tick();
|
||||
document.getElementById(`history-tab-${view}`)?.focus();
|
||||
}
|
||||
</script>
|
||||
|
||||
{#snippet lines(rows: HistoryRow[])}
|
||||
{#each rows as row}
|
||||
<div class="diff-line {row.kind}">
|
||||
<span class="line-number" aria-label="Current note line">{row.currentLine ?? ''}</span>
|
||||
<span class="line-number" aria-label="Snapshot line">{row.snapshotLine ?? ''}</span>
|
||||
<span class="line-sign" aria-label={row.kind === 'added' ? 'Added by restoring' : row.kind === 'removed' ? 'Removed by restoring' : 'Unchanged'}>{row.kind === 'added' ? '+' : row.kind === 'removed' ? '−' : ' '}</span>
|
||||
<span class="line-text">{row.text || ' '}{#if !row.newline}<span class="line-ending">No final newline</span>{/if}</span>
|
||||
</div>
|
||||
{/each}
|
||||
{/snippet}
|
||||
|
||||
<section class="history-review" aria-label="Version review">
|
||||
<div class="review-header">
|
||||
<div class="review-heading">
|
||||
<strong>{selected ?? 'Version History'}</strong>
|
||||
<span>Read-only. Your current note stays unchanged.</span>
|
||||
</div>
|
||||
<div class="review-tabs" role="tablist" aria-label="Version view" tabindex="-1" onkeydown={navigateTabs}>
|
||||
<button id="history-tab-changes" role="tab" aria-selected={view === 'changes'} aria-controls="history-changes" tabindex={view === 'changes' ? 0 : -1} onclick={() => view = 'changes'}>Changes</button>
|
||||
<button id="history-tab-snapshot" role="tab" aria-selected={view === 'snapshot'} aria-controls="history-snapshot" tabindex={view === 'snapshot' ? 0 : -1} onclick={() => view = 'snapshot'}>Snapshot</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{#if loading}
|
||||
<p class="review-status" role="status">Loading version…</p>
|
||||
{:else if error}
|
||||
<div class="review-status" role="alert"><p>{error}</p><button class="review-button" onclick={onRetry}>Retry</button></div>
|
||||
{:else if raw === null}
|
||||
<p class="review-status">Select a version to review.</p>
|
||||
{:else if view === 'changes'}
|
||||
<div id="history-changes" class="review-panel" role="tabpanel" aria-labelledby="history-tab-changes" tabindex="0">
|
||||
<div class="comparison-heading">
|
||||
<span>Current note → selected version</span>
|
||||
{#if comparison}<span class="comparison-count"><span class="added-count">+{comparison.added}</span> <span class="removed-count">−{comparison.removed}</span> lines</span>{/if}
|
||||
</div>
|
||||
{#if comparing}
|
||||
<p class="review-status" role="status">Comparing…</p>
|
||||
{:else if comparisonError}
|
||||
<p class="review-status" role="alert">{comparisonError}</p>
|
||||
{:else if comparison && comparison.added === 0 && comparison.removed === 0}
|
||||
<p class="review-status">No content changes. Metadata is not restored.</p>
|
||||
{:else if comparison}
|
||||
<div class="history-diff">
|
||||
{#key raw}
|
||||
{#each comparison.chunks as chunk}
|
||||
{#if chunk.kind === 'unchanged'}
|
||||
<details class="unchanged-lines"><summary>{chunk.rows.length} unchanged {chunk.rows.length === 1 ? 'line' : 'lines'}</summary>{@render lines(chunk.rows)}</details>
|
||||
{:else}
|
||||
{@render lines(chunk.rows)}
|
||||
{/if}
|
||||
{/each}
|
||||
{/key}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{:else}
|
||||
<div id="history-snapshot" class="review-panel" role="tabpanel" aria-labelledby="history-tab-snapshot" tabindex="0">
|
||||
<div class="snapshot-heading"><span>Selected snapshot</span><button class="source-toggle" aria-pressed={source} onclick={() => source = !source}>{source ? 'Rendered view' : 'View source'}</button></div>
|
||||
{#if snapshot.body === ''}
|
||||
<p class="review-status">This snapshot is empty.</p>
|
||||
{:else if source}
|
||||
<textarea class="snapshot-source" readonly aria-label="Snapshot Markdown, read-only" value={snapshot.body}></textarea>
|
||||
{:else if rendered.error}
|
||||
<p class="review-status" role="alert">{rendered.error} View source to inspect the stored body.</p>
|
||||
{:else}
|
||||
<SnapshotDocument html={rendered.html} />
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if raw !== null && snapshot.metadata}
|
||||
<details class="history-metadata"><summary>Metadata (not restored)</summary><pre>{snapshot.metadata}</pre></details>
|
||||
{/if}
|
||||
{#if selected}
|
||||
<div class="review-actions"><span>Restore replaces the current note’s content only.</span><button class="history-restore-btn" disabled={!canRestore} onclick={onRestore}>Restore this version</button></div>
|
||||
{/if}
|
||||
</section>
|
||||
|
||||
<style>
|
||||
.history-review { display: flex; flex-direction: column; flex: 1; min-width: 0; min-height: 0; background: var(--bg-primary); }
|
||||
.review-header { display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 12px 16px; border-bottom: 1px solid var(--border-light); flex-shrink: 0; flex-wrap: wrap; }
|
||||
.review-heading { display: flex; flex-direction: column; gap: 4px; min-width: 0; }
|
||||
.review-heading strong { font-size: 13px; overflow-wrap: anywhere; }
|
||||
.review-heading > span { font-size: 12px; color: var(--text-secondary); }
|
||||
.review-tabs { display: flex; gap: 2px; padding: 2px; border: 1px solid var(--border-color); border-radius: 6px; }
|
||||
.review-tabs button, .source-toggle, .review-button { padding: 6px 10px; border: none; border-radius: 4px; background: transparent; color: var(--text-secondary); font-size: 12px; cursor: pointer; }
|
||||
.review-tabs button[aria-selected="true"] { background: var(--accent-light); color: var(--accent); }
|
||||
.review-tabs button:focus-visible, .source-toggle:focus-visible, .review-button:focus-visible, summary:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
|
||||
.review-panel { flex: 1; min-height: 0; overflow: auto; outline-offset: -2px; }
|
||||
.review-panel:focus-visible { outline: 2px solid var(--accent); }
|
||||
.comparison-heading, .snapshot-heading { display: flex; justify-content: space-between; align-items: center; gap: 12px; padding: 10px 16px; font-size: 12px; color: var(--text-secondary); border-bottom: 1px solid var(--border-light); flex-wrap: wrap; }
|
||||
.comparison-count { font-family: var(--font-mono, monospace); }
|
||||
.added-count { color: var(--success); } .removed-count { color: var(--danger, #dc2626); }
|
||||
.review-status { margin: 0; padding: 20px 16px; color: var(--text-secondary); font-size: 13px; line-height: 1.6; overflow-wrap: anywhere; }
|
||||
.review-button { margin-top: 8px; border: 1px solid var(--border-color); background: var(--bg-secondary); color: var(--text-primary); }
|
||||
.history-diff { padding: 8px 0; font-family: var(--font-mono, monospace); font-size: 12px; line-height: 1.6; }
|
||||
.diff-line { display: grid; grid-template-columns: 3.5em 3.5em 1.6em minmax(0, 1fr); align-items: start; padding: 1px 12px 1px 4px; }
|
||||
.diff-line.added { background: color-mix(in srgb, var(--success) 12%, var(--bg-primary)); }
|
||||
.diff-line.removed { background: color-mix(in srgb, var(--danger, #dc2626) 12%, var(--bg-primary)); }
|
||||
.line-number { padding-right: 8px; text-align: right; color: var(--text-tertiary); user-select: none; font-size: 10px; }
|
||||
.line-sign { color: var(--text-secondary); user-select: none; }
|
||||
.added .line-sign { color: var(--success); } .removed .line-sign { color: var(--danger, #dc2626); }
|
||||
.line-text { white-space: pre-wrap; overflow-wrap: anywhere; }
|
||||
.line-ending { display: block; color: var(--text-secondary); font-style: italic; font-size: 10px; }
|
||||
.unchanged-lines > summary { padding: 7px 16px; color: var(--text-secondary); background: var(--bg-secondary); cursor: pointer; font-family: var(--font-sans, inherit); font-size: 12px; }
|
||||
.snapshot-source { display: block; width: 100%; min-height: 100%; margin: 0; padding: 16px; resize: none; border: none; background: var(--bg-primary); color: var(--text-primary); font-family: var(--font-mono, monospace); font-size: 13px; line-height: 1.6; }
|
||||
.snapshot-source:focus-visible { outline: 2px solid var(--accent); outline-offset: -2px; }
|
||||
.history-metadata { flex-shrink: 0; border-top: 1px solid var(--border-light); font-size: 12px; color: var(--text-secondary); max-height: 30%; overflow: auto; }
|
||||
.history-metadata > summary { cursor: pointer; padding: 8px 16px; }
|
||||
.history-metadata pre { margin: 0; padding: 0 16px 12px; font-family: var(--font-mono, monospace); font-size: 11px; white-space: pre-wrap; overflow-wrap: anywhere; }
|
||||
.review-actions { display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 10px 16px; padding-bottom: calc(10px + env(safe-area-inset-bottom, 0px)); border-top: 1px solid var(--border-light); background: var(--bg-secondary); flex-shrink: 0; flex-wrap: wrap; }
|
||||
.review-actions > span { font-size: 11px; color: var(--text-secondary); }
|
||||
.history-restore-btn { padding: 8px 14px; border: 1px solid var(--accent); border-radius: 6px; color: var(--accent); background: var(--accent-light); font-size: 12px; font-weight: 500; cursor: pointer; }
|
||||
.history-restore-btn:hover:not(:disabled) { background: var(--accent); color: var(--bg-primary); }
|
||||
.history-restore-btn:disabled { opacity: 0.45; cursor: not-allowed; }
|
||||
.history-restore-btn:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
|
||||
@media (max-width: 600px) {
|
||||
.review-header { padding: 10px 12px; }
|
||||
.review-tabs { width: 100%; }
|
||||
.review-tabs button { flex: 1; min-height: 44px; }
|
||||
.source-toggle, .review-button, .history-restore-btn { min-height: 44px; }
|
||||
.diff-line { grid-template-columns: 2.8em 2.8em 1.4em minmax(0, 1fr); padding-right: 8px; }
|
||||
.review-actions { padding: 10px 12px; padding-bottom: calc(10px + env(safe-area-inset-bottom, 0px)); }
|
||||
.review-actions > span, .history-restore-btn { width: 100%; }
|
||||
}
|
||||
</style>
|
||||
@@ -631,12 +631,15 @@
|
||||
$notes = [entry, ...$notes];
|
||||
onNoteMoved();
|
||||
if (!navigationIsCurrent(token)) return;
|
||||
// The first save must use the exact file created on disk, not wait for a watcher echo.
|
||||
const content = await readNote(ownerVault!, entry.path);
|
||||
if (!navigationIsCurrent(token)) return;
|
||||
if (!(await onBeforeNoteSwitch())) return;
|
||||
if (!navigationIsCurrent(token)) return;
|
||||
$activeNote = { path: entry.path, meta: entry.meta, content: '\n', raw: '' };
|
||||
$activeNote = content;
|
||||
$activeNotePath = entry.path;
|
||||
$editorDirty = false;
|
||||
onNoteSelected(entry.path, '\n');
|
||||
onNoteSelected(entry.path, content.content);
|
||||
onNoteCreated(token);
|
||||
} catch (e) {
|
||||
console.error('Failed to create note:', e);
|
||||
@@ -1206,9 +1209,12 @@
|
||||
clearSelection();
|
||||
}
|
||||
if ((e.ctrlKey || e.metaKey) && e.key === 'a' && $sortedNotes.length > 0) {
|
||||
// Only select all if focus is not in an input/editor
|
||||
const tag = (e.target as HTMLElement)?.tagName;
|
||||
if (tag !== 'INPUT' && tag !== 'TEXTAREA' && !(e.target as HTMLElement)?.closest('.ProseMirror')) {
|
||||
// Only select all notes when Ctrl+A is not meant for a text field or either editor
|
||||
// (the source editor is CodeMirror, and a read-only editor is not contenteditable).
|
||||
const target = e.target as HTMLElement | null;
|
||||
const tag = target?.tagName;
|
||||
if (tag !== 'INPUT' && tag !== 'TEXTAREA' && tag !== 'SELECT' && !target?.isContentEditable
|
||||
&& !target?.closest('.ProseMirror, .cm-editor')) {
|
||||
e.preventDefault();
|
||||
selectedPaths = new Set($sortedNotes.map(n => n.path));
|
||||
}
|
||||
@@ -1466,6 +1472,7 @@
|
||||
class:qa-drag-below={$viewMode === 'quickaccess' && qaDragOver === noteIndex && qaDragFrom !== null && qaDragHalf === 'bottom'}
|
||||
class:note-drag-above={canCustomReorder && noteDragOver === noteIndex && noteDragFrom !== null && noteDragHalf === 'top'}
|
||||
class:note-drag-below={canCustomReorder && noteDragOver === noteIndex && noteDragFrom !== null && noteDragHalf === 'bottom'}
|
||||
title={$viewMode === 'quickaccess' ? note.path : (getNotebookPath(note) ? `${getNotebookPath(note)}/${note.meta.title}` : note.meta.title)}
|
||||
onclick={(e) => handleNoteClick(e, note)}
|
||||
onkeydown={(e) => {
|
||||
if (e.key === 'F2') {
|
||||
@@ -1542,7 +1549,7 @@
|
||||
ondragend={() => { qaDragFrom = null; qaDragOver = null; resetNoteDrag(); }}
|
||||
>
|
||||
{#if compact}
|
||||
<div class="note-compact-row" title={getNotebookPath(note) ? `${getNotebookPath(note)}/${note.meta.title}` : note.meta.title}>
|
||||
<div class="note-compact-row">
|
||||
<span class="note-title">
|
||||
{#if note.meta.pinned}
|
||||
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="pin-icon">
|
||||
@@ -1562,7 +1569,7 @@
|
||||
{#if showDates}<span class="note-date-compact" title={`Created ${formatDate(note.meta.created)}\nModified ${formatDate(note.meta.modified)}`}>{formatRelativeTime($sortMode === 'created' ? note.meta.created : note.meta.modified)}</span>{/if}
|
||||
</div>
|
||||
{:else}
|
||||
<div class="note-title" title={getNotebookPath(note) ? `${getNotebookPath(note)}/${note.meta.title}` : note.meta.title}>
|
||||
<div class="note-title">
|
||||
{#if note.meta.pinned}
|
||||
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="pin-icon">
|
||||
<path d="M12 17v5"/><path d="M9 2h6l-1 7h4l-2 4H8l-2-4h4L9 2z"/>
|
||||
@@ -1577,11 +1584,15 @@
|
||||
</div>
|
||||
<div class="note-preview">{note.preview}</div>
|
||||
<div class="note-meta">
|
||||
{#if getNotebookPath(note)}
|
||||
<span class="note-notebook">{getNotebookPath(note)}</span>
|
||||
{#if showDates}<span class="note-meta-sep">·</span>{/if}
|
||||
{#if getNotebookPath(note) || showDates}
|
||||
<span class="note-context">
|
||||
{#if getNotebookPath(note)}
|
||||
<span class="note-notebook">{getNotebookPath(note)}</span>
|
||||
{#if showDates}<span class="note-meta-sep">·</span>{/if}
|
||||
{/if}
|
||||
{#if showDates}<span class="note-date" title={`Created ${formatDate(note.meta.created)}\nModified ${formatDate(note.meta.modified)}`}>{formatRelativeTime($sortMode === 'created' ? note.meta.created : note.meta.modified)}</span>{/if}
|
||||
</span>
|
||||
{/if}
|
||||
{#if showDates}<span class="note-date" title={`Created ${formatDate(note.meta.created)}\nModified ${formatDate(note.meta.modified)}`}>{formatRelativeTime($sortMode === 'created' ? note.meta.created : note.meta.modified)}</span>{/if}
|
||||
{#if note.meta.tags.length > 0}
|
||||
<span class="note-tags">
|
||||
{#each note.meta.tags.slice(0, 3) as tag, i (tagIterationKey(tag, i))}
|
||||
@@ -2198,9 +2209,18 @@
|
||||
|
||||
.note-meta {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 4px 8px;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.note-context {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin-top: 4px;
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.note-notebook {
|
||||
@@ -2215,6 +2235,7 @@
|
||||
.note-meta-sep {
|
||||
color: var(--text-tertiary);
|
||||
font-size: 0.78em;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.note-compact-row .note-notebook {
|
||||
@@ -2226,10 +2247,15 @@
|
||||
.note-date {
|
||||
font-size: 0.78em;
|
||||
color: var(--text-tertiary);
|
||||
flex-shrink: 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.note-tags {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
<section class="switcher-section" aria-labelledby={`note-switcher-${section.label.replace(' ', '-').toLowerCase()}`}>
|
||||
<h2 id={`note-switcher-${section.label.replace(' ', '-').toLowerCase()}`}>{section.label}</h2>
|
||||
{#each section.rows as row (row.path)}
|
||||
<div class="note-row" class:current-row={row.current}>
|
||||
<div class="note-row" class:current-row={row.current} title={row.path}>
|
||||
{#if row.current}<span class="current-marker" aria-hidden="true"></span>{/if}
|
||||
<button
|
||||
class="note-primary"
|
||||
|
||||
@@ -54,6 +54,86 @@
|
||||
<path d="M3 12h18M12 3a14 14 0 0 1 0 18M12 3a14 14 0 0 0 0 18" />
|
||||
{:else if icon === 'plane'}
|
||||
<path d="M22 2 9.5 14.5M22 2l-7 20-4-8-8-4Z" />
|
||||
{:else if icon === 'music'}
|
||||
<path d="M9 18V5l12-2v13" />
|
||||
<circle cx="6" cy="18" r="3" />
|
||||
<circle cx="18" cy="16" r="3" />
|
||||
{:else if icon === 'camera'}
|
||||
<path d="M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2Z" />
|
||||
<circle cx="12" cy="13" r="4" />
|
||||
{:else if icon === 'film'}
|
||||
<rect x="2" y="2" width="20" height="20" rx="2" />
|
||||
<path d="M7 2v20M17 2v20M2 12h20M2 7h5M2 17h5M17 17h5M17 7h5" />
|
||||
{:else if icon === 'gamepad'}
|
||||
<path d="M6 11h4M8 9v4M15 12h.01M18 10h.01" />
|
||||
<path d="M17.32 5H6.68a4 4 0 0 0-3.978 3.59c-.006.052-.01.101-.017.152C2.604 9.416 2 14.456 2 16a3 3 0 0 0 3 3c1 0 1.5-.5 2-1l1.414-1.414A2 2 0 0 1 9.828 16h4.344a2 2 0 0 1 1.414.586L17 18c.5.5 1 1 2 1a3 3 0 0 0 3-3c0-1.545-.604-6.584-.685-7.258-.007-.05-.011-.1-.017-.151A4 4 0 0 0 17.32 5Z" />
|
||||
{:else if icon === 'cart'}
|
||||
<circle cx="9" cy="21" r="1" />
|
||||
<circle cx="20" cy="21" r="1" />
|
||||
<path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6" />
|
||||
{:else if icon === 'money'}
|
||||
<path d="M12 1v22M17 5H9.5a3.5 3.5 0 0 0 0 7h5a3.5 3.5 0 0 1 0 7H6" />
|
||||
{:else if icon === 'health'}
|
||||
<path d="M22 12h-4l-3 9L9 3l-3 9H2" />
|
||||
{:else if icon === 'food'}
|
||||
<path d="M3 2v7c0 1.1.9 2 2 2h4a2 2 0 0 0 2-2V2M7 2v20M21 15V2a5 5 0 0 0-5 5v6c0 1.1.9 2 2 2h3Zm0 0v7" />
|
||||
{:else if icon === 'coffee'}
|
||||
<path d="M18 8h1a4 4 0 0 1 0 8h-1M2 8h16v9a4 4 0 0 1-4 4H6a4 4 0 0 1-4-4ZM6 1v3M10 1v3M14 1v3" />
|
||||
{:else if icon === 'leaf'}
|
||||
<path d="M11 20A7 7 0 0 1 9.8 6.1C15.5 5 17 4.48 19 2c1 2 2 4.18 2 8 0 5.5-4.78 10-10 10Z" />
|
||||
<path d="M2 21c0-3 1.85-5.36 5.08-6C9.5 14.52 12 13 13 12" />
|
||||
{:else if icon === 'users'}
|
||||
<path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2" />
|
||||
<circle cx="9" cy="7" r="4" />
|
||||
<path d="M23 21v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75" />
|
||||
{:else if icon === 'chat'}
|
||||
<path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2Z" />
|
||||
{:else if icon === 'mail'}
|
||||
<rect x="2" y="4" width="20" height="16" rx="2" />
|
||||
<path d="m22 6-10 7L2 6" />
|
||||
{:else if icon === 'lock'}
|
||||
<rect x="3" y="11" width="18" height="11" rx="2" />
|
||||
<path d="M7 11V7a5 5 0 0 1 10 0v4" />
|
||||
{:else if icon === 'wrench'}
|
||||
<path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76Z" />
|
||||
{:else if icon === 'pen'}
|
||||
<path d="M17 3a2.83 2.83 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z" />
|
||||
{:else if icon === 'tag'}
|
||||
<path d="M12.6 2.6a2 2 0 0 0-1.42-.6H4a2 2 0 0 0-2 2v7.17a2 2 0 0 0 .6 1.42l8.7 8.7a2.43 2.43 0 0 0 3.42 0l6.58-6.58a2.43 2.43 0 0 0 0-3.42Z" />
|
||||
<path d="M7.5 7.5h.01" />
|
||||
{:else if icon === 'clock'}
|
||||
<circle cx="12" cy="12" r="9" />
|
||||
<path d="M12 7v5l3.5 2" />
|
||||
{:else if icon === 'bell'}
|
||||
<path d="M10.27 21a2 2 0 0 0 3.46 0" />
|
||||
<path d="M3.26 15.33A1 1 0 0 0 4 17h16a1 1 0 0 0 .74-1.67C19.41 13.96 18 12.5 18 8a6 6 0 0 0-12 0c0 4.5-1.41 5.96-2.74 7.33Z" />
|
||||
{:else if icon === 'pin'}
|
||||
<path d="M20 10c0 5-5.5 10.2-7.4 11.8a1 1 0 0 1-1.2 0C9.5 20.2 4 15 4 10a8 8 0 0 1 16 0Z" />
|
||||
<circle cx="12" cy="10" r="3" />
|
||||
{:else if icon === 'gift'}
|
||||
<rect x="3" y="8" width="18" height="4" rx="1" />
|
||||
<path d="M12 8v13M19 12v7a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-7" />
|
||||
<path d="M7.5 8a2.5 2.5 0 0 1 0-5C11 3 12 8 12 8s1-5 4.5-5a2.5 2.5 0 0 1 0 5" />
|
||||
{:else if icon === 'trophy'}
|
||||
<path d="M6 9H4.5a2.5 2.5 0 0 1 0-5H6M18 9h1.5a2.5 2.5 0 0 0 0-5H18M4 22h16" />
|
||||
<path d="M10 14.7V17c0 .6-.5 1-1 1.2-1.2.5-2 2-2 3.8M14 14.7V17c0 .6.5 1 1 1.2 1.2.5 2 2 2 3.8M18 2H6v7a6 6 0 0 0 12 0V2Z" />
|
||||
{:else if icon === 'rocket'}
|
||||
<path d="M4.5 16.5c-1.5 1.26-2 5-2 5s3.74-.5 5-2c.71-.84.7-2.13-.09-2.91a2.18 2.18 0 0 0-2.91-.09Z" />
|
||||
<path d="m12 15-3-3a22 22 0 0 1 2-3.95A12.88 12.88 0 0 1 22 2c0 2.72-.78 7.5-6 11a22.35 22.35 0 0 1-4 2Z" />
|
||||
<path d="M9 12H4s.55-3.03 2-4c1.62-1.08 5 0 5 0M12 15v5s3.03-.55 4-2c1.08-1.62 0-5 0-5" />
|
||||
{:else if icon === 'flag'}
|
||||
<path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1Z" />
|
||||
<path d="M4 22V3" />
|
||||
{:else if icon === 'shield'}
|
||||
<path d="M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1Z" />
|
||||
{:else if icon === 'gear'}
|
||||
<circle cx="12" cy="12" r="3" />
|
||||
<path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 1 1-2.83 2.83l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-4 0v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 1 1-2.83-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1 0-4h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 1 1 2.83-2.83l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 1 1 2.83 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1Z" />
|
||||
{:else if icon === 'search'}
|
||||
<circle cx="11" cy="11" r="8" />
|
||||
<path d="m21 21-4.3-4.3" />
|
||||
{:else if icon === 'zap'}
|
||||
<path d="M4 14a1 1 0 0 1-.78-1.63l9.9-10.2a.5.5 0 0 1 .86.46l-1.92 6.02A1 1 0 0 0 13 10h7a1 1 0 0 1 .78 1.63l-9.9 10.2a.5.5 0 0 1-.86-.46l1.92-6.02A1 1 0 0 0 11 14Z" />
|
||||
{:else}
|
||||
<path d="M12 3a9 9 0 1 0 0 18h1.5a1.5 1.5 0 0 0 0-3H12a1.5 1.5 0 0 1 0-3h3a6 6 0 0 0 0-12Z" />
|
||||
<path d="M7.5 10h.01M9.5 6.5h.01M14.5 6.5h.01M17 10h.01" />
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
<script lang="ts">
|
||||
let { onResize }: { onResize: (delta: number) => void } = $props();
|
||||
import { onDestroy } from 'svelte';
|
||||
|
||||
let { onResize, label, value, min, max, controls }: {
|
||||
onResize: (delta: number) => void;
|
||||
label?: string;
|
||||
value?: number;
|
||||
min?: number;
|
||||
max?: number;
|
||||
controls?: string;
|
||||
} = $props();
|
||||
let active = $state(false);
|
||||
let startX = 0;
|
||||
let rafId = 0;
|
||||
@@ -26,15 +35,31 @@
|
||||
}
|
||||
}
|
||||
|
||||
function onMouseUp() {
|
||||
function stopResize(flush: boolean) {
|
||||
if (active) document.body.classList.remove('resizing');
|
||||
active = false;
|
||||
document.body.classList.remove('resizing');
|
||||
if (rafId) { cancelAnimationFrame(rafId); rafId = 0; }
|
||||
if (pendingDelta) { onResize(pendingDelta); pendingDelta = 0; }
|
||||
if (flush && pendingDelta) onResize(pendingDelta);
|
||||
pendingDelta = 0;
|
||||
window.removeEventListener('mousemove', onMouseMove);
|
||||
window.removeEventListener('mouseup', onMouseUp);
|
||||
}
|
||||
|
||||
function onMouseUp() { stopResize(true); }
|
||||
|
||||
function onKeyDown(event: KeyboardEvent) {
|
||||
if (value === undefined || (event.key !== 'ArrowLeft' && event.key !== 'ArrowRight')) return;
|
||||
event.preventDefault();
|
||||
onResize((event.key === 'ArrowLeft' ? -1 : 1) * (event.shiftKey ? 32 : 16));
|
||||
}
|
||||
|
||||
onDestroy(() => stopResize(false));
|
||||
</script>
|
||||
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="resize-handle" class:active onmousedown={onMouseDown}></div>
|
||||
<!-- A separator with a supplied range is an interactive resize control. -->
|
||||
<!-- svelte-ignore a11y_no_noninteractive_tabindex -->
|
||||
<div class="resize-handle" class:active onmousedown={onMouseDown} onkeydown={onKeyDown}
|
||||
role={value === undefined ? 'presentation' : 'separator'} tabindex={value === undefined ? undefined : 0}
|
||||
aria-label={label} aria-orientation={value === undefined ? undefined : 'vertical'}
|
||||
aria-valuenow={value} aria-valuemin={min} aria-valuemax={max} aria-controls={controls}
|
||||
title={value === undefined ? undefined : 'Use Left and Right arrow keys to resize'}></div>
|
||||
@@ -1,11 +1,12 @@
|
||||
<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 { untrack } from 'svelte';
|
||||
import { showSettings, syncState, 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, 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';
|
||||
import { getVersion } from '@tauri-apps/api/app';
|
||||
import { getCurrentWebview } from '@tauri-apps/api/webview';
|
||||
import { applyUiScale, defaultUiScale, uiScalePresets } from '$lib/ui-scale';
|
||||
import { openUrl } from '$lib/api';
|
||||
import type { OrphanAttachment } from '$lib/api';
|
||||
import type { ImportResult, BackupEntry, CustomTheme, CustomThemeColors, StartupView, VaultStats } from '$lib/types';
|
||||
@@ -467,11 +468,15 @@
|
||||
let syncShowPassword = $state(false);
|
||||
let syncTestLoading = $state(false);
|
||||
let syncTestMessage = $state<{ type: 'success' | 'error'; text: string } | null>(null);
|
||||
let syncRunning = $state(false);
|
||||
let syncStarting = $state(false);
|
||||
const syncRunning = $derived(syncStarting || $syncState.running);
|
||||
let syncMessage = $state<{ type: 'success' | 'error'; text: string } | null>(null);
|
||||
let syncOnOpen = $state(activeVaultConfig($appConfig)?.sync_on_open ?? false);
|
||||
let syncOnChange = $state(activeVaultConfig($appConfig)?.sync_on_change ?? false);
|
||||
let syncIntervalMinutes = $state(activeVaultConfig($appConfig)?.sync_interval_minutes ?? 0);
|
||||
// 0 means never chosen, which the sync treats as DEFAULT_LISTING_PARALLELISM (6) in sync.rs.
|
||||
const defaultFolderRequests = 6;
|
||||
let syncFolderRequests = $state(activeVaultConfig($appConfig)?.sync_folder_requests ?? 0);
|
||||
|
||||
// Re-seed the sync form when the active vault changes, so Settings reflects the current vault.
|
||||
let lastSyncVault: string | null = null;
|
||||
@@ -491,10 +496,11 @@
|
||||
syncOnOpen = vc?.sync_on_open ?? false;
|
||||
syncOnChange = vc?.sync_on_change ?? false;
|
||||
syncIntervalMinutes = vc?.sync_interval_minutes ?? 0;
|
||||
syncFolderRequests = vc?.sync_folder_requests ?? 0;
|
||||
});
|
||||
|
||||
async function saveSyncSettings() {
|
||||
await setSyncSettings(syncProvider, syncUrl || null, syncUsername || null, syncPassword || null, syncOnOpen, syncOnChange, syncIntervalMinutes);
|
||||
await setSyncSettings(syncProvider, syncUrl || null, syncUsername || null, syncPassword || null, syncOnOpen, syncOnChange, syncIntervalMinutes, syncFolderRequests);
|
||||
// Reflect into the active vault's config in the store so the top-bar button and auto-sync
|
||||
// triggers update live, without an app restart.
|
||||
if ($appConfig) {
|
||||
@@ -511,6 +517,7 @@
|
||||
sync_on_open: syncOnOpen,
|
||||
sync_on_change: syncOnChange,
|
||||
sync_interval_minutes: syncIntervalMinutes,
|
||||
sync_folder_requests: syncFolderRequests,
|
||||
} : vault),
|
||||
};
|
||||
}
|
||||
@@ -537,47 +544,37 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function handleSyncNow() {
|
||||
// The outcome of the last sync, whether it was started here, from the title bar or automatically.
|
||||
$effect(() => {
|
||||
const state = $syncState;
|
||||
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<{ 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`);
|
||||
if (s.downloaded) parts.push(`${s.downloaded} downloaded`);
|
||||
const deleted = (s.deleted_local ?? 0) + (s.deleted_remote ?? 0);
|
||||
if (deleted) parts.push(`${deleted} deleted`);
|
||||
if (s.conflicts) parts.push(`${s.conflicts} conflict copies`);
|
||||
syncMessage = { type: 'success', text: parts.length ? `Synced: ${parts.join(', ')}.` : 'Already up to date.' };
|
||||
syncRunning = false;
|
||||
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) };
|
||||
untrack(() => {
|
||||
if (state.running) syncMessage = null;
|
||||
else if (state.error) syncMessage = { type: 'error', text: state.error };
|
||||
else if (state.result && state.result.vault === vault) {
|
||||
const s = state.result.summary;
|
||||
const parts: string[] = [];
|
||||
if (s.uploaded) parts.push(`${s.uploaded} uploaded`);
|
||||
if (s.downloaded) parts.push(`${s.downloaded} downloaded`);
|
||||
const deleted = (s.deleted_local ?? 0) + (s.deleted_remote ?? 0);
|
||||
if (deleted) parts.push(`${deleted} deleted`);
|
||||
if (s.conflicts) parts.push(`${s.conflicts} conflict ${s.conflicts === 1 ? 'copy' : 'copies'}`);
|
||||
syncMessage = { type: 'success', text: parts.length ? `Synced: ${parts.join(', ')}.` : 'Already up to date.' };
|
||||
}
|
||||
cleanup();
|
||||
}));
|
||||
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();
|
||||
}));
|
||||
});
|
||||
});
|
||||
|
||||
async function handleSyncNow() {
|
||||
if (!maintenanceVault || syncRunning) return;
|
||||
syncStarting = true;
|
||||
syncMessage = null;
|
||||
try {
|
||||
await saveSyncSettings();
|
||||
await syncNow();
|
||||
} catch (e) {
|
||||
syncMessage = { type: 'error', text: String(e) };
|
||||
syncRunning = false;
|
||||
cleanup();
|
||||
} finally {
|
||||
syncStarting = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -621,6 +618,16 @@
|
||||
{ id: 'cyberpunk', label: 'Cyberpunk', bg: '#0a0e17', sidebar: '#060911', accent: '#ff0080' },
|
||||
{ id: 'black', label: 'Black', bg: '#000000', sidebar: '#0a0a0a', accent: '#ffffff' },
|
||||
{ id: 'one-dark', label: 'One Dark', bg: '#282c34', sidebar: '#21252b', accent: '#61afef' },
|
||||
{ id: 'matrix', label: 'Matrix', bg: '#0a0f0a', sidebar: '#060a06', accent: '#00ff66' },
|
||||
{ id: 'amber-crt', label: 'Amber CRT', bg: '#180f00', sidebar: '#120b00', accent: '#ffb000' },
|
||||
{ id: 'sepia', label: 'Sepia', bg: '#f4ecd8', sidebar: '#ebe0c7', accent: '#9a6a3a' },
|
||||
{ id: 'deep-ocean', label: 'Deep Ocean', bg: '#081821', sidebar: '#05121a', accent: '#35c4d4' },
|
||||
{ id: 'sandstone', label: 'Sandstone', bg: '#faf3e8', sidebar: '#f1e6d3', accent: '#c76b3f' },
|
||||
{ id: 'lavender', label: 'Lavender', bg: '#f6f3fc', sidebar: '#ece6f7', accent: '#7c5cc4' },
|
||||
{ id: 'graphite', label: 'Graphite', bg: '#17181a', sidebar: '#121315', accent: '#7f9cb3' },
|
||||
{ id: 'nebula', label: 'Nebula', bg: '#14102a', sidebar: '#0f0c21', accent: '#b388ff' },
|
||||
{ id: 'wine', label: 'Wine', bg: '#1c0f14', sidebar: '#160b10', accent: '#d98ca0' },
|
||||
{ id: 'jade', label: 'Jade', bg: '#0b1a15', sidebar: '#071410', accent: '#2bbd8e' },
|
||||
];
|
||||
|
||||
// Keep the default themes pinned at the top and sort the rest alphabetically.
|
||||
@@ -667,25 +674,18 @@
|
||||
{ name: 'Open Sans', value: 'opensans', stack: '"Open Sans", -apple-system, sans-serif' },
|
||||
{ name: 'Literata', value: 'literata', stack: '"Literata", Georgia, serif' },
|
||||
{ name: 'Mono', value: 'mono', stack: '"JetBrains Mono", "Fira Code", "Cascadia Code", monospace' },
|
||||
{ name: 'Ubuntu', value: 'ubuntu', stack: '"Ubuntu", -apple-system, sans-serif' },
|
||||
{ name: 'Ubuntu Mono', value: 'ubuntu-mono', stack: '"Ubuntu Mono", monospace' },
|
||||
];
|
||||
|
||||
const lineHeightPresets = [
|
||||
{ label: 'Single', value: 1.0 },
|
||||
{ label: 'Tight', value: 1.4 },
|
||||
{ label: 'Default', value: 1.6 },
|
||||
{ label: 'Relaxed', value: 1.8 },
|
||||
{ label: 'Loose', value: 2.0 },
|
||||
];
|
||||
|
||||
const uiScalePresets = [
|
||||
{ label: '80%', value: 0.8 },
|
||||
{ label: '90%', value: 0.9 },
|
||||
{ label: '100%', value: 1 },
|
||||
{ label: '125%', value: 1.25 },
|
||||
{ label: '150%', value: 1.5 },
|
||||
{ label: '175%', value: 1.75 },
|
||||
{ label: '200%', value: 2 },
|
||||
];
|
||||
|
||||
const contentWidthPresets: { label: string; value: number | null }[] = [
|
||||
{ label: 'Narrow', value: 600 },
|
||||
{ label: 'Medium', value: 760 },
|
||||
@@ -699,7 +699,7 @@
|
||||
let scrollToChangeFontSize = $state($appConfig?.scroll_to_change_font_size ?? true);
|
||||
let activeFontFamily = $state($appConfig?.font_family ?? 'system');
|
||||
let activeLineHeight = $state($appConfig?.line_height ?? 1.6);
|
||||
let activeUiScale = $state($appConfig?.ui_scale ?? 1);
|
||||
let activeUiScale = $state($appConfig?.ui_scale ?? defaultUiScale);
|
||||
let activeContentWidth = $state<number | null>($appConfig?.content_width ?? null);
|
||||
let themeDropdownOpen = $state(false);
|
||||
let accentDropdownOpen = $state(false);
|
||||
@@ -811,7 +811,7 @@
|
||||
root.classList.remove('dark');
|
||||
root.removeAttribute('data-theme');
|
||||
for (const v of varsToClear) root.style.removeProperty(v);
|
||||
const namedThemes = ['solarized-light','solarized-dark','catppuccin','nord','tokyo-night','github-light','github-dark','dracula','blueberry','forest-green','gruvbox','midnight-tide','cherry-blossom','synthwave','ember','moonlit','light-coffee','dark-coffee','cotton-candy','crimson','cloud','peach','material-dark','material-light','monokai','rose-pine','everforest','horizon','cyberpunk','black','one-dark'];
|
||||
const namedThemes = ['solarized-light','solarized-dark','catppuccin','nord','tokyo-night','github-light','github-dark','dracula','blueberry','forest-green','gruvbox','midnight-tide','cherry-blossom','synthwave','ember','moonlit','light-coffee','dark-coffee','cotton-candy','crimson','cloud','peach','material-dark','material-light','monokai','rose-pine','everforest','horizon','cyberpunk','black','one-dark','matrix','amber-crt','sepia','deep-ocean','sandstone','lavender','graphite','nebula','wine','jade'];
|
||||
if ($resolvedTheme.startsWith('custom-')) {
|
||||
const ct = $customThemes.find(c => c.id === $resolvedTheme);
|
||||
if (ct) {
|
||||
@@ -1097,8 +1097,11 @@
|
||||
function selectFontSize(size: number) {
|
||||
activeFontSize = size;
|
||||
applyFontSize(size);
|
||||
if ($appConfig) $appConfig.font_size = size;
|
||||
setFontSize(size).catch((e) => console.error('Failed to save font size:', e));
|
||||
if ($appConfig) {
|
||||
$appConfig.font_size = size;
|
||||
$appConfig.preferred_font_size = size;
|
||||
}
|
||||
setFontSize(size, true).catch((e) => console.error('Failed to save font size:', e));
|
||||
}
|
||||
|
||||
function toggleScrollToChangeFontSize() {
|
||||
@@ -1141,14 +1144,6 @@
|
||||
setUiScale(value).catch((e) => console.error('Failed to save interface scale:', e));
|
||||
}
|
||||
|
||||
async function applyUiScale(value: number) {
|
||||
try {
|
||||
await getCurrentWebview().setZoom(value);
|
||||
} catch (e) {
|
||||
console.error('Failed to apply interface scale:', e);
|
||||
}
|
||||
}
|
||||
|
||||
function selectContentWidth(value: number | null) {
|
||||
activeContentWidth = value;
|
||||
applyContentWidth(value);
|
||||
@@ -1494,9 +1489,11 @@
|
||||
<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={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"/>
|
||||
<rect x="3" y="3" width="18" height="16" rx="2"/>
|
||||
<circle cx="12" cy="11" r="3.5"/>
|
||||
<path d="M12 7.5V6M12 16v-1.5M7 19v2M17 19v2"/>
|
||||
</svg>
|
||||
Switch Vault
|
||||
Manage Vaults
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
@@ -2055,7 +2052,7 @@
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
{#if !isMobile}
|
||||
{#if !isMobile || isAndroid}
|
||||
<div class="settings-section">
|
||||
<h3>Interface Scale</h3>
|
||||
<div class="font-size-options">
|
||||
@@ -2069,7 +2066,7 @@
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
<p class="setting-hint">Zooms the whole app: every panel, menu, and the editor. Use Default (100%) to reset.</p>
|
||||
<p class="setting-hint">Zooms the whole app: every panel, menu, and the editor. Use Default ({Math.round(defaultUiScale * 100)}%) to reset.</p>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
@@ -2092,7 +2089,7 @@
|
||||
{/if}
|
||||
|
||||
<div class="settings-section">
|
||||
<h3>Line Height</h3>
|
||||
<h3>Line Spacing</h3>
|
||||
<div class="font-size-options">
|
||||
{#each lineHeightPresets as preset}
|
||||
<button
|
||||
@@ -2105,6 +2102,7 @@
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
<p class="setting-hint">Sets the spacing in the editor. Text copied to Word or email is pasted with single spacing.</p>
|
||||
</div>
|
||||
|
||||
<div class="settings-section">
|
||||
@@ -2221,6 +2219,9 @@
|
||||
<div class="backup-info">
|
||||
<span class="backup-date">{formatBackupDate(entry.created)}</span>
|
||||
<span class="backup-size">{formatBackupSize(entry.size)}</span>
|
||||
{#if entry.other_vault}
|
||||
<span class="backup-size" title="This backup was made from a different vault folder">other vault</span>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="backup-item-actions">
|
||||
<button class="backup-action-btn" title="Restore" onclick={() => restoreConfirm = entry}>
|
||||
@@ -2248,6 +2249,9 @@
|
||||
<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>
|
||||
{#if restoreConfirm.other_vault}
|
||||
<p><strong>This backup was made from a different vault folder.</strong> Restoring it replaces this vault's notes with that vault's. Continue only if this vault was moved or renamed since then.</p>
|
||||
{/if}
|
||||
<div class="restore-confirm-actions">
|
||||
<button class="restore-cancel" onclick={() => restoreConfirm = null}>Cancel</button>
|
||||
<button class="restore-confirm-btn" onclick={() => handleRestore(restoreConfirm!)}>Restore</button>
|
||||
@@ -2608,6 +2612,15 @@
|
||||
<button class="toggle-switch" class:on={syncOnOpen} role="switch" aria-checked={syncOnOpen} aria-label="Sync when the vault opens" onclick={() => { syncOnOpen = !syncOnOpen; saveSyncSettings(); }}><span class="toggle-knob"></span></button>
|
||||
</label>
|
||||
</div>
|
||||
<div class="settings-section">
|
||||
<h3>Folder Request Parallelism</h3>
|
||||
<div class="setting-options">
|
||||
{#each [...new Set([1, 3, 6, 12, syncFolderRequests || defaultFolderRequests])].sort((a, b) => a - b) as opt}
|
||||
<button class="option-btn" class:active={(syncFolderRequests || defaultFolderRequests) === opt} onclick={() => { syncFolderRequests = opt; saveSyncSettings(); }}>{opt}</button>
|
||||
{/each}
|
||||
</div>
|
||||
<p class="setting-hint">How many folders are listed on the server at once. 6 suits most servers; choose 1 if yours rejects concurrent requests.</p>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -2691,7 +2704,7 @@
|
||||
<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="M18 13v6a2 2 0 01-2 2H5a2 2 0 01-2-2V8a2 2 0 012-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/>
|
||||
</svg>
|
||||
Download from Codeberg
|
||||
Download
|
||||
</a>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -3857,7 +3870,13 @@
|
||||
transform: translateX(18px);
|
||||
}
|
||||
|
||||
.settings-panel.mobile .setting-options {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(min(120px, 100%), 1fr));
|
||||
}
|
||||
|
||||
.settings-panel.mobile .option-btn {
|
||||
min-width: 0;
|
||||
padding: 12px 10px;
|
||||
font-size: 14px;
|
||||
}
|
||||
@@ -3867,7 +3886,10 @@
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.settings-panel.mobile .font-family-options,
|
||||
.settings-panel.mobile .font-size-options {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(85px, 1fr));
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
@@ -3875,6 +3897,12 @@
|
||||
padding: 12px 6px;
|
||||
}
|
||||
|
||||
@media (max-width: 480px) {
|
||||
.settings-panel.mobile .two-col-sections {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
}
|
||||
}
|
||||
|
||||
/* ── Custom Themes ── */
|
||||
.section-header-row {
|
||||
display: flex;
|
||||
|
||||
@@ -38,11 +38,14 @@
|
||||
import TagStylePicker from './TagStylePicker.svelte';
|
||||
import {
|
||||
NOTEBOOK_ICON_OPTIONS,
|
||||
decodeBuiltinNotebookIcon,
|
||||
COMMON_NOTEBOOK_ICON_COUNT,
|
||||
isCommonNotebookIcon,
|
||||
decodeNotebookIcon,
|
||||
encodeBuiltinNotebookIcon,
|
||||
normalizeNotebookIconKey,
|
||||
type NotebookIconId
|
||||
} from '$lib/utils/notebook-icons';
|
||||
import { TAG_COLOR_PRESETS } from '$lib/utils/tag-styles';
|
||||
|
||||
let { onViewChanged = () => {}, onBeforeNoteChange = async () => true, onBeforePathMutation = async () => null, onPathsMoved = async (_old: string, _next: string) => {} }: {
|
||||
onViewChanged?: () => void;
|
||||
@@ -134,6 +137,13 @@
|
||||
let contextMenu = $state<{ x: number; y: number; notebook: NotebookEntry } | null>(null);
|
||||
let iconPickerNotebook = $state<NotebookEntry | null>(null);
|
||||
let iconPickerElement = $state<HTMLDivElement | null>(null);
|
||||
let iconPickerColor = $state<string | null>(null);
|
||||
let iconPickerShowAll = $state<boolean | null>(null);
|
||||
const iconPickerActive = $derived(iconPickerNotebook
|
||||
? decodeNotebookIcon($notebookIcons[normalizeNotebookIconKey(iconPickerNotebook.relative_path)])?.icon ?? null
|
||||
: null);
|
||||
// Starts open when the current icon is one of the extra icons.
|
||||
const iconPickerExpanded = $derived(iconPickerShowAll ?? !isCommonNotebookIcon(iconPickerActive));
|
||||
let trashContextMenu = $state<{ x: number; y: number } | null>(null);
|
||||
let tagsCollapsed = $state(true);
|
||||
let tagContextMenu = $state<{ x: number; y: number; tag: string } | null>(null);
|
||||
@@ -633,6 +643,8 @@
|
||||
|
||||
async function openIconPicker(nb: NotebookEntry) {
|
||||
contextMenu = null;
|
||||
iconPickerColor = decodeNotebookIcon(get(notebookIcons)[normalizeNotebookIconKey(nb.relative_path)])?.color ?? null;
|
||||
iconPickerShowAll = null;
|
||||
iconPickerNotebook = nb;
|
||||
await tick();
|
||||
if (!ownerIsCurrent()) return;
|
||||
@@ -647,22 +659,30 @@
|
||||
notebookIcons.set(icons);
|
||||
}
|
||||
|
||||
async function handleBuiltinIcon(nb: NotebookEntry, icon: NotebookIconId) {
|
||||
async function handleBuiltinIcon(nb: NotebookEntry, icon: NotebookIconId | null, close = true) {
|
||||
if (!ownerVault || !ownerIsCurrent()) return;
|
||||
const key = normalizeNotebookIconKey(nb.relative_path);
|
||||
const latest = notebookAppearance.choose(ownerVault, key);
|
||||
const value = encodeBuiltinNotebookIcon(icon);
|
||||
const value = icon || iconPickerColor ? encodeBuiltinNotebookIcon(icon, iconPickerColor) : null;
|
||||
iconError = '';
|
||||
try {
|
||||
await notebookAppearance.run(ownerVault, key, latest,
|
||||
() => setNotebookIcon(ownerVault, key, value),
|
||||
() => publishNotebookIcon(key, value));
|
||||
if (ownerIsCurrent() && latest()) iconPickerNotebook = null;
|
||||
if (close && ownerIsCurrent() && latest()) iconPickerNotebook = null;
|
||||
} catch (e) {
|
||||
if (ownerIsCurrent() && latest()) iconError = String(e);
|
||||
}
|
||||
}
|
||||
|
||||
// A custom image has no color; the choice is kept for the next built-in icon.
|
||||
function handleIconColor(nb: NotebookEntry, color: string | null) {
|
||||
iconPickerColor = color;
|
||||
const stored = get(notebookIcons)[normalizeNotebookIconKey(nb.relative_path)];
|
||||
const current = decodeNotebookIcon(stored);
|
||||
if (current || !stored) void handleBuiltinIcon(nb, current?.icon ?? null, false);
|
||||
}
|
||||
|
||||
async function handleCustomIcon(nb: NotebookEntry) {
|
||||
if (!ownerVault || !ownerIsCurrent()) return;
|
||||
const key = normalizeNotebookIconKey(nb.relative_path);
|
||||
@@ -1066,10 +1086,11 @@
|
||||
</button>
|
||||
</header>
|
||||
<div class="icon-picker-grid">
|
||||
{#each NOTEBOOK_ICON_OPTIONS as option}
|
||||
{#each iconPickerExpanded ? NOTEBOOK_ICON_OPTIONS : NOTEBOOK_ICON_OPTIONS.slice(0, COMMON_NOTEBOOK_ICON_COUNT) as option (option.id)}
|
||||
<button
|
||||
class="icon-picker-option"
|
||||
class:active={$notebookIcons[normalizeNotebookIconKey(iconPickerNotebook.relative_path)] === encodeBuiltinNotebookIcon(option.id)}
|
||||
class:active={iconPickerActive === option.id}
|
||||
style:color={iconPickerColor}
|
||||
aria-label={option.label}
|
||||
title={option.label}
|
||||
onclick={() => handleBuiltinIcon(iconPickerNotebook!, option.id)}
|
||||
@@ -1078,6 +1099,39 @@
|
||||
<span>{option.label}</span>
|
||||
</button>
|
||||
{/each}
|
||||
<button class="icon-picker-more" aria-expanded={iconPickerExpanded} onclick={() => iconPickerShowAll = !iconPickerExpanded}>
|
||||
{iconPickerExpanded ? 'Fewer icons' : 'More icons'}
|
||||
</button>
|
||||
</div>
|
||||
<div class="icon-color-section">
|
||||
<span class="icon-color-label">Color</span>
|
||||
<div class="icon-swatches">
|
||||
<button
|
||||
class="icon-swatch none"
|
||||
class:active={!iconPickerColor}
|
||||
aria-label="Use default color"
|
||||
title="Default color"
|
||||
onclick={() => handleIconColor(iconPickerNotebook!, null)}
|
||||
></button>
|
||||
{#each TAG_COLOR_PRESETS as preset (preset)}
|
||||
<button
|
||||
class="icon-swatch"
|
||||
class:active={iconPickerColor === preset}
|
||||
style:background={preset}
|
||||
aria-label={`Use ${preset}`}
|
||||
title={preset}
|
||||
onclick={() => handleIconColor(iconPickerNotebook!, preset)}
|
||||
></button>
|
||||
{/each}
|
||||
<label class="icon-swatch custom" title="Custom color">
|
||||
<input
|
||||
type="color"
|
||||
value={iconPickerColor?.length === 7 ? iconPickerColor : '#5b6abf'}
|
||||
oninput={(e) => handleIconColor(iconPickerNotebook!, e.currentTarget.value)}
|
||||
aria-label="Custom icon color"
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="icon-picker-actions">
|
||||
<button onclick={() => handleCustomIcon(iconPickerNotebook!)}>
|
||||
@@ -1090,7 +1144,7 @@
|
||||
Use default
|
||||
</button>
|
||||
{/if}
|
||||
<p class="icon-picker-recommendation">Recommended size: <strong>1:1 aspect ratio</strong></p>
|
||||
<p class="icon-picker-recommendation">Colors do not apply to custom images. Recommended image size: <strong>1:1 aspect ratio</strong></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1172,7 +1226,7 @@
|
||||
{@const hasChildren = nb.children.length > 0}
|
||||
{@const isCollapsed = $collapsedNotebooks.includes(nb.path)}
|
||||
{@const iconSrc = getNotebookIconSrc(nb)}
|
||||
{@const builtinIcon = decodeBuiltinNotebookIcon($notebookIcons[normalizeNotebookIconKey(nb.relative_path)])}
|
||||
{@const builtinIcon = decodeNotebookIcon($notebookIcons[normalizeNotebookIconKey(nb.relative_path)])}
|
||||
{#if editingNotebook === nb.path}
|
||||
<div class="notebook-item" style="padding-left: {4 + depth * 16}px">
|
||||
<input
|
||||
@@ -1263,18 +1317,18 @@
|
||||
{:else}
|
||||
<span class="chevron-spacer"></span>
|
||||
{/if}
|
||||
<span class="notebook-icon-slot" class:notebook-builtin-icon={!!builtinIcon}>
|
||||
{#if builtinIcon}
|
||||
<NotebookGlyph icon={builtinIcon} size={18} />
|
||||
<span class="notebook-icon-slot" class:notebook-builtin-icon={!!builtinIcon?.icon} style:color={builtinIcon?.color}>
|
||||
{#if builtinIcon?.icon}
|
||||
<NotebookGlyph icon={builtinIcon.icon} size={18} />
|
||||
{:else if iconSrc}
|
||||
<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">
|
||||
<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" style:opacity={builtinIcon?.color ? 1 : 0.6}>
|
||||
<path d="M2 6h4"/><path d="M2 10h4"/><path d="M2 14h4"/><path d="M2 18h4"/>
|
||||
<path d="M6 2h12a2 2 0 012 2v16a2 2 0 01-2 2H6a2 2 0 01-2-2V4a2 2 0 012-2z"/>
|
||||
</svg>
|
||||
{:else}
|
||||
<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">
|
||||
<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" style:opacity={builtinIcon?.color ? 1 : 0.6}>
|
||||
<path d="M2 6h4"/><path d="M2 10h4"/><path d="M2 14h4"/><path d="M2 18h4"/>
|
||||
<path d="M6 2h12a2 2 0 012 2v16a2 2 0 01-2 2H6a2 2 0 01-2-2V4a2 2 0 012-2z"/>
|
||||
<path d="M10 9h8"/><path d="M10 13h8"/><path d="M10 17h5"/>
|
||||
@@ -1928,6 +1982,81 @@
|
||||
color: var(--accent);
|
||||
}
|
||||
|
||||
.icon-picker-more {
|
||||
grid-column: 1 / -1;
|
||||
padding: 7px;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
background: transparent;
|
||||
color: var(--text-tertiary);
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.icon-picker-more:hover {
|
||||
background: var(--bg-hover);
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
.icon-color-section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
padding: 0 14px 12px;
|
||||
}
|
||||
|
||||
.icon-color-label {
|
||||
color: var(--text-secondary);
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.icon-swatches {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 7px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.icon-swatch {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
padding: 0;
|
||||
border: 2px solid transparent;
|
||||
border-radius: 50%;
|
||||
background: var(--bg-tertiary);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.icon-swatch:hover,
|
||||
.icon-swatch.active {
|
||||
border-color: var(--text-primary);
|
||||
}
|
||||
|
||||
.icon-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);
|
||||
}
|
||||
|
||||
.icon-swatch.custom {
|
||||
display: grid;
|
||||
place-items: center;
|
||||
overflow: hidden;
|
||||
background: conic-gradient(from 90deg, #e11d48, #eab308, #22c55e, #3b82f6, #8b5cf6, #e11d48);
|
||||
}
|
||||
|
||||
.icon-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;
|
||||
@@ -1987,6 +2116,11 @@
|
||||
min-height: 64px;
|
||||
}
|
||||
|
||||
.icon-picker-overlay.mobile .icon-picker-more {
|
||||
min-height: 44px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.icon-picker-overlay.mobile .icon-picker-actions button {
|
||||
min-height: 44px;
|
||||
font-size: 14px;
|
||||
|
||||
@@ -0,0 +1,446 @@
|
||||
<script lang="ts" module>
|
||||
let diagramId = 0;
|
||||
// Mermaid has a shared configuration; serialize snapshot renders and restore it afterward.
|
||||
let diagramQueue = Promise.resolve();
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
import createDOMPurify from 'dompurify';
|
||||
import katex from 'katex';
|
||||
import 'katex/dist/katex.min.css';
|
||||
import { calloutGroup, calloutIcon, calloutLabel } from '$lib/editor/callouts';
|
||||
import { readSecretTitle } from '$lib/utils/secrets';
|
||||
|
||||
let { html, label = 'Snapshot preview' }: { html: string; label?: string } = $props();
|
||||
let root = $state<HTMLElement>();
|
||||
let purifier: ReturnType<typeof createDOMPurify>;
|
||||
|
||||
const documentTags = [
|
||||
'a', 'abbr', 'b', 'blockquote', 'br', 'caption', 'code', 'col', 'colgroup',
|
||||
'dd', 'del', 'details', 'div', 'dl', 'dt', 'em', 'figcaption', 'figure',
|
||||
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'kbd', 'li',
|
||||
'mark', 'ol', 'p', 'pre', 'q', 'rp', 'rt', 'ruby', 's', 'samp', 'small',
|
||||
'span', 'strong', 'sub', 'summary', 'sup', 'table', 'tbody', 'td', 'tfoot',
|
||||
'th', 'thead', 'tr', 'u', 'ul', 'var', 'wbr',
|
||||
];
|
||||
const documentAttributes = [
|
||||
'alt', 'class', 'colspan', 'dir', 'height', 'href', 'lang', 'open', 'reversed',
|
||||
'rowspan', 'scope', 'span', 'src', 'start', 'style', 'title', 'value', 'width',
|
||||
'data-type', 'data-checked', 'data-size', 'data-language', 'data-secret-block',
|
||||
'data-math-inline', 'data-math-block', 'data-callout', 'data-callout-title',
|
||||
'data-callout-foldable', 'data-callout-folded',
|
||||
'data-wiki-link', 'data-path', 'data-title', 'data-aliased', 'data-bg-color',
|
||||
'data-pdf-src', 'data-pdf-name', 'data-page-break',
|
||||
];
|
||||
// Custom asset protocols are accepted only here, then checked specifically on images.
|
||||
const documentUris = /^(?:https?:|mailto:|tel:|asset:|imgproxy:|blob:|data:image\/(?:png|jpeg|gif|webp|avif|bmp);|#)/i;
|
||||
const formattingProperties = [
|
||||
'color', 'background-color', 'font-weight', 'font-style', 'font-size',
|
||||
'text-align', 'text-decoration-line', 'text-decoration-color', 'vertical-align',
|
||||
];
|
||||
|
||||
function message(text: string): HTMLParagraphElement {
|
||||
const node = document.createElement('p');
|
||||
node.className = 'snapshot-message';
|
||||
node.textContent = text;
|
||||
return node;
|
||||
}
|
||||
|
||||
function imageSourceAllowed(source: string): boolean {
|
||||
if (/[\u0000-\u0020\u007f]/.test(source)) return false;
|
||||
if (/^(?:asset|imgproxy):\/\//i.test(source)) return true;
|
||||
if (/^data:image\/(?:png|jpeg|gif|webp|avif|bmp);base64,[a-z\d+/=]+$/i.test(source)) return true;
|
||||
try {
|
||||
const url = new URL(source);
|
||||
if (url.protocol === 'blob:') return new URL(url.pathname).origin === window.location.origin;
|
||||
return ['http:', 'https:'].includes(url.protocol)
|
||||
&& ['asset.localhost', 'imgproxy.localhost'].includes(url.hostname)
|
||||
&& !url.username && !url.password && !url.port;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function keepFormatting(element: HTMLElement): void {
|
||||
const style = element.style;
|
||||
const values = formattingProperties.map((property) => [property, style.getPropertyValue(property)]);
|
||||
element.removeAttribute('style');
|
||||
for (const [property, value] of values) {
|
||||
// Only presentation properties; no URL-bearing CSS, variables, escapes or overlays.
|
||||
if (value && !/url\s*\(|var\s*\(|expression\s*\(|[\\@]/i.test(value)) {
|
||||
element.style.setProperty(property, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function prepareDocument(fragment: DocumentFragment): void {
|
||||
for (const element of fragment.querySelectorAll<HTMLElement>('*')) {
|
||||
keepFormatting(element);
|
||||
const language = element.tagName === 'CODE'
|
||||
? Array.from(element.classList).find((name) => /^language-[\w+-]+$/.test(name))
|
||||
: undefined;
|
||||
element.removeAttribute('class');
|
||||
if (language) element.className = language;
|
||||
if (element.hasAttribute('data-wiki-link')) {
|
||||
element.className = 'snapshot-wiki-link';
|
||||
element.title = `Wiki link to ${element.getAttribute('data-title') || element.textContent || ''} (inactive in snapshot preview)`;
|
||||
element.setAttribute('aria-disabled', 'true');
|
||||
}
|
||||
if (element.hasAttribute('data-page-break')) element.className = 'snapshot-page-break';
|
||||
// Snapshot links are readable but inert: inspection cannot navigate the live note.
|
||||
if (element.tagName === 'A') {
|
||||
const href = element.getAttribute('href');
|
||||
if (href) element.title = `${element.title ? element.title + ' — ' : ''}${href} (inactive in snapshot preview)`;
|
||||
element.removeAttribute('href');
|
||||
element.setAttribute('aria-disabled', 'true');
|
||||
}
|
||||
}
|
||||
for (const attachment of fragment.querySelectorAll<HTMLElement>('[data-pdf-src]')) {
|
||||
const name = attachment.getAttribute('data-pdf-name') || 'PDF attachment';
|
||||
const source = attachment.getAttribute('data-pdf-src') || '';
|
||||
attachment.prepend(message(`${name} — PDF attachment (inline PDF rendering is unavailable in snapshot previews). ${source}`));
|
||||
}
|
||||
for (const image of fragment.querySelectorAll<HTMLImageElement>('img')) {
|
||||
const source = image.getAttribute('src') || '';
|
||||
if (!imageSourceAllowed(source)) {
|
||||
image.replaceWith(message(`Image unavailable or blocked${image.alt ? ': ' + image.alt : '.'}`));
|
||||
continue;
|
||||
}
|
||||
image.crossOrigin = 'anonymous';
|
||||
image.loading = 'lazy';
|
||||
image.decoding = 'async';
|
||||
image.addEventListener('error', () => {
|
||||
image.replaceWith(message(`Image could not be loaded: ${image.alt || source}`));
|
||||
}, { once: true });
|
||||
}
|
||||
for (const item of fragment.querySelectorAll<HTMLElement>('li[data-type="taskItem"]')) {
|
||||
const body = document.createElement('div');
|
||||
while (item.firstChild) body.append(item.firstChild);
|
||||
const checkbox = document.createElement('input');
|
||||
checkbox.type = 'checkbox';
|
||||
checkbox.checked = item.getAttribute('data-checked') === 'true';
|
||||
checkbox.disabled = true;
|
||||
checkbox.setAttribute('aria-label', checkbox.checked ? 'Completed task' : 'Incomplete task');
|
||||
item.className = 'snapshot-task';
|
||||
item.append(checkbox, body);
|
||||
}
|
||||
for (const table of fragment.querySelectorAll('table')) {
|
||||
const scroll = document.createElement('div');
|
||||
scroll.className = 'snapshot-table';
|
||||
scroll.tabIndex = 0;
|
||||
scroll.setAttribute('role', 'region');
|
||||
scroll.setAttribute('aria-label', 'Snapshot table');
|
||||
table.replaceWith(scroll);
|
||||
scroll.append(table);
|
||||
}
|
||||
}
|
||||
|
||||
function renderSecrets(fragment: DocumentFragment): void {
|
||||
for (const node of fragment.querySelectorAll<HTMLElement>('[data-secret-block]')) {
|
||||
const stored = node.getAttribute('data-secret-block') || '';
|
||||
node.replaceChildren();
|
||||
node.className = 'snapshot-secret';
|
||||
const title = document.createElement('strong');
|
||||
let payload = stored;
|
||||
let error = '';
|
||||
try {
|
||||
payload = decodeURIComponent(stored);
|
||||
JSON.parse(payload);
|
||||
} catch {
|
||||
error = 'The stored secret payload is malformed; it cannot be previewed.';
|
||||
}
|
||||
title.textContent = readSecretTitle(payload);
|
||||
node.append(title, message('Locked encrypted content. Secrets are not unlocked in history previews.'));
|
||||
if (error) {
|
||||
const details = document.createElement('details');
|
||||
const summary = document.createElement('summary');
|
||||
summary.textContent = 'Stored secret payload';
|
||||
const code = document.createElement('pre');
|
||||
code.textContent = payload;
|
||||
details.append(summary, code);
|
||||
node.append(message(error), details);
|
||||
}
|
||||
// Do not retain ciphertext in the rendered DOM unless needed for a readable error.
|
||||
node.removeAttribute('data-secret-block');
|
||||
}
|
||||
}
|
||||
|
||||
function renderCallouts(fragment: DocumentFragment): void {
|
||||
// Innermost first so nested callout bodies keep their independently rendered headers.
|
||||
for (const node of Array.from(fragment.querySelectorAll<HTMLElement>('[data-callout]')).reverse()) {
|
||||
const type = node.getAttribute('data-callout') || 'note';
|
||||
const title = node.getAttribute('data-callout-title') || calloutLabel(type);
|
||||
const foldable = node.getAttribute('data-callout-foldable') === 'true';
|
||||
const wrapper = document.createElement(foldable ? 'details' : 'div');
|
||||
wrapper.className = 'snapshot-callout';
|
||||
const group = calloutGroup(type);
|
||||
wrapper.style.setProperty('--snapshot-callout-color', `var(--callout-${typeof group === 'string' ? group : 'custom'})`);
|
||||
if (wrapper instanceof HTMLDetailsElement) wrapper.open = node.getAttribute('data-callout-folded') !== 'true';
|
||||
const header = document.createElement(foldable ? 'summary' : 'div');
|
||||
header.className = 'snapshot-callout-header';
|
||||
const icon = document.createElement('span');
|
||||
icon.setAttribute('aria-hidden', 'true');
|
||||
icon.append(purifier.sanitize(calloutIcon(type), { USE_PROFILES: { svg: true }, RETURN_DOM_FRAGMENT: true }));
|
||||
const heading = document.createElement('strong');
|
||||
heading.textContent = title;
|
||||
header.append(icon, heading);
|
||||
if (title !== calloutLabel(type)) {
|
||||
const kind = document.createElement('small');
|
||||
kind.textContent = calloutLabel(type);
|
||||
header.append(kind);
|
||||
}
|
||||
const body = document.createElement('div');
|
||||
body.className = 'snapshot-callout-body';
|
||||
while (node.firstChild) body.append(node.firstChild);
|
||||
wrapper.append(header, body);
|
||||
node.replaceWith(wrapper);
|
||||
}
|
||||
}
|
||||
|
||||
function renderMath(fragment: DocumentFragment): void {
|
||||
for (const node of fragment.querySelectorAll<HTMLElement>('[data-math-inline], [data-math-block]')) {
|
||||
const block = node.hasAttribute('data-math-block');
|
||||
const stored = node.getAttribute(block ? 'data-math-block' : 'data-math-inline') || '';
|
||||
let tex = stored;
|
||||
node.className = block ? 'snapshot-math-block' : 'snapshot-math-inline';
|
||||
try {
|
||||
tex = decodeURIComponent(stored);
|
||||
const rendered = katex.renderToString(tex, { displayMode: block, trust: false, throwOnError: true });
|
||||
node.replaceChildren(purifier.sanitize(rendered, {
|
||||
USE_PROFILES: { html: true, mathMl: true, svg: true },
|
||||
FORBID_TAGS: ['style', 'a', 'img', 'image', 'foreignobject'],
|
||||
FORBID_ATTR: ['href', 'xlink:href', 'src'],
|
||||
RETURN_DOM_FRAGMENT: true,
|
||||
}));
|
||||
} catch (error) {
|
||||
const code = document.createElement('code');
|
||||
code.textContent = tex;
|
||||
const status = document.createElement('span');
|
||||
status.className = 'snapshot-message';
|
||||
status.textContent = ` Math could not be rendered: ${error instanceof Error ? error.message : String(error)}`;
|
||||
node.replaceChildren(code, status);
|
||||
}
|
||||
node.removeAttribute('data-math-inline');
|
||||
node.removeAttribute('data-math-block');
|
||||
}
|
||||
}
|
||||
|
||||
function prepareDiagrams(fragment: DocumentFragment, isCurrent: () => boolean): void {
|
||||
for (const code of fragment.querySelectorAll<HTMLElement>('pre > code.language-mermaid, pre[data-language="mermaid"] > code')) {
|
||||
const source = code.textContent || '';
|
||||
const controls = document.createElement('div');
|
||||
controls.className = 'snapshot-diagram';
|
||||
const button = document.createElement('button');
|
||||
button.type = 'button';
|
||||
button.textContent = '▶ Render diagram';
|
||||
const status = document.createElement('span');
|
||||
status.className = 'snapshot-message';
|
||||
status.setAttribute('role', 'status');
|
||||
const output = document.createElement('div');
|
||||
output.className = 'snapshot-diagram-output';
|
||||
controls.append(button, status, output);
|
||||
code.parentElement!.after(controls);
|
||||
button.addEventListener('click', async () => {
|
||||
button.disabled = true;
|
||||
status.textContent = 'Rendering diagram…';
|
||||
let staging: HTMLDivElement | undefined;
|
||||
let restoreConfig: (() => void) | undefined;
|
||||
let release!: () => void;
|
||||
const previousRender = diagramQueue;
|
||||
diagramQueue = new Promise<void>((resolve) => { release = resolve; });
|
||||
await previousRender;
|
||||
try {
|
||||
const { default: mermaid } = await import('mermaid');
|
||||
if (!isCurrent() || !controls.isConnected) return;
|
||||
const previousConfig = mermaid.mermaidAPI.getConfig();
|
||||
restoreConfig = () => mermaid.initialize(previousConfig);
|
||||
mermaid.initialize({
|
||||
startOnLoad: false,
|
||||
securityLevel: 'strict',
|
||||
suppressErrorRendering: true,
|
||||
theme: document.documentElement.classList.contains('dark') ? 'dark' : 'default',
|
||||
fontFamily: 'inherit',
|
||||
htmlLabels: false,
|
||||
flowchart: { htmlLabels: false },
|
||||
secure: [
|
||||
...(mermaid.mermaidAPI.defaultConfig.secure || []),
|
||||
'htmlLabels', 'flowchart', 'themeCSS', 'themeVariables', 'fontFamily', 'altFontFamily', 'dompurifyConfig',
|
||||
],
|
||||
});
|
||||
const parsed = await mermaid.mermaidAPI.getDiagramFromText(source);
|
||||
// Strict Mermaid still fetches image-shape URLs during layout, before SVG sanitization.
|
||||
// Inspect its parsed layout data rather than trying to rewrite the fence's source.
|
||||
if ('getData' in parsed.db && typeof parsed.db.getData === 'function') {
|
||||
const data: unknown = parsed.db.getData();
|
||||
if (data && typeof data === 'object' && 'nodes' in data && Array.isArray(data.nodes)
|
||||
&& data.nodes.some((node: unknown) => node && typeof node === 'object' && 'img' in node && node.img)) {
|
||||
throw new Error('Embedded Mermaid images are not loaded in snapshot previews.');
|
||||
}
|
||||
}
|
||||
if (!isCurrent() || !controls.isConnected) return;
|
||||
staging = document.createElement('div');
|
||||
staging.className = 'snapshot-diagram-staging';
|
||||
staging.setAttribute('aria-hidden', 'true');
|
||||
staging.inert = true;
|
||||
controls.append(staging);
|
||||
const { svg } = await mermaid.render(`snapshot-diagram-${++diagramId}`, source, staging);
|
||||
if (!isCurrent() || !controls.isConnected) return;
|
||||
const clean = purifier.sanitize(svg, {
|
||||
USE_PROFILES: { svg: true },
|
||||
FORBID_TAGS: ['style', 'foreignobject', 'image', 'use', 'a'],
|
||||
FORBID_ATTR: ['style', 'href', 'xlink:href'],
|
||||
RETURN_DOM_FRAGMENT: true,
|
||||
});
|
||||
const blockedContent = purifier.removed.some((entry) => 'element' in entry
|
||||
&& ['foreignobject', 'image', 'use'].includes(entry.element.nodeName.toLowerCase()));
|
||||
for (const element of clean.querySelectorAll('*')) {
|
||||
element.removeAttribute('class');
|
||||
for (const attribute of Array.from(element.attributes)) {
|
||||
if (/url\s*\(/i.test(attribute.value) && !/^url\(\s*#[\w:.-]+\s*\)$/i.test(attribute.value)) {
|
||||
element.removeAttribute(attribute.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
const diagram = clean.querySelector('svg');
|
||||
if (!diagram) throw new Error('No safe diagram output was produced.');
|
||||
diagram.setAttribute('role', 'img');
|
||||
diagram.setAttribute('aria-label', 'Rendered snapshot diagram; source is shown above');
|
||||
output.replaceChildren(clean);
|
||||
status.textContent = blockedContent
|
||||
? 'Rendered with unsupported embedded content blocked. Original source remains above.'
|
||||
: 'Rendered. Original source remains above.';
|
||||
button.textContent = '↻ Render again';
|
||||
} catch (error) {
|
||||
if (isCurrent() && controls.isConnected) {
|
||||
status.textContent = `Diagram could not be rendered: ${error instanceof Error ? error.message : String(error)} Original source remains above.`;
|
||||
button.textContent = '↻ Retry';
|
||||
}
|
||||
} finally {
|
||||
staging?.remove();
|
||||
try {
|
||||
restoreConfig?.();
|
||||
} finally {
|
||||
release();
|
||||
button.disabled = false;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
const source = html;
|
||||
const target = root;
|
||||
if (!target) return;
|
||||
let active = true;
|
||||
try {
|
||||
purifier ??= createDOMPurify(window);
|
||||
if (!purifier.isSupported) throw new Error('Safe HTML rendering is unavailable in this browser.');
|
||||
const fragment = purifier.sanitize(source, {
|
||||
ALLOWED_TAGS: documentTags,
|
||||
ALLOWED_ATTR: documentAttributes,
|
||||
ADD_URI_SAFE_ATTR: documentAttributes.filter((attribute) => attribute.startsWith('data-')),
|
||||
ALLOWED_NAMESPACES: ['http://www.w3.org/1999/xhtml'],
|
||||
ALLOW_DATA_ATTR: false,
|
||||
ALLOW_ARIA_ATTR: false,
|
||||
ALLOWED_URI_REGEXP: documentUris,
|
||||
RETURN_DOM_FRAGMENT: true,
|
||||
});
|
||||
const blockedMarkup = purifier.removed.some((entry) => 'element' in entry
|
||||
&& ['script', 'style', 'iframe', 'object', 'embed', 'form', 'input', 'textarea', 'select', 'video', 'audio', 'svg', 'math']
|
||||
.includes(entry.element.nodeName.toLowerCase()));
|
||||
prepareDocument(fragment);
|
||||
renderSecrets(fragment);
|
||||
renderCallouts(fragment);
|
||||
renderMath(fragment);
|
||||
prepareDiagrams(fragment, () => active && target.isConnected);
|
||||
if (blockedMarkup) {
|
||||
const details = document.createElement('details');
|
||||
const summary = document.createElement('summary');
|
||||
summary.textContent = 'Active or unsupported embedded content was blocked. View supplied HTML as text.';
|
||||
const code = document.createElement('pre');
|
||||
code.textContent = source;
|
||||
details.append(summary, code);
|
||||
fragment.prepend(details);
|
||||
}
|
||||
target.replaceChildren(source.trim() ? fragment : message('This snapshot has no body content.'));
|
||||
} catch (error) {
|
||||
const code = document.createElement('pre');
|
||||
code.textContent = source;
|
||||
target.replaceChildren(message(`Snapshot could not be rendered: ${error instanceof Error ? error.message : String(error)} Showing supplied HTML as text.`), code);
|
||||
}
|
||||
return () => { active = false; };
|
||||
});
|
||||
</script>
|
||||
|
||||
<section class="snapshot-document" aria-label={label}>
|
||||
<div class="snapshot-body" bind:this={root}></div>
|
||||
</section>
|
||||
|
||||
<style>
|
||||
.snapshot-document {
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
padding: 16px;
|
||||
color: var(--text-primary);
|
||||
font-family: var(--editor-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif);
|
||||
font-size: var(--editor-font-size, 14px);
|
||||
line-height: var(--editor-line-height, 1.65);
|
||||
user-select: text;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
.snapshot-body :global(p) { margin: 0 0 0.4em; }
|
||||
.snapshot-body :global(h1) { font-size: 1.75em; margin: 1.5em 0 0.5em; }
|
||||
.snapshot-body :global(h2) { font-size: 1.4em; margin: 1.25em 0 0.5em; }
|
||||
.snapshot-body :global(h3) { font-size: 1.2em; margin: 1em 0 0.5em; }
|
||||
.snapshot-body :global(h4), .snapshot-body :global(h5), .snapshot-body :global(h6) { margin: 0.9em 0 0.4em; }
|
||||
.snapshot-body :global(h1), .snapshot-body :global(h2), .snapshot-body :global(h3) { line-height: 1.3; }
|
||||
.snapshot-body > :global(:first-child) { margin-top: 0; }
|
||||
.snapshot-body :global(strong) { font-weight: 600; }
|
||||
.snapshot-body :global(a) { color: var(--text-accent); text-decoration: underline; }
|
||||
.snapshot-body :global(blockquote) { border-left: 3px solid var(--accent); padding-left: 16px; margin: 1em 0; color: var(--text-secondary); }
|
||||
.snapshot-body :global(code), .snapshot-body :global(kbd), .snapshot-body :global(pre) { font-family: var(--font-mono, monospace); }
|
||||
.snapshot-body :global(code) { background: color-mix(in srgb, var(--accent) 8%, var(--bg-tertiary)); padding: 2px 6px; border-radius: 4px; font-size: 0.9em; }
|
||||
.snapshot-body :global(pre) { overflow-x: auto; max-width: 100%; padding: 16px; margin: 1em 0; border-radius: 8px; background: color-mix(in srgb, var(--accent) 8%, var(--bg-tertiary)); white-space: pre; }
|
||||
.snapshot-body :global(pre code) { padding: 0; background: none; font-size: 0.93em; line-height: 1.5; }
|
||||
.snapshot-body :global(img) { max-width: 100%; height: auto; object-fit: contain; }
|
||||
.snapshot-body :global(img[data-size="small"]) { max-width: 33%; }
|
||||
.snapshot-body :global(img[data-size="medium"]) { max-width: 65%; }
|
||||
.snapshot-body :global(ul), .snapshot-body :global(ol) { padding-left: 1.5em; }
|
||||
.snapshot-body :global(ul[data-type="taskList"]) { padding-left: 0; list-style: none; }
|
||||
.snapshot-body :global(.snapshot-task) { display: flex; align-items: flex-start; gap: 8px; list-style: none; }
|
||||
.snapshot-body :global(.snapshot-task > input) { flex: none; margin-top: 0.4em; accent-color: var(--accent); }
|
||||
.snapshot-body :global(.snapshot-task > div) { flex: 1; min-width: 0; }
|
||||
.snapshot-body :global(details) { margin: 1em 0; }
|
||||
.snapshot-body :global(summary) { cursor: pointer; }
|
||||
.snapshot-body :global(.snapshot-table) { max-width: 100%; overflow-x: auto; margin: 1em 0; }
|
||||
.snapshot-body :global(table) { border-collapse: collapse; min-width: 100%; }
|
||||
.snapshot-body :global(th), .snapshot-body :global(td) { border: 1px solid var(--border); padding: 6px 10px; vertical-align: top; }
|
||||
.snapshot-body :global(th) { background: var(--bg-secondary); font-weight: 600; }
|
||||
.snapshot-body :global(.snapshot-secret) { margin: 1em 0; padding: 12px; border: 1px solid var(--border); border-radius: 8px; background: color-mix(in srgb, var(--accent) 7%, var(--bg-secondary)); }
|
||||
.snapshot-body :global(.snapshot-message) { color: var(--text-secondary); font-size: 0.9em; }
|
||||
.snapshot-body :global(.snapshot-wiki-link) { color: var(--text-accent); text-decoration: underline; text-decoration-style: dotted; }
|
||||
.snapshot-body :global(.snapshot-page-break) { margin: 1em 0; border-top: 1px dashed var(--border); }
|
||||
.snapshot-body :global(.snapshot-page-break)::before { content: 'Page break'; color: var(--text-tertiary); font-size: 0.8em; }
|
||||
.snapshot-body :global(.snapshot-callout) { border: 1px solid rgba(var(--snapshot-callout-color), 0.3); border-left: 3px solid rgb(var(--snapshot-callout-color)); border-radius: 8px; background: rgba(var(--snapshot-callout-color), 0.06); margin: 1em 0; }
|
||||
.snapshot-body :global(.snapshot-callout-header) { padding: 8px 12px; color: rgb(var(--snapshot-callout-color)); }
|
||||
.snapshot-body :global(.snapshot-callout-header > span) { display: inline-flex; vertical-align: middle; margin-right: 8px; }
|
||||
.snapshot-body :global(.snapshot-callout-header > small) { margin-left: 8px; }
|
||||
.snapshot-body :global(.snapshot-callout-body) { padding: 8px 14px 10px; }
|
||||
.snapshot-body :global(.snapshot-math-block) { overflow-x: auto; margin: 16px 0; padding: 12px; text-align: center; }
|
||||
.snapshot-body :global(.snapshot-math-block .katex-display) { margin: 0; }
|
||||
.snapshot-body :global(.snapshot-diagram) { position: relative; margin: -0.5em 0 1em; }
|
||||
.snapshot-body :global(.snapshot-diagram button) { border: 1px solid var(--border); border-radius: 6px; padding: 7px 14px; background: var(--bg-tertiary); color: var(--text-primary); font: inherit; font-size: 0.9em; cursor: pointer; }
|
||||
.snapshot-body :global(.snapshot-diagram button:hover:not(:disabled)) { border-color: var(--accent); }
|
||||
.snapshot-body :global(.snapshot-diagram button:disabled) { opacity: 0.6; cursor: wait; }
|
||||
.snapshot-body :global(.snapshot-diagram [role="status"]) { display: block; margin-top: 6px; }
|
||||
.snapshot-body :global(.snapshot-diagram-output) { overflow-x: auto; max-width: 100%; }
|
||||
.snapshot-body :global(.snapshot-diagram-output svg) { max-width: 100%; height: auto; color: var(--text-primary); }
|
||||
/* SVG stylesheets are removed; these local rules keep untrusted diagrams legible. */
|
||||
.snapshot-body :global(.snapshot-diagram-output svg text), .snapshot-body :global(.snapshot-diagram-output svg tspan) { fill: var(--text-primary); font-family: inherit; }
|
||||
.snapshot-body :global(.snapshot-diagram-output svg path), .snapshot-body :global(.snapshot-diagram-output svg line), .snapshot-body :global(.snapshot-diagram-output svg polyline) { stroke: var(--text-secondary); fill: none; }
|
||||
.snapshot-body :global(.snapshot-diagram-output svg rect), .snapshot-body :global(.snapshot-diagram-output svg circle), .snapshot-body :global(.snapshot-diagram-output svg ellipse), .snapshot-body :global(.snapshot-diagram-output svg polygon) { stroke: var(--text-secondary); fill: var(--bg-secondary); }
|
||||
.snapshot-body :global(.snapshot-diagram-output svg marker path) { fill: var(--text-secondary); }
|
||||
.snapshot-body :global(.snapshot-diagram-staging) { position: absolute; visibility: hidden; pointer-events: none; width: 100%; }
|
||||
.snapshot-body :global(summary:focus-visible), .snapshot-body :global(button:focus-visible), .snapshot-body :global(.snapshot-table:focus-visible) { outline: 2px solid var(--accent); outline-offset: 3px; }
|
||||
</style>
|
||||
@@ -12,6 +12,9 @@
|
||||
import TagLabel from './TagLabel.svelte';
|
||||
import {
|
||||
NOTEBOOK_ICON_OPTIONS,
|
||||
COMMON_NOTEBOOK_ICON_COUNT,
|
||||
decodeBuiltinNotebookIcon,
|
||||
isCommonNotebookIcon,
|
||||
encodeBuiltinNotebookIcon,
|
||||
type NotebookIconId
|
||||
} from '$lib/utils/notebook-icons';
|
||||
@@ -41,6 +44,9 @@
|
||||
const activeColor = $derived(tagColor(tag, $tagStyles));
|
||||
const colorInputValue = $derived(expandHex(activeColor) ?? '#5b6abf');
|
||||
const hasStyle = $derived(!!(activeIcon || activeColor));
|
||||
let showAll = $state<boolean | null>(null);
|
||||
// Starts open when the current icon is one of the extra icons.
|
||||
const expanded = $derived(showAll ?? !isCommonNotebookIcon(decodeBuiltinNotebookIcon(activeIcon)));
|
||||
function publishStyle(target: string, next: TagStyle | null) {
|
||||
if (get(appConfig)?.active_vault !== ownerVault) return;
|
||||
tagStyles.update(styles => applyCommittedTagStyle(styles, target, next));
|
||||
@@ -154,7 +160,7 @@
|
||||
</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)}
|
||||
{#each expanded ? NOTEBOOK_ICON_OPTIONS : NOTEBOOK_ICON_OPTIONS.slice(0, COMMON_NOTEBOOK_ICON_COUNT) as option (option.id)}
|
||||
<button
|
||||
type="button"
|
||||
class="icon-picker-option"
|
||||
@@ -167,6 +173,9 @@
|
||||
<span>{option.label}</span>
|
||||
</button>
|
||||
{/each}
|
||||
<button type="button" class="icon-picker-more" aria-expanded={expanded} onclick={() => showAll = !expanded}>
|
||||
{expanded ? 'Fewer icons' : 'More icons'}
|
||||
</button>
|
||||
</div>
|
||||
<div class="color-section">
|
||||
<span class="color-label">Color</span>
|
||||
@@ -344,6 +353,22 @@
|
||||
color: var(--accent);
|
||||
}
|
||||
|
||||
.icon-picker-more {
|
||||
grid-column: 1 / -1;
|
||||
padding: 7px;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
background: transparent;
|
||||
color: var(--text-tertiary);
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.icon-picker-more:hover {
|
||||
background: var(--bg-hover);
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
.color-section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -458,6 +483,11 @@
|
||||
min-height: 64px;
|
||||
}
|
||||
|
||||
.icon-picker-overlay.mobile .icon-picker-more {
|
||||
min-height: 44px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.icon-picker-overlay.mobile .icon-picker-actions button {
|
||||
min-height: 44px;
|
||||
}
|
||||
|
||||
@@ -4,9 +4,11 @@
|
||||
import { getTasks } from '$lib/api';
|
||||
import { debounce } from '$lib/utils/debounce';
|
||||
import { tasksLayout, tasksHideCompleted, tasksOnlyFlagged, tasksSort, appConfig } from '$lib/stores/app';
|
||||
import { isAndroid } from '$lib/platform';
|
||||
import { isAndroid, isMobile } from '$lib/platform';
|
||||
import type { TaskItem, FileEvent } from '$lib/types';
|
||||
import { isCurrentVaultEvent } from '$lib/utils/note-list-updates';
|
||||
import { formatLocalDate } from '$lib/utils/time';
|
||||
import { matchesTaskDueFilter, type TaskDueFilter } from '$lib/utils/task-filter';
|
||||
|
||||
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;
|
||||
@@ -86,6 +88,19 @@
|
||||
|
||||
onMount(() => {
|
||||
void load();
|
||||
let dayTimer: ReturnType<typeof setTimeout> | undefined;
|
||||
const refreshDay = () => {
|
||||
const now = new Date();
|
||||
today = formatLocalDate(now);
|
||||
clearTimeout(dayTimer);
|
||||
const nextDay = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
|
||||
dayTimer = setTimeout(refreshDay, nextDay.getTime() - now.getTime() + 1);
|
||||
};
|
||||
const resumeDay = () => {
|
||||
if (document.visibilityState === 'visible') refreshDay();
|
||||
};
|
||||
refreshDay();
|
||||
document.addEventListener('visibilitychange', resumeDay);
|
||||
listen<FileEvent>('file-changed', ({ payload }) => handleFileChange(payload)).then((u) => {
|
||||
if (disposed) u();
|
||||
else unlisten = u;
|
||||
@@ -94,26 +109,32 @@
|
||||
disposed = true;
|
||||
fullLoad += 1;
|
||||
unlisten?.();
|
||||
clearTimeout(dayTimer);
|
||||
document.removeEventListener('visibilitychange', resumeDay);
|
||||
};
|
||||
});
|
||||
|
||||
// Local YYYY-MM-DD (en-CA gives ISO-style date)
|
||||
const today = new Date().toLocaleDateString('en-CA');
|
||||
let today = $state(formatLocalDate(new Date()));
|
||||
let dueFilter = $state<TaskDueFilter>('all');
|
||||
|
||||
const prioRank: Record<string, number> = { high: 0, med: 1, low: 2 };
|
||||
function prank(p: string | null) { return p ? (prioRank[p] ?? 3) : 3; }
|
||||
// Free-text task filter: matches the task text or its note title (case-insensitive).
|
||||
const normalizedTaskQuery = $derived(taskQuery.trim().toLowerCase());
|
||||
function matchesQuery(t: TaskItem): boolean {
|
||||
const q = taskQuery.trim().toLowerCase();
|
||||
if (!q) return true;
|
||||
return t.text.toLowerCase().includes(q) || t.note_title.toLowerCase().includes(q);
|
||||
if (!normalizedTaskQuery) return true;
|
||||
return t.text.toLowerCase().includes(normalizedTaskQuery) || t.note_title.toLowerCase().includes(normalizedTaskQuery);
|
||||
}
|
||||
|
||||
const matchingTasks = $derived(tasks.filter((t) =>
|
||||
(!$tasksHideCompleted || !t.completed)
|
||||
&& (!$tasksOnlyFlagged || !!t.due || !!t.priority)
|
||||
&& matchesQuery(t)
|
||||
&& matchesTaskDueFilter(t.due, dueFilter, today, t.completed)
|
||||
));
|
||||
|
||||
const filtered = $derived.by(() => {
|
||||
let list = tasks.slice();
|
||||
if ($tasksHideCompleted) list = list.filter((t) => !t.completed);
|
||||
if ($tasksOnlyFlagged) list = list.filter((t) => !!t.due || !!t.priority);
|
||||
list = list.filter(matchesQuery);
|
||||
const list = matchingTasks.slice();
|
||||
list.sort((a, b) => {
|
||||
if (a.completed !== b.completed) return a.completed ? 1 : -1; // done last
|
||||
if ($tasksSort === 'priority') {
|
||||
@@ -134,8 +155,8 @@
|
||||
|
||||
const openCount = $derived(tasks.filter((t) => !t.completed).length);
|
||||
|
||||
function dueClass(due: string | null): string {
|
||||
if (!due) return '';
|
||||
function dueClass(due: string | null, completed: boolean): string {
|
||||
if (!due || completed) return '';
|
||||
if (due < today) return 'overdue';
|
||||
if (due === today) return 'duetoday';
|
||||
return '';
|
||||
@@ -168,7 +189,7 @@
|
||||
const calNow = new Date();
|
||||
let calMonth = $state(calNow.getMonth());
|
||||
let calYear = $state(calNow.getFullYear());
|
||||
let selectedDate = $state(today);
|
||||
let selectedDate = $state(formatLocalDate(calNow));
|
||||
|
||||
const calMonthNames = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
|
||||
// 0 = Sunday, 1 = Monday (default). Day names + grid offset follow the setting.
|
||||
@@ -176,12 +197,9 @@
|
||||
const DOW = ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'];
|
||||
const calDayNames = $derived([...DOW.slice(weekStartsOn), ...DOW.slice(0, weekStartsOn)]);
|
||||
|
||||
// Calendar tasks share the list's hide-completed filter (no sort).
|
||||
const calBase = $derived(tasks.filter((t) => (!$tasksHideCompleted || !t.completed) && (!$tasksOnlyFlagged || !!t.due || !!t.priority) && matchesQuery(t)));
|
||||
|
||||
const tasksByDate = $derived.by(() => {
|
||||
const m = new Map<string, TaskItem[]>();
|
||||
for (const t of calBase) {
|
||||
for (const t of matchingTasks) {
|
||||
if (!t.due) continue;
|
||||
const arr = m.get(t.due);
|
||||
if (arr) arr.push(t);
|
||||
@@ -190,7 +208,7 @@
|
||||
return m;
|
||||
});
|
||||
|
||||
const undatedTasks = $derived(calBase.filter((t) => !t.due));
|
||||
const undatedTasks = $derived(matchingTasks.filter((t) => !t.due));
|
||||
|
||||
function byPriority(a: TaskItem, b: TaskItem) {
|
||||
if (a.completed !== b.completed) return a.completed ? 1 : -1;
|
||||
@@ -247,13 +265,15 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="tasks-view">
|
||||
<div class="tasks-view" class:mobile={isMobile}>
|
||||
{#if prioMenuFor || dueMenuFor}
|
||||
<!-- svelte-ignore a11y_consider_explicit_label -->
|
||||
<button class="prio-backdrop" onclick={() => { prioMenuFor = null; dueMenuFor = null; }} aria-label="Close menu"></button>
|
||||
{/if}
|
||||
<div class="tasks-controls">
|
||||
<input class="tasks-filter" type="text" placeholder="Filter tasks…" bind:value={taskQuery} onkeydown={(e) => { if (e.key === 'Escape') taskQuery = ''; }} aria-label="Filter tasks by text" />
|
||||
<button class="tasks-ctl" class:active={dueFilter === 'today'} aria-pressed={dueFilter === 'today'} onclick={() => { dueFilter = dueFilter === 'today' ? 'all' : 'today'; if (dueFilter === 'today') calToday(); }} title="Show tasks due today">Today</button>
|
||||
<button class="tasks-ctl" class:active={dueFilter === 'overdue'} aria-pressed={dueFilter === 'overdue'} onclick={() => { dueFilter = dueFilter === 'overdue' ? 'all' : 'overdue'; }} title="Show tasks due before today">Overdue</button>
|
||||
<button class="tasks-ctl" class:active={$tasksHideCompleted} onclick={() => ($tasksHideCompleted = !$tasksHideCompleted)} title="Hide completed tasks">Hide done</button>
|
||||
<button class="tasks-ctl" class:active={$tasksOnlyFlagged} onclick={() => ($tasksOnlyFlagged = !$tasksOnlyFlagged)} title="Only show tasks with a due date or priority">Flagged</button>
|
||||
{#if !isAndroid}
|
||||
@@ -306,7 +326,7 @@
|
||||
<span class="task-label">{t.text}</span>
|
||||
<span class="task-due-wrap">
|
||||
<button
|
||||
class="task-due {dueClass(t.due)}"
|
||||
class="task-due {dueClass(t.due, t.completed)}"
|
||||
class:set={!!t.due}
|
||||
title="Set due date"
|
||||
aria-label="Set due date"
|
||||
@@ -388,7 +408,15 @@
|
||||
</div>
|
||||
</div>
|
||||
{:else if filtered.length === 0}
|
||||
<div class="tasks-empty">No tasks. Add <code>- [ ] something</code> to any note.{#if openCount === 0 && tasks.length}{' '}All done!{/if}</div>
|
||||
<div class="tasks-empty">
|
||||
{#if tasks.length === 0}
|
||||
No tasks. Add <code>- [ ] something</code> to any note.
|
||||
{:else if $tasksHideCompleted && openCount === 0}
|
||||
All tasks are complete.
|
||||
{:else}
|
||||
No tasks match these filters.
|
||||
{/if}
|
||||
</div>
|
||||
{:else}
|
||||
<div class="tasks-list">
|
||||
{#each filtered as t (rowKey(t))}{@render taskRow(t, false)}{/each}
|
||||
@@ -444,6 +472,21 @@
|
||||
color: var(--text-primary);
|
||||
font-size: 12px;
|
||||
}
|
||||
.tasks-view.mobile .tasks-filter {
|
||||
flex-basis: 100%;
|
||||
min-height: 44px;
|
||||
}
|
||||
.tasks-view.mobile .tasks-ctl {
|
||||
min-width: 44px;
|
||||
min-height: 44px;
|
||||
}
|
||||
/* Marking a task done is the main action on a phone: widen the tap area without changing how the box looks,
|
||||
staying clear of the priority control that follows it. */
|
||||
.tasks-view.mobile .task-check::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
inset: -16px -6px -16px -16px;
|
||||
}
|
||||
.tasks-filter::placeholder { color: var(--text-tertiary); }
|
||||
.tasks-filter:focus { outline: none; border-color: var(--accent); }
|
||||
.tasks-list {
|
||||
|
||||
@@ -96,9 +96,11 @@
|
||||
</div>
|
||||
{/if}
|
||||
<div class="titlebar-actions">
|
||||
<button class="switch-vault-btn" onclick={async () => { if (await onBeforeVaultSwitch()) $vaultReady = false; }} title="Switch Vault">
|
||||
<button class="switch-vault-btn" onclick={async () => { if (await onBeforeVaultSwitch()) $vaultReady = false; }} title="Manage Vaults" aria-label="Manage Vaults">
|
||||
<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" />
|
||||
<rect x="3" y="3" width="18" height="16" rx="2" />
|
||||
<circle cx="12" cy="11" r="3.5" />
|
||||
<path d="M12 7.5V6M12 16v-1.5M7 19v2M17 19v2" />
|
||||
</svg>
|
||||
</button>
|
||||
<button class="switch-vault-btn" onclick={() => ($focusMode = true)} title="Focus mode">
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import CodeBlock, { type CodeBlockOptions } from '@tiptap/extension-code-block';
|
||||
import { toggleSelectedCode } from './toggleSelectedCode.ts';
|
||||
import type { Node as ProseMirrorNode } from '@tiptap/pm/model';
|
||||
import { Plugin, PluginKey } from '@tiptap/pm/state';
|
||||
import { Decoration, DecorationSet } from '@tiptap/pm/view';
|
||||
@@ -35,9 +36,11 @@ export function createCodeBlockHighlightPlugin({
|
||||
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);
|
||||
// A named language without a grammar (mermaid, a typo) stays plain: guessing would run
|
||||
// every registered grammar over the block on each edit.
|
||||
const tree = !language ? lowlight.highlightAuto(node.textContent)
|
||||
: lowlight.registered(language) ? lowlight.highlight(language, node.textContent)
|
||||
: { children: [] };
|
||||
const spans: HighlightSpan[] = [];
|
||||
let offset = 0;
|
||||
function visit(nodes: HighlightNode[], inheritedClass: string) {
|
||||
@@ -120,6 +123,15 @@ export const CachedCodeBlockLowlight = CodeBlock.extend<CodeBlockOptions & { low
|
||||
addOptions() {
|
||||
return { ...this.parent!(), lowlight: null };
|
||||
},
|
||||
addCommands() {
|
||||
return { ...this.parent?.(), toggleCodeBlock: (attributes) => toggleSelectedCode(attributes) };
|
||||
},
|
||||
addAttributes() {
|
||||
// A block written without a language keeps none, so a bare fence is not saved as the default
|
||||
// language. Highlighting still falls back to the default language for such blocks.
|
||||
const attributes: Record<string, object> = this.parent?.() ?? {};
|
||||
return { ...attributes, language: { ...attributes.language, default: null } };
|
||||
},
|
||||
addProseMirrorPlugins() {
|
||||
if (!this.options.lowlight) throw new Error('Code block highlighting requires a lowlight instance');
|
||||
return [
|
||||
|
||||
@@ -0,0 +1,196 @@
|
||||
import { Node, mergeAttributes } from '@tiptap/core';
|
||||
import type { Node as ProseMirrorNode } from '@tiptap/pm/model';
|
||||
import { clampImgGridCols, normalizeImgGridLayout } from '../imageGrid.ts';
|
||||
|
||||
export interface ImageGridDrag {
|
||||
gridPos: number;
|
||||
index: number;
|
||||
}
|
||||
|
||||
export interface ImageGridOptions {
|
||||
/** Replace the grid at `gridPos` with one image paragraph per image. */
|
||||
onUngroup: (gridPos: number) => void;
|
||||
/** Move image `fromIndex` of one grid before slot `toIndex` of the same or another grid. */
|
||||
onMoveImage: (fromGridPos: number, fromIndex: number, toGridPos: number, toIndex: number) => void;
|
||||
}
|
||||
|
||||
export interface ImageGridStorage {
|
||||
/** The grid image being dragged. Shared by every grid in the editor so images can move between grids. */
|
||||
drag: ImageGridDrag | null;
|
||||
}
|
||||
|
||||
declare module '@tiptap/core' {
|
||||
interface Storage {
|
||||
imageGrid: ImageGridStorage;
|
||||
}
|
||||
}
|
||||
|
||||
function controlButton(label: string, title: string, onClick: () => void): HTMLButtonElement {
|
||||
const button = document.createElement('button');
|
||||
button.type = 'button';
|
||||
button.className = 'img-grid-control';
|
||||
button.title = title;
|
||||
button.textContent = label;
|
||||
button.addEventListener('mousedown', (event) => event.preventDefault());
|
||||
button.addEventListener('click', (event) => {
|
||||
event.preventDefault();
|
||||
onClick();
|
||||
});
|
||||
return button;
|
||||
}
|
||||
|
||||
/**
|
||||
* Side-by-side image grid (#254). Saved as a `:::img-grid` block (see imageGrid.ts). The content is
|
||||
* the editor's inline image nodes, so size, copy and the image toolbar work the same as elsewhere.
|
||||
*/
|
||||
export const ImageGrid = Node.create<ImageGridOptions, ImageGridStorage>({
|
||||
name: 'imageGrid',
|
||||
group: 'block',
|
||||
content: 'image+',
|
||||
defining: true,
|
||||
|
||||
addOptions() {
|
||||
return { onUngroup: () => {}, onMoveImage: () => {} };
|
||||
},
|
||||
|
||||
addStorage() {
|
||||
return { drag: null };
|
||||
},
|
||||
|
||||
addAttributes() {
|
||||
return {
|
||||
cols: {
|
||||
default: 2,
|
||||
parseHTML: (element: HTMLElement) => clampImgGridCols(element.getAttribute('data-cols') ?? ''),
|
||||
renderHTML: (attributes: Record<string, unknown>) => ({ 'data-cols': String(clampImgGridCols(attributes.cols)) }),
|
||||
},
|
||||
layout: {
|
||||
default: 'grid',
|
||||
parseHTML: (element: HTMLElement) => normalizeImgGridLayout(element.getAttribute('data-layout')),
|
||||
renderHTML: (attributes: Record<string, unknown>) => ({ 'data-layout': normalizeImgGridLayout(attributes.layout) }),
|
||||
},
|
||||
};
|
||||
},
|
||||
|
||||
parseHTML() {
|
||||
return [{ tag: 'div[data-img-grid]' }];
|
||||
},
|
||||
|
||||
renderHTML({ HTMLAttributes }) {
|
||||
// `data-img-grid` is what parseHTML matches, so copied grids paste back as grids.
|
||||
return ['div', mergeAttributes(HTMLAttributes, { 'data-img-grid': '', class: 'img-grid' }), 0];
|
||||
},
|
||||
|
||||
addNodeView() {
|
||||
const { onUngroup, onMoveImage } = this.options;
|
||||
const storage = this.storage;
|
||||
return ({ node, getPos, editor }) => {
|
||||
const dom = document.createElement('div');
|
||||
const header = document.createElement('div');
|
||||
const content = document.createElement('div');
|
||||
dom.className = 'img-grid-wrap';
|
||||
header.className = 'img-grid-header';
|
||||
header.contentEditable = 'false';
|
||||
dom.append(header, content);
|
||||
const position = (): number | null => (typeof getPos === 'function' ? getPos() ?? null : null);
|
||||
|
||||
const render = (current: ProseMirrorNode) => {
|
||||
const cols = clampImgGridCols(current.attrs.cols);
|
||||
const layout = normalizeImgGridLayout(current.attrs.layout);
|
||||
for (const element of [dom, content]) {
|
||||
element.setAttribute('data-img-grid', '');
|
||||
element.setAttribute('data-cols', String(cols));
|
||||
element.setAttribute('data-layout', layout);
|
||||
}
|
||||
content.className = 'img-grid';
|
||||
header.replaceChildren();
|
||||
if (!editor.isEditable) return;
|
||||
const setAttrs = (attrs: Record<string, unknown>) => {
|
||||
const pos = position();
|
||||
if (pos !== null) editor.view.dispatch(editor.state.tr.setNodeMarkup(pos, undefined, { ...current.attrs, ...attrs }));
|
||||
};
|
||||
header.append(
|
||||
controlButton(`${cols} col`, 'Cycle columns (2-4)', () => setAttrs({ cols: cols >= 4 ? 2 : cols + 1 })),
|
||||
controlButton(layout, 'Toggle grid / masonry', () => setAttrs({ layout: layout === 'masonry' ? 'grid' : 'masonry' })),
|
||||
controlButton('ungroup', 'Ungroup back to single images', () => {
|
||||
const pos = position();
|
||||
if (pos !== null) onUngroup(pos);
|
||||
}),
|
||||
);
|
||||
};
|
||||
render(node);
|
||||
|
||||
const clearDropMark = () => {
|
||||
content.classList.remove('img-grid-dropping');
|
||||
content.removeAttribute('data-drop-index');
|
||||
};
|
||||
const dropIndexAt = (x: number, y: number): number => {
|
||||
const images = Array.from(content.querySelectorAll('img'));
|
||||
for (let i = 0; i < images.length; i++) {
|
||||
const rect = images[i].getBoundingClientRect();
|
||||
if (y < rect.top + rect.height / 2 - 4) return i;
|
||||
if (y <= rect.bottom + 4 && x < rect.left + rect.width / 2) return i;
|
||||
}
|
||||
return images.length;
|
||||
};
|
||||
content.addEventListener('dragstart', (event) => {
|
||||
if (!editor.isEditable) return;
|
||||
const image = (event.target as HTMLElement | null)?.closest?.('img');
|
||||
const pos = position();
|
||||
if (!image || !content.contains(image) || pos === null) return;
|
||||
const index = Array.from(content.querySelectorAll('img')).indexOf(image as HTMLImageElement);
|
||||
if (index >= 0) storage.drag = { gridPos: pos, index };
|
||||
});
|
||||
content.addEventListener('dragover', (event) => {
|
||||
if (!storage.drag || !editor.isEditable) return;
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
if (event.dataTransfer) event.dataTransfer.dropEffect = 'move';
|
||||
content.classList.add('img-grid-dropping');
|
||||
content.setAttribute('data-drop-index', String(dropIndexAt(event.clientX, event.clientY)));
|
||||
});
|
||||
content.addEventListener('dragleave', (event) => {
|
||||
const to = event.relatedTarget as globalThis.Node | null;
|
||||
if (!to || !content.contains(to)) clearDropMark();
|
||||
});
|
||||
content.addEventListener('dragend', () => {
|
||||
storage.drag = null;
|
||||
clearDropMark();
|
||||
});
|
||||
content.addEventListener('drop', (event) => {
|
||||
const drag = storage.drag;
|
||||
if (!drag) return;
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const toIndex = dropIndexAt(event.clientX, event.clientY);
|
||||
clearDropMark();
|
||||
storage.drag = null;
|
||||
const pos = position();
|
||||
if (pos !== null) onMoveImage(drag.gridPos, drag.index, pos, toIndex);
|
||||
});
|
||||
|
||||
return {
|
||||
dom,
|
||||
contentDOM: content,
|
||||
update(updated) {
|
||||
if (updated.type.name !== 'imageGrid') return false;
|
||||
render(updated);
|
||||
return true;
|
||||
},
|
||||
ignoreMutation(mutation) {
|
||||
if (mutation.type === 'selection') return false;
|
||||
return !content.contains(mutation.target);
|
||||
},
|
||||
stopEvent(event) {
|
||||
if (header.contains(event.target as globalThis.Node)) return true;
|
||||
// Grid reordering handles its own drops; ProseMirror would insert a second copy.
|
||||
return (event.type === 'drop' || event.type === 'dragover') && !!storage.drag
|
||||
&& content.contains(event.target as globalThis.Node);
|
||||
},
|
||||
destroy() {
|
||||
clearDropMark();
|
||||
},
|
||||
};
|
||||
};
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,40 @@
|
||||
import type { Command } from '@tiptap/core';
|
||||
import { TextSelection } from '@tiptap/pm/state';
|
||||
|
||||
/** Convert a top-level text selection as a unit; leave complex structures to Tiptap. */
|
||||
export function toggleSelectedCode(attributes: Record<string, unknown> = {}): Command {
|
||||
return ({ state, tr, dispatch, commands }) => {
|
||||
const { selection, schema } = state;
|
||||
if (selection.empty) return commands.toggleNode('codeBlock', 'paragraph', attributes);
|
||||
|
||||
const blocks: { node: typeof state.doc; pos: number }[] = [];
|
||||
state.doc.forEach((node, pos) => {
|
||||
if (pos < selection.to && pos + node.nodeSize > selection.from) blocks.push({ node, pos });
|
||||
});
|
||||
const supported = blocks.length > 0 && blocks.every(({ node }) => {
|
||||
if (node.type.name !== 'paragraph' && node.type.name !== 'codeBlock') return false;
|
||||
let valid = true;
|
||||
node.forEach((child) => { if (!child.isText && child.type.name !== 'hardBreak') valid = false; });
|
||||
return valid;
|
||||
});
|
||||
// Keep the existing single-paragraph behaviour and do not flatten lists, images, etc.
|
||||
if (!supported || (blocks.length === 1 && blocks[0].node.type.name !== 'codeBlock')) {
|
||||
return commands.toggleNode('codeBlock', 'paragraph', attributes);
|
||||
}
|
||||
|
||||
const allCode = blocks.every(({ node }) => node.type.name === 'codeBlock');
|
||||
const text = blocks.map(({ node }) => node.textBetween(0, node.content.size, '\n', '\n')).join('\n');
|
||||
const replacement = allCode
|
||||
? text.split('\n').map((line) => schema.nodes.paragraph.create(null, line ? schema.text(line) : null))
|
||||
: [schema.nodes.codeBlock.create(attributes, text ? schema.text(text) : null)];
|
||||
const from = blocks[0].pos;
|
||||
const last = blocks[blocks.length - 1];
|
||||
const to = last.pos + last.node.nodeSize;
|
||||
if (dispatch) {
|
||||
tr.replaceWith(from, to, replacement);
|
||||
const end = from + replacement.reduce((size, node) => size + node.nodeSize, 0);
|
||||
tr.setSelection(TextSelection.create(tr.doc, from + 1, end - 1));
|
||||
}
|
||||
return true;
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,24 @@
|
||||
import { Extension } from '@tiptap/core';
|
||||
import { Plugin, PluginKey, TextSelection } from '@tiptap/pm/state';
|
||||
import { getSelectionPair } from '../selectionPairs';
|
||||
import { Plugin, PluginKey, TextSelection, type EditorState, type Transaction } from '@tiptap/pm/state';
|
||||
import { getSelectionPair } from '../selectionPairs.ts';
|
||||
|
||||
/**
|
||||
* Wrap the selected text in the typed pair, or null to let the input through.
|
||||
*
|
||||
* ProseMirror reports every text change of the DOM here, not only keystrokes. A compose key
|
||||
* or dead key shows what has been typed so far as a preedit (`·`, then `'` for Compose ' e)
|
||||
* and replaces it at each step, which arrives as a quote replacing a non-empty range. Only
|
||||
* the user's own selection is wrapped: the range must be the selection, outside composition.
|
||||
*/
|
||||
export function wrapSelection(state: EditorState, from: number, to: number, text: string, composing = false): Transaction | null {
|
||||
const close = getSelectionPair(text);
|
||||
if (!close || from === to || composing) return null;
|
||||
const { selection } = state;
|
||||
if (selection.empty || selection.from !== from || selection.to !== to) return null;
|
||||
const tr = state.tr.insertText(close, to).insertText(text, from);
|
||||
tr.setSelection(TextSelection.create(tr.doc, from + text.length, to + text.length));
|
||||
return tr;
|
||||
}
|
||||
|
||||
// TipTap/ProseMirror behavior for wrapping a non-empty rich-editor selection
|
||||
// without flattening selected inline marks or content to plain text.
|
||||
@@ -12,14 +30,11 @@ export const WrapSelectedText = Extension.create({
|
||||
new Plugin({
|
||||
key: new PluginKey('wrapSelectedText'),
|
||||
props: {
|
||||
// Intercept only supported single-character text input over a range.
|
||||
// Intercept only supported single-character text input over the selection.
|
||||
// Everything else falls back to ProseMirror's normal input handling.
|
||||
handleTextInput(view, from, to, text) {
|
||||
const close = getSelectionPair(text);
|
||||
if (!close || from === to) return false;
|
||||
|
||||
const tr = view.state.tr.insertText(close, to).insertText(text, from);
|
||||
tr.setSelection(TextSelection.create(tr.doc, from + text.length, to + text.length));
|
||||
const tr = wrapSelection(view.state, from, to, text, view.composing);
|
||||
if (!tr) return false;
|
||||
view.dispatch(tr);
|
||||
return true;
|
||||
},
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
import { markdownLanguage } from '@codemirror/lang-markdown';
|
||||
import { splitSnapshot } from '../utils/history-comparison.ts';
|
||||
import { createEditorMarkdownParser, displayMathRanges, inlineMathRanges, legacyLinkRanges } from './markdownParser.ts';
|
||||
|
||||
export interface ExternalNoteReference {
|
||||
from: number;
|
||||
to: number;
|
||||
href: string;
|
||||
html: boolean;
|
||||
pdf?: boolean;
|
||||
}
|
||||
|
||||
const markdown = createEditorMarkdownParser();
|
||||
// The editor never treats indented text as a code block, so an indented image is still an image here.
|
||||
const editorSyntax = (markdownLanguage.parser as unknown as {
|
||||
configure(spec: { remove: string[] }): typeof markdownLanguage.parser;
|
||||
}).configure({ remove: ['IndentedCode'] });
|
||||
|
||||
/** Byte ranges for local attachment destinations, without reserializing the user's Markdown. */
|
||||
export function externalNoteReferences(raw: string): ExternalNoteReference[] {
|
||||
const { body, metadata } = splitSnapshot(raw);
|
||||
const spans: ExternalNoteReference[] = [];
|
||||
const seen = new Set<string>();
|
||||
const legacy = legacyLinkRanges(body);
|
||||
const legacyByStart = new Map(legacy.map(range => [range.from, range]));
|
||||
const math = [...displayMathRanges(body), ...inlineMathRanges(body)];
|
||||
const environment: { references?: Record<string, { href: string }> } = {};
|
||||
markdown.parse(body, environment);
|
||||
const tree = editorSyntax.parse(body);
|
||||
const usedLabels = new Set<string>();
|
||||
const label = (node: { from: number; to: number }) => markdown.utils.normalizeReference(body.slice(node.from + 1, node.to - 1));
|
||||
tree.iterate({ enter(node) {
|
||||
if (!['Link', 'Image'].includes(node.name) || node.node.getChild('URL') || body[node.to] === '(' || math.some(range => node.from >= range.from && node.from < range.to)) return;
|
||||
for (let parent = node.node.parent; parent; parent = parent.parent) if (parent.name === 'Image') return false;
|
||||
const explicit = node.node.getChild('LinkLabel');
|
||||
let key = explicit ? label(explicit) : '';
|
||||
if (!key) {
|
||||
const closing = node.node.getChildren('LinkMark').find(mark => body.slice(mark.from, mark.to) === ']');
|
||||
if (closing) key = markdown.utils.normalizeReference(body.slice(node.from + (node.name === 'Image' ? 2 : 1), closing.from));
|
||||
}
|
||||
if (environment.references?.[key]) usedLabels.add(key);
|
||||
} });
|
||||
const selectedDefinitions = new Set<string>();
|
||||
const add = (from: number, to: number, html = false, pdf = false) => {
|
||||
if (math.some(range => from >= range.from && from < range.to)) return;
|
||||
const href = markdown.utils.unescapeAll(body.slice(from, to));
|
||||
let path = href.split(/[?#]/, 1)[0];
|
||||
try { path = decodeURIComponent(path); } catch { /* Native validation handles malformed escapes. */ }
|
||||
if (!path || /^[a-z][a-z\d+.-]*:/i.test(path) || /^[\\/]/.test(path) || /\.md$/i.test(path)) return;
|
||||
const key = `${from}:${to}`;
|
||||
if (seen.has(key)) return;
|
||||
seen.add(key);
|
||||
spans.push({ from: metadata.length + from, to: metadata.length + to, href, html, pdf });
|
||||
};
|
||||
tree.iterate({
|
||||
enter(node) {
|
||||
// Links and HTML inside image alt text are labels, not additional attachments.
|
||||
let direct = true;
|
||||
for (let ancestor = node.node.parent; ancestor; ancestor = ancestor.parent) {
|
||||
if (ancestor.name === 'Image' && !(node.name === 'URL' && direct)) return false;
|
||||
direct = false;
|
||||
}
|
||||
if (node.name === 'URL' && ['Image', 'Link', 'LinkReference'].includes(node.node.parent?.name ?? '')) {
|
||||
const angle = body[node.from] === '<' && body[node.to - 1] === '>';
|
||||
const from = node.from + (angle ? 1 : 0);
|
||||
if (node.node.parent?.name === 'LinkReference') {
|
||||
const definition = node.node.parent.getChild('LinkLabel');
|
||||
if (!definition) return;
|
||||
const key = label(definition);
|
||||
const href = markdown.normalizeLink(markdown.utils.unescapeAll(body.slice(from, node.to - (angle ? 1 : 0))));
|
||||
if (!usedLabels.has(key) || selectedDefinitions.has(key) || environment.references?.[key]?.href !== href) return;
|
||||
selectedDefinitions.add(key);
|
||||
}
|
||||
const compatible = legacyByStart.get(from);
|
||||
add(from, compatible?.to ?? node.to - (angle ? 1 : 0));
|
||||
} else if (node.name === 'Paragraph' || /Heading[1-6]$/.test(node.name)) {
|
||||
for (const range of legacy) {
|
||||
if (range.from >= node.from && range.to <= node.to) add(range.from, range.to);
|
||||
}
|
||||
} else if (node.name === 'HTMLTag' || node.name === 'HTMLBlock') {
|
||||
const html = body.slice(node.from, node.to);
|
||||
// Skip comments and literal HTML code, not just Markdown fences.
|
||||
const tags = /<!--[\s\S]*?(?:-->|$)|<(script|style|textarea|pre|code)\b[^>]*>[\s\S]*?(?:<\/\1\s*>|$)|<(img|a|div)\b(?:"[^"]*"|'[^']*'|[^'">])*>/gi;
|
||||
for (const tag of html.matchAll(tags)) {
|
||||
if (!tag[2]) continue;
|
||||
const attributes = /(?:^|\s)([\w:-]+)\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/gi;
|
||||
for (const attribute of tag[0].matchAll(attributes)) {
|
||||
const name = attribute[1].toLowerCase();
|
||||
const element = tag[2].toLowerCase();
|
||||
if (!(element === 'img' && name === 'src') && !(element === 'a' && name === 'href') && !(element === 'div' && name === 'data-pdf-src')) continue;
|
||||
const value = attribute[2] ?? attribute[3] ?? attribute[4];
|
||||
const quoted = attribute[2] !== undefined || attribute[3] !== undefined;
|
||||
const start = node.from + tag.index! + attribute.index! + attribute[0].length - value.length - (quoted ? 1 : 0);
|
||||
add(start, start + value.length, true, name === 'data-pdf-src');
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
spans.sort((a, b) => a.from - b.from);
|
||||
const encoder = new TextEncoder();
|
||||
let previous = 0;
|
||||
let bytes = 0;
|
||||
return spans.map(span => {
|
||||
bytes += encoder.encode(raw.slice(previous, span.from)).length;
|
||||
const from = bytes;
|
||||
bytes += encoder.encode(raw.slice(span.from, span.to)).length;
|
||||
previous = span.to;
|
||||
return { ...span, from, to: bytes };
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,153 @@
|
||||
/*
|
||||
* Side-by-side / grid / masonry layout for images (#254).
|
||||
*
|
||||
* Portable syntax: a `:::` container whose lines are ordinary Markdown images. Other renderers
|
||||
* (GitHub, Typora, ...) show the images stacked, plus the literal header and closer lines.
|
||||
*
|
||||
* :::img-grid cols=3 masonry
|
||||
* 
|
||||
* 
|
||||
* :::
|
||||
*
|
||||
* Header: `:::img-grid`, optionally followed by `cols=2|3|4` and `masonry` / `grid` (also written
|
||||
* `layout=masonry` / `layout=grid`), in any order.
|
||||
* Body: one image per line. The closer is `:::` on its own line, or trailing the last image
|
||||
* (` :::`).
|
||||
*
|
||||
* Content is never partially converted. If any part of the block isn't understood (an unknown
|
||||
* option, a caption, a linked image, a blank line, a missing closer), the block is left as
|
||||
* ordinary Markdown. The parsing itself is a markdown-it block rule (`markdownParser.ts`), so a
|
||||
* grid example inside a code block is never converted.
|
||||
*/
|
||||
|
||||
export type ImgGridLayout = 'grid' | 'masonry';
|
||||
|
||||
export interface ImgGridAttrs {
|
||||
cols: number;
|
||||
layout: ImgGridLayout;
|
||||
}
|
||||
|
||||
export const IMG_GRID_MIN_COLS = 2;
|
||||
export const IMG_GRID_MAX_COLS = 4;
|
||||
export const IMG_GRID_DEFAULT_COLS = 2;
|
||||
export const IMG_GRID_CLOSER = ':::';
|
||||
|
||||
/** Clamp a column count from node attributes or the DOM into the supported range. */
|
||||
export function clampImgGridCols(value: unknown): number {
|
||||
const n = typeof value === 'string' ? parseInt(value, 10) : (value as number);
|
||||
if (!Number.isFinite(n)) return IMG_GRID_DEFAULT_COLS;
|
||||
return Math.min(IMG_GRID_MAX_COLS, Math.max(IMG_GRID_MIN_COLS, Math.floor(n)));
|
||||
}
|
||||
|
||||
export function normalizeImgGridLayout(value: unknown): ImgGridLayout {
|
||||
return value === 'masonry' ? 'masonry' : 'grid';
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse a `:::img-grid ...` header line (already stripped of container indentation), or null.
|
||||
* Any unknown or out-of-range option makes the whole line not a header, so it stays literal text
|
||||
* instead of being silently rewritten.
|
||||
*/
|
||||
export function parseImgGridHeader(line: string): ImgGridAttrs | null {
|
||||
const match = /^:::img-grid(?:[ \t]+(.*?))?[ \t]*$/.exec(line);
|
||||
if (!match) return null;
|
||||
let cols: number | null = null;
|
||||
let layout: ImgGridLayout | null = null;
|
||||
for (const token of (match[1] ?? '').split(/[ \t]+/).filter(Boolean)) {
|
||||
const colsMatch = /^cols=(\d)$/.exec(token);
|
||||
const layoutMatch = /^(?:layout=)?(grid|masonry)$/.exec(token);
|
||||
if (colsMatch && cols === null) {
|
||||
const n = Number(colsMatch[1]);
|
||||
if (n < IMG_GRID_MIN_COLS || n > IMG_GRID_MAX_COLS) return null;
|
||||
cols = n;
|
||||
} else if (layoutMatch && layout === null) {
|
||||
layout = layoutMatch[1] as ImgGridLayout;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
return { cols: cols ?? IMG_GRID_DEFAULT_COLS, layout: layout ?? 'grid' };
|
||||
}
|
||||
|
||||
/** Canonical header for saving. Defaults are omitted: `:::img-grid`, `:::img-grid cols=3 masonry`. */
|
||||
export function serializeImgGridHeader(attrs: ImgGridAttrs): string {
|
||||
const cols = clampImgGridCols(attrs.cols);
|
||||
const options = [
|
||||
cols !== IMG_GRID_DEFAULT_COLS ? `cols=${cols}` : '',
|
||||
normalizeImgGridLayout(attrs.layout) === 'masonry' ? 'masonry' : '',
|
||||
].filter(Boolean);
|
||||
return [':::img-grid', ...options].join(' ');
|
||||
}
|
||||
|
||||
/**
|
||||
* Whole grid block for saving. `images` is the Markdown of the grid's images, one per line, as the
|
||||
* editor serializes inline images. Returns '' when there is nothing to save, so a grid whose images
|
||||
* all failed to resolve doesn't leave behind a header that would no longer parse.
|
||||
*/
|
||||
export function serializeImgGrid(attrs: ImgGridAttrs, images: string): string {
|
||||
const body = images.replace(/\n+$/, '');
|
||||
if (!body.trim()) return '';
|
||||
return `${serializeImgGridHeader(attrs)}\n${body}\n${IMG_GRID_CLOSER}\n`;
|
||||
}
|
||||
|
||||
/** Split a trailing ` :::` closer off the last image line: ` :::` gives ``. */
|
||||
export function splitTrailingCloser(line: string): string | null {
|
||||
const match = /^(.*\S)[ \t]+:::[ \t]*$/.exec(line);
|
||||
return match ? match[1] : null;
|
||||
}
|
||||
|
||||
/** New grids get one column per image, within 2 to 4. */
|
||||
export function defaultGridCols(imageCount: number): number {
|
||||
return clampImgGridCols(imageCount);
|
||||
}
|
||||
|
||||
/** One top-level block, for grouping neighboring images into a grid. */
|
||||
export interface ImageBlockInfo {
|
||||
isImage: boolean;
|
||||
imageCount: number;
|
||||
/** An empty paragraph. One of these before an image is how the editor holds the blank line above it. */
|
||||
isEmpty?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Grow from `target` across neighboring image-only blocks (image paragraphs and existing grids).
|
||||
* Images a blank line apart load with one empty paragraph between them, so a single empty paragraph
|
||||
* between two image blocks is part of the range, and so is the one directly above the first image:
|
||||
* left behind, it would be saved as an empty-paragraph marker above the grid.
|
||||
* Returns the block range and its image total, or null unless it holds at least two images.
|
||||
*/
|
||||
export function expandImageRange(
|
||||
blocks: readonly ImageBlockInfo[],
|
||||
target: number,
|
||||
): { start: number; end: number; total: number } | null {
|
||||
if (target < 0 || target >= blocks.length || !blocks[target].isImage) return null;
|
||||
const isImage = (index: number) => index >= 0 && index < blocks.length && blocks[index].isImage;
|
||||
const isEmpty = (index: number) => index >= 0 && index < blocks.length && !!blocks[index].isEmpty;
|
||||
let start = target;
|
||||
let end = target;
|
||||
for (;;) {
|
||||
if (isImage(start - 1)) start -= 1;
|
||||
else if (isEmpty(start - 1) && isImage(start - 2)) start -= 2;
|
||||
else break;
|
||||
}
|
||||
for (;;) {
|
||||
if (isImage(end + 1)) end += 1;
|
||||
else if (isEmpty(end + 1) && isImage(end + 2)) end += 2;
|
||||
else break;
|
||||
}
|
||||
let total = 0;
|
||||
for (let i = start; i <= end; i++) total += blocks[i].imageCount;
|
||||
if (total < 2) return null;
|
||||
if (isEmpty(start - 1)) start -= 1;
|
||||
return { start, end, total };
|
||||
}
|
||||
|
||||
/**
|
||||
* Index an item ends up at when it is dragged from `from` and dropped before slot `to` of the same
|
||||
* list (`to` counts slots in the list before removal, 0..length). Returns null for a no-op drop.
|
||||
*/
|
||||
export function reorderTarget(from: number, to: number, length: number): number | null {
|
||||
if (from < 0 || from >= length) return null;
|
||||
const target = Math.max(0, Math.min(length - 1, to > from ? to - 1 : to));
|
||||
return target === from ? null : target;
|
||||
}
|
||||
+397
-24
@@ -11,6 +11,111 @@ type MarkdownMark = {
|
||||
|
||||
const identityAssetSource: AssetSourceNormalizer = (source) => source;
|
||||
|
||||
function backtickDelimiter(text: string, minimum: number): string {
|
||||
let length = minimum;
|
||||
for (const match of text.matchAll(/`+/g)) {
|
||||
length = Math.max(length, match[0].length + 1);
|
||||
}
|
||||
return '`'.repeat(length);
|
||||
}
|
||||
|
||||
export interface MarkdownBlock {
|
||||
text: string;
|
||||
isImage: boolean;
|
||||
/** An empty paragraph, which is kept as a marker line so its vertical space round-trips. */
|
||||
isEmpty?: boolean;
|
||||
}
|
||||
|
||||
const EMPTY_PARAGRAPH_MARKER = '<!-- -->';
|
||||
|
||||
/**
|
||||
* ` "title"` suffix for an image destination, or '' without a title. Uses CommonMark backslash
|
||||
* escapes, which the parser undoes exactly, so a title survives any number of saves unchanged.
|
||||
* `&` is only escaped where it would otherwise read as an entity (`&`, `&`).
|
||||
*/
|
||||
export function serializeImageTitle(title: string | null | undefined): string {
|
||||
if (!title) return '';
|
||||
return ` "${title.replace(/[\\"]/g, '\\$&').replace(/&(?=#?[a-z0-9]+;)/gi, '\\&')}"`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Join serialized top-level blocks into a note body. Blocks that already end in a blank line
|
||||
* (lists) get no extra separator, and an empty paragraph directly before an image is written as
|
||||
* the blank line the parser turns back into that paragraph, not as a marker glued to the image.
|
||||
*/
|
||||
export function joinMarkdownBlocks(blocks: readonly MarkdownBlock[]): string {
|
||||
const entries = [...blocks];
|
||||
while (entries.length > 0 && entries[entries.length - 1].isEmpty) entries.pop();
|
||||
const parts: string[] = [];
|
||||
// Only the last two characters decide the separator. Reading them from the growing result would
|
||||
// flatten it on every block, which makes joining a large note quadratic.
|
||||
let tail = '';
|
||||
const append = (piece: string) => {
|
||||
parts.push(piece);
|
||||
tail = (tail + piece).slice(-2);
|
||||
};
|
||||
entries.forEach((entry, index) => {
|
||||
if (entry.isEmpty && entries[index + 1]?.isImage) {
|
||||
if (index > 0 && tail !== '\n\n') append(tail.endsWith('\n') ? '\n' : '\n\n');
|
||||
return;
|
||||
}
|
||||
const text = entry.isEmpty ? EMPTY_PARAGRAPH_MARKER : entry.text;
|
||||
// Images follow their predecessor directly; every other block needs a blank line before it.
|
||||
if (index === 0) append(text);
|
||||
else append((entry.isImage || tail === '\n\n' ? '' : '\n') + text);
|
||||
});
|
||||
return parts.join('').trim() + '\n';
|
||||
}
|
||||
|
||||
export interface ListItemBlock {
|
||||
text: string;
|
||||
/** A nested bullet, numbered or task list. */
|
||||
isList: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Join the serialized children of one list item. The first block follows the list marker; a nested
|
||||
* list is indented four spaces directly under it; any other block (a further paragraph, a code
|
||||
* block, a quote) is separated by a blank line and indented the same way so it stays in the item.
|
||||
*/
|
||||
export function joinListItemBlocks(blocks: readonly ListItemBlock[]): string {
|
||||
const parts: string[] = [];
|
||||
blocks.forEach((block, index) => {
|
||||
if (block.isList) {
|
||||
// A serialized list ends with a blank line; left in, it became an indented blank line here
|
||||
// and an extra empty line after the outer list.
|
||||
parts.push(block.text.replace(/\n+$/, '').split('\n').map((line) => (line ? ' ' + line : line)).join('\n'));
|
||||
} else if (index === 0) {
|
||||
parts.push(block.text);
|
||||
} else {
|
||||
const body = block.text.replace(/\n+$/, '');
|
||||
if (body.trim() === '') return;
|
||||
parts.push('', body.split('\n').map((line) => (line ? ' ' + line : line)).join('\n'));
|
||||
}
|
||||
});
|
||||
return parts.join('\n') + '\n';
|
||||
}
|
||||
|
||||
export function serializeCodeBlock(code: string, language: string = ''): string {
|
||||
const fence = backtickDelimiter(code, 3);
|
||||
return `${fence}${language}\n${code}\n${fence}\n`;
|
||||
}
|
||||
|
||||
function serializeCodeSpan(text: string): string {
|
||||
const delimiter = backtickDelimiter(text, 1);
|
||||
const needsPadding = text.startsWith('`') || text.endsWith('`')
|
||||
|| ((text.startsWith(' ') || text.endsWith(' ')) && /[^ ]/.test(text));
|
||||
const padding = needsPadding ? ' ' : '';
|
||||
return `${delimiter}${padding}${text}${padding}${delimiter}`;
|
||||
}
|
||||
|
||||
function serializeInlineMath(tex: string, forceEncoded: boolean): string {
|
||||
if (forceEncoded || !tex || /[\r\n$]/.test(tex) || /^\s|\s$/.test(tex) || /(?:^|[^\\])(?:\\\\)*\\$/.test(tex)) {
|
||||
return `<span data-math-inline="${encodeURIComponent(tex)}" class="math-inline"></span>`;
|
||||
}
|
||||
return `$${tex}$`;
|
||||
}
|
||||
|
||||
function stringAttr(mark: Mark, name: string): string {
|
||||
const value = mark.attrs?.[name];
|
||||
return typeof value === 'string' ? value : '';
|
||||
@@ -52,15 +157,14 @@ function markdownMark(mark: Mark, text: string): MarkdownMark | null {
|
||||
}
|
||||
: null;
|
||||
}
|
||||
case 'code':
|
||||
return { key: 'code', priority: 90, open: '`', close: '`' };
|
||||
case 'link': {
|
||||
const href = stringAttr(mark, 'href');
|
||||
const title = stringAttr(mark, 'title');
|
||||
return {
|
||||
key: `link:${href}`,
|
||||
key: `link:${href}:${title}`,
|
||||
priority: 100,
|
||||
open: '[',
|
||||
close: `](${href})`,
|
||||
close: `](${href}${serializeImageTitle(title)})`,
|
||||
};
|
||||
}
|
||||
case 'wikiLink': {
|
||||
@@ -78,8 +182,35 @@ function markdownMark(mark: Mark, text: string): MarkdownMark | null {
|
||||
}
|
||||
}
|
||||
|
||||
function marksForText(node: ProseMirrorNode): MarkdownMark[] {
|
||||
const escapeAttribute = (value: string) => value.replace(/&/g, '&').replace(/"/g, '"').replace(/</g, '<');
|
||||
|
||||
/**
|
||||
* Markdown for an image. One with a width or height (from HTML such as `<img width="80">`) is
|
||||
* written as HTML again, since Markdown images have no size.
|
||||
*/
|
||||
export function serializeImage(node: ProseMirrorNode, source: string): string {
|
||||
const alt = node.attrs.alt || '';
|
||||
const size = node.attrs['data-size'] || node.attrs.size || 'full';
|
||||
const width = String(node.attrs.width ?? '').trim();
|
||||
const height = String(node.attrs.height ?? '').trim();
|
||||
if (width || height) {
|
||||
const attributes = [
|
||||
`src="${escapeAttribute(source)}"`,
|
||||
`alt="${escapeAttribute(alt)}"`,
|
||||
node.attrs.title ? `title="${escapeAttribute(node.attrs.title)}"` : '',
|
||||
width ? `width="${escapeAttribute(width)}"` : '',
|
||||
height ? `height="${escapeAttribute(height)}"` : '',
|
||||
size && size !== 'full' ? `data-size="${escapeAttribute(size)}"` : '',
|
||||
].filter(Boolean);
|
||||
return `<img ${attributes.join(' ')}>`;
|
||||
}
|
||||
const sizeSuffix = size && size !== 'full' ? `|size=${size}` : '';
|
||||
return `})`;
|
||||
}
|
||||
|
||||
function marksForText(node: ProseMirrorNode, linksOnly = false): MarkdownMark[] {
|
||||
return node.marks
|
||||
.filter((mark) => !linksOnly || mark.type.name === 'link' || mark.type.name === 'wikiLink')
|
||||
.map((mark) => markdownMark(mark, node.text || ''))
|
||||
.filter((mark): mark is MarkdownMark => mark !== null)
|
||||
.sort((left, right) => left.priority - right.priority || left.key.localeCompare(right.key));
|
||||
@@ -92,52 +223,294 @@ function commonMarkCount(active: MarkdownMark[], next: MarkdownMark[]): number {
|
||||
return index;
|
||||
}
|
||||
|
||||
export interface InlineSerializeOptions {
|
||||
/** Leave `$` unescaped (only backslashes before it are doubled); callers must check it cannot form math. */
|
||||
literalDollars?: boolean;
|
||||
/** Rewrites the text of a plain (non-code) text child before it is written; see `literalTextEscapes`. */
|
||||
literalText?: (text: string, childIndex: number) => string;
|
||||
}
|
||||
|
||||
export function serializeInlineMarkdown(
|
||||
node: ProseMirrorNode,
|
||||
normalizeAssetSource: AssetSourceNormalizer = identityAssetSource,
|
||||
options: InlineSerializeOptions = {},
|
||||
): string {
|
||||
let result = '';
|
||||
let activeMarks: MarkdownMark[] = [];
|
||||
// Length of `result` right after each active mark was opened, to tell when a mark holds nothing.
|
||||
let openEnds: number[] = [];
|
||||
|
||||
// `**word **` is not emphasis in Markdown: delimiters must touch the text they wrap. Spaces at the
|
||||
// edges of bold, italic and similar marks are therefore written outside the delimiters, and a mark
|
||||
// that covers only spaces is not written at all.
|
||||
const isDelimiter = (mark: MarkdownMark) => mark.open === mark.close && !mark.open.startsWith('<');
|
||||
|
||||
const transitionMarks = (nextMarks: MarkdownMark[]) => {
|
||||
const shared = commonMarkCount(activeMarks, nextMarks);
|
||||
for (let index = activeMarks.length - 1; index >= shared; index -= 1) {
|
||||
result += activeMarks[index].close;
|
||||
let trailing = '';
|
||||
if (activeMarks.slice(shared).some(isDelimiter)) {
|
||||
trailing = result.match(/[ \t\u00a0]+$/)?.[0] ?? '';
|
||||
if (trailing) result = result.slice(0, -trailing.length);
|
||||
}
|
||||
for (let index = activeMarks.length - 1; index >= shared; index -= 1) {
|
||||
const mark = activeMarks[index];
|
||||
if (isDelimiter(mark) && result.length === openEnds[index]) result = result.slice(0, result.length - mark.open.length);
|
||||
else result += mark.close;
|
||||
}
|
||||
result += trailing;
|
||||
openEnds = openEnds.slice(0, shared);
|
||||
for (let index = shared; index < nextMarks.length; index += 1) {
|
||||
result += nextMarks[index].open;
|
||||
openEnds.push(result.length);
|
||||
}
|
||||
activeMarks = nextMarks;
|
||||
};
|
||||
|
||||
node.forEach((child, _offset, index) => {
|
||||
for (let index = 0; index < node.childCount; index += 1) {
|
||||
const child = node.child(index);
|
||||
if (child.isText) {
|
||||
transitionMarks(marksForText(child));
|
||||
const isCode = child.marks.some((mark) => mark.type.name === 'code');
|
||||
let text = child.text || '';
|
||||
if (index === 0) {
|
||||
text = text.replace(/^[\t\u2003]+/, (whitespace) => ' '.repeat(whitespace.length));
|
||||
if (isCode) {
|
||||
// One code span per run of code text under the same link. Formatting that covers the whole
|
||||
// run is written around the span (**`code`**); formatting on only part of it is dropped,
|
||||
// since it cannot be written inside a code span.
|
||||
const links = marksForText(child, true);
|
||||
let marks = marksForText(child);
|
||||
while (index + 1 < node.childCount) {
|
||||
const next = node.child(index + 1);
|
||||
if (!next.isText || !next.marks.some((mark) => mark.type.name === 'code')) break;
|
||||
const nextLinks = marksForText(next, true);
|
||||
if (links.length !== nextLinks.length || commonMarkCount(links, nextLinks) !== links.length) break;
|
||||
const nextKeys = new Set(marksForText(next).map((mark) => mark.key));
|
||||
marks = marks.filter((mark) => nextKeys.has(mark.key));
|
||||
text += next.text || '';
|
||||
index += 1;
|
||||
}
|
||||
// Delimiters next to a code span sit between punctuation (the backtick) and the neighbor:
|
||||
// `**\`x\`**s` is not emphasis when a letter or digit follows, nor `a**\`x\`**` when one
|
||||
// precedes. Formatting that would open or close against such a neighbor is dropped.
|
||||
const after = index + 1 < node.childCount ? node.child(index + 1) : null;
|
||||
const afterKeys = new Set(after?.isText ? marksForText(after).map((mark) => mark.key) : []);
|
||||
const wordAfter = /^[\p{L}\p{N}_]/u.test(after?.isText ? after.text || '' : '');
|
||||
const wordBefore = /[\p{L}\p{N}_]$/u.test(result);
|
||||
marks = marks.filter((mark) => !isDelimiter(mark)
|
||||
|| !((wordAfter && !afterKeys.has(mark.key)) || (wordBefore && !activeMarks.some((active) => active.key === mark.key))));
|
||||
transitionMarks(marks);
|
||||
result += serializeCodeSpan(text);
|
||||
} else {
|
||||
if (options.literalText) text = options.literalText(text, index);
|
||||
if (index === 0) {
|
||||
text = text.replace(/^[\t\u2003]+/, (whitespace) => ' '.repeat(whitespace.length));
|
||||
}
|
||||
const marks = marksForText(child);
|
||||
const shared = commonMarkCount(activeMarks, marks);
|
||||
const leading = marks.slice(shared).some(isDelimiter) ? text.match(/^[ \t\u00a0]+/)?.[0] ?? '' : '';
|
||||
if (leading) {
|
||||
// Spaces before newly opened delimiters stay outside them.
|
||||
transitionMarks(marks.slice(0, shared));
|
||||
result += leading;
|
||||
text = text.slice(leading.length);
|
||||
if (!text) continue;
|
||||
}
|
||||
transitionMarks(marks);
|
||||
text = options.literalDollars
|
||||
? text.replace(/\\+(?=\$)/g, (backslashes) => backslashes + backslashes)
|
||||
: text.replace(/\\*\$/g, (match) => '\\'.repeat((match.length - 1) * 2 + 1) + '$');
|
||||
if (index + 1 < node.childCount && node.child(index + 1).type.name === 'mathInline') {
|
||||
text = text.replace(/\\+$/, (backslashes) => backslashes + backslashes);
|
||||
}
|
||||
result += text;
|
||||
}
|
||||
result += text;
|
||||
return;
|
||||
continue;
|
||||
}
|
||||
|
||||
transitionMarks([]);
|
||||
|
||||
if (child.type.name === 'image') {
|
||||
const source = normalizeAssetSource(child.attrs.src || '');
|
||||
if (!source) return;
|
||||
const alt = child.attrs.alt || '';
|
||||
const size = child.attrs['data-size'] || child.attrs.size || 'full';
|
||||
const sizeSuffix = size && size !== 'full' ? `|size=${size}` : '';
|
||||
if (result) result += '\n';
|
||||
result += ``;
|
||||
} else if (child.type.name === 'mathInline') {
|
||||
result += `$${child.attrs.tex || ''}$`;
|
||||
if (!source) continue;
|
||||
// An image can sit inside a link (`[](https://site)`); other formatting closes.
|
||||
transitionMarks(marksForText(child, true));
|
||||
// Images go on their own line, except right after the link around them opens.
|
||||
if (result && result.length !== openEnds[openEnds.length - 1]) result += '\n';
|
||||
result += serializeImage(child, source);
|
||||
continue;
|
||||
}
|
||||
transitionMarks([]);
|
||||
if (child.type.name === 'mathInline') {
|
||||
const previous = index > 0 ? node.child(index - 1) : null;
|
||||
const next = index + 1 < node.childCount ? node.child(index + 1) : null;
|
||||
const forceEncoded = previous?.type.name === 'mathInline' || next?.type.name === 'mathInline'
|
||||
|| /\$$/.test(previous?.text || '') || /^[\d$]/.test(next?.text || '');
|
||||
result += serializeInlineMath(child.attrs.tex || '', forceEncoded);
|
||||
} else if (child.type.name === 'hardBreak') {
|
||||
result += ' \n';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
transitionMarks([]);
|
||||
return result;
|
||||
}
|
||||
|
||||
// ---- Keeping plain text plain
|
||||
// Text in the editor is literal: `*not italic*`, `<b>` or `&` typed or loaded as text must come
|
||||
// back as the same text. Written as they are, such characters can turn into formatting, HTML or an
|
||||
// entity on the next load. They are escaped with a backslash, but only where the parser would
|
||||
// otherwise read them differently, so ordinary notes are written exactly as before.
|
||||
|
||||
/**
|
||||
* Characters that can start or end inline formatting, HTML or an entity in the place they stand.
|
||||
* Cheap: no parsing. Brackets are left out on purpose: text that reads as a link or an image is
|
||||
* left to become one, as it always has (images damaged by an old save bug come back that way).
|
||||
*/
|
||||
const LITERAL_BACKSLASH = /\\(?=[!-#%-/:-@[-`{-~])/g;
|
||||
const LITERAL_DELIMITER = /[*`~^_]|<(?=[A-Za-z/!?])|&(?=#?[A-Za-z0-9]+;)|=(?==)/g;
|
||||
const LITERAL_CANDIDATE = /\\(?=[!-#%-/:-@[-`{-~])|[*`~^]|(?:^|[^\p{L}\p{N}])_|_(?![\p{L}\p{N}])|<(?=[A-Za-z/!?])|&(?=#?[A-Za-z0-9]+;)|==/u;
|
||||
const MAX_MINIMIZED_ESCAPES = 40;
|
||||
|
||||
/** Reads a string of inline Markdown back and returns the text it shows (formatting removed). */
|
||||
export type InlinePlainText = (markdown: string) => string;
|
||||
|
||||
const squash = (text: string) => text.replace(/[\s\u00a0\u2003]+/g, '');
|
||||
|
||||
/** A literal backslash before punctuation would be read as an escape, so it is always doubled. */
|
||||
function escapeBackslashes(text: string): string {
|
||||
return text.replace(LITERAL_BACKSLASH, '\\$&');
|
||||
}
|
||||
|
||||
function escapeEveryCandidate(text: string): string {
|
||||
return escapeBackslashes(text).replace(LITERAL_DELIMITER, '\\$&');
|
||||
}
|
||||
|
||||
/** The fewest backslashes that make `text`, on its own, read back as itself. */
|
||||
function escapeWhereNeeded(raw: string, plainText: InlinePlainText): string {
|
||||
const wanted = squash(raw);
|
||||
if (squash(plainText(raw)) === wanted) return raw;
|
||||
const text = escapeBackslashes(raw);
|
||||
if (squash(plainText(text)) === wanted) return text;
|
||||
const positions: number[] = [];
|
||||
for (const match of text.matchAll(LITERAL_DELIMITER)) positions.push(match.index);
|
||||
const build = (escaped: ReadonlySet<number>) => {
|
||||
let result = '';
|
||||
let from = 0;
|
||||
for (const position of positions) {
|
||||
if (!escaped.has(position)) continue;
|
||||
result += text.slice(from, position) + '\\';
|
||||
from = position;
|
||||
}
|
||||
return result + text.slice(from);
|
||||
};
|
||||
const escaped = new Set(positions);
|
||||
if (positions.length > MAX_MINIMIZED_ESCAPES) return build(escaped);
|
||||
// Last to first, so the backslashes that stay are the leading ones (`\\*not italic*`).
|
||||
for (const position of [...positions].reverse()) {
|
||||
escaped.delete(position);
|
||||
if (squash(plainText(build(escaped))) !== wanted) escaped.add(position);
|
||||
}
|
||||
return build(escaped);
|
||||
}
|
||||
|
||||
/**
|
||||
* Decides how the plain text children of `node` must be escaped so the whole line reads back as
|
||||
* the same text, and returns that as a `literalText` option (undefined when nothing needs it).
|
||||
* Tries the unescaped form first, then each text child fixed on its own, then every candidate
|
||||
* escaped; if even that does not read back, the line is left as it was written before.
|
||||
*/
|
||||
export function literalTextEscapes(
|
||||
node: ProseMirrorNode,
|
||||
normalizeAssetSource: AssetSourceNormalizer,
|
||||
plainText: InlinePlainText,
|
||||
): InlineSerializeOptions['literalText'] {
|
||||
// Nodes are immutable and reused between saves, so each line is judged once, not on every save.
|
||||
const known = literalDecisions.get(node);
|
||||
if (known) return known === 'none' ? undefined : known;
|
||||
const decision = decideLiteralText(node, normalizeAssetSource, plainText);
|
||||
literalDecisions.set(node, decision ?? 'none');
|
||||
return decision;
|
||||
}
|
||||
|
||||
const literalDecisions = new WeakMap<ProseMirrorNode, NonNullable<InlineSerializeOptions['literalText']> | 'none'>();
|
||||
|
||||
function decideLiteralText(
|
||||
node: ProseMirrorNode,
|
||||
normalizeAssetSource: AssetSourceNormalizer,
|
||||
plainText: InlinePlainText,
|
||||
): InlineSerializeOptions['literalText'] {
|
||||
let wanted = '';
|
||||
let plain = '';
|
||||
let formatted = false;
|
||||
node.forEach((child) => {
|
||||
if (!child.isText) return;
|
||||
wanted += child.text || '';
|
||||
if (child.marks.length) formatted = true;
|
||||
if (!child.marks.some((mark) => mark.type.name === 'code')) plain += (child.text || '') + '\n';
|
||||
});
|
||||
if (!LITERAL_CANDIDATE.test(plain)) return undefined;
|
||||
// Without formatting on the line, a delimiter needs a partner of its own kind to mean anything:
|
||||
// one `*`, `_`, `~`, `^` or backtick on its own stays text. This spares most lines the check.
|
||||
if (!formatted && !/\\(?=[!-#%-/:-@[-`{-~])|<(?=[A-Za-z/!?])|&(?=#?[A-Za-z0-9]+;)|==[^]*==/.test(plain)
|
||||
&& !/\*[^]*\*|_[^]*_|`[^]*`|~[^]*~|\^[^]*\^/.test(plain)) return undefined;
|
||||
wanted = squash(wanted);
|
||||
const readsBack = (literalText?: InlineSerializeOptions['literalText']) =>
|
||||
squash(plainText(serializeInlineMarkdown(node, normalizeAssetSource, { literalText }))) === wanted;
|
||||
if (readsBack()) return undefined;
|
||||
const minimal = new Map<string, string>();
|
||||
const each: InlineSerializeOptions['literalText'] = (text) => {
|
||||
if (!LITERAL_CANDIDATE.test(text)) return text;
|
||||
if (!minimal.has(text)) minimal.set(text, escapeWhereNeeded(text, plainText));
|
||||
return minimal.get(text)!;
|
||||
};
|
||||
if (readsBack(each)) return each;
|
||||
const all: InlineSerializeOptions['literalText'] = (text) => escapeEveryCandidate(text);
|
||||
return readsBack(all) ? all : undefined;
|
||||
}
|
||||
|
||||
/** Whether a serialized paragraph is still read as one paragraph. */
|
||||
export type ReadsAsParagraph = (markdown: string) => boolean;
|
||||
|
||||
/** Whether the note, as last loaded or saved, has this line (compared without indentation). */
|
||||
export type InNoteSource = (line: string) => boolean;
|
||||
|
||||
const BLOCK_START = /^ {0,3}(?:#{1,6}(?:\s|$)|>|[-+*](?:\s|$)|\d{1,9}[.)](?:\s|$)|`{3}|~{3}|=+\s*$|[-*_](?:\s*[-*_]){2,}\s*$|\[[^\]]*\]:|:::)/m;
|
||||
|
||||
/**
|
||||
* A paragraph whose line starts like a heading, quote, list item, fence, rule or link definition
|
||||
* would become that block on the next load. Such starts get a backslash, but only when the parser
|
||||
* confirms the paragraph would not come back as a paragraph.
|
||||
*
|
||||
* One exception keeps a long-standing behavior: the editor does not read indented code, so a
|
||||
* source line such as ` - item` is shown as text and has always been saved as `- item`, which
|
||||
* the next load reads as the list its author meant. A line the note's source already has in that
|
||||
* unescaped form is therefore left alone; only text from elsewhere (typed, pasted, or escaped in
|
||||
* the source) is escaped.
|
||||
*/
|
||||
export function escapeBlockStarts(markdown: string, readsAsParagraph: ReadsAsParagraph, inNoteSource?: InNoteSource): string {
|
||||
if (!BLOCK_START.test(markdown) || readsAsParagraph(markdown)) return markdown;
|
||||
return markdown
|
||||
.split('\n')
|
||||
.map((line) => (inNoteSource?.(line) ? line : line
|
||||
.replace(/^( {0,3})(\d{1,9})([.)])(?=\s|$)/, '$1$2\\$3')
|
||||
.replace(/^( {0,3})(#{1,6}(?:\s|$)|>|[-+*](?:\s|$)|`{3}|~{3}|=+\s*$|[-*_](?:\s*[-*_]){2,}\s*$|\[[^\]]*\]:|:::)/, '$1\\$2')))
|
||||
.join('\n');
|
||||
}
|
||||
|
||||
/**
|
||||
* Like serializeInlineMarkdown, but writes a `$` as typed unless that could change the note's
|
||||
* math. `inlineMathPayloads` returns the TeX of each inline formula the parser finds in a string;
|
||||
* if plain dollars would add, remove or re-pair a formula, every `$` is escaped as before.
|
||||
*/
|
||||
export function serializeInlineMarkdownKeepingDollars(
|
||||
node: ProseMirrorNode,
|
||||
normalizeAssetSource: AssetSourceNormalizer,
|
||||
inlineMathPayloads: (markdown: string) => string[],
|
||||
plainText?: InlinePlainText,
|
||||
): string {
|
||||
const literalText = plainText ? literalTextEscapes(node, normalizeAssetSource, plainText) : undefined;
|
||||
const escaped = serializeInlineMarkdown(node, normalizeAssetSource, { literalText });
|
||||
if (!escaped.includes('$')) return escaped;
|
||||
const plain = serializeInlineMarkdown(node, normalizeAssetSource, { literalDollars: true, literalText });
|
||||
// A `$$` could start a display formula in a later block, so only single dollars are left alone.
|
||||
if (plain.includes('$$')) return escaped;
|
||||
const expected = inlineMathPayloads(escaped);
|
||||
const actual = inlineMathPayloads(plain);
|
||||
return actual.length === expected.length && actual.every((tex, index) => tex === expected[index]) ? plain : escaped;
|
||||
}
|
||||
@@ -0,0 +1,592 @@
|
||||
import MarkdownIt from 'markdown-it';
|
||||
import type Token from 'markdown-it/lib/token.mjs';
|
||||
import type StateBlock from 'markdown-it/lib/rules_block/state_block.mjs';
|
||||
import type StateInline from 'markdown-it/lib/rules_inline/state_inline.mjs';
|
||||
import fenceRule from 'markdown-it/lib/rules_block/fence.mjs';
|
||||
import markdownItMark from 'markdown-it-mark';
|
||||
import markdownItSup from 'markdown-it-sup';
|
||||
import markdownItSub from 'markdown-it-sub';
|
||||
import { IMG_GRID_CLOSER, parseImgGridHeader, splitTrailingCloser } from './imageGrid.ts';
|
||||
|
||||
interface WikiTitle { path: string; title: string }
|
||||
export interface MarkdownEnvironment { wikiLinkTitles?: readonly WikiTitle[] }
|
||||
type WikiIndex = { paths: Map<string, string>; titles: Map<string, { path: string; depth: number }> };
|
||||
// One index per titles array: callers replace the array, never mutate it, when a title changes.
|
||||
const wikiIndexes = new WeakMap<readonly WikiTitle[], WikiIndex>();
|
||||
|
||||
function displayMath(state: StateBlock, startLine: number, endLine: number, silent: boolean): boolean {
|
||||
const start = state.bMarks[startLine] + state.tShift[startLine];
|
||||
if (state.src.slice(start, state.eMarks[startLine]).trim() !== '$$') return false;
|
||||
let closing = startLine + 1;
|
||||
for (; closing < endLine; closing++) {
|
||||
if (state.sCount[closing] < state.blkIndent && !state.isEmpty(closing)) return false;
|
||||
const from = state.bMarks[closing] + state.tShift[closing];
|
||||
if (state.src.slice(from, state.eMarks[closing]).trim() === '$$') break;
|
||||
}
|
||||
if (closing === endLine) return false;
|
||||
if (silent) return true;
|
||||
const token = state.push('helix_math_block', 'div', 0);
|
||||
token.block = true;
|
||||
token.content = state.getLines(startLine + 1, closing, state.blkIndent, false).trim();
|
||||
token.map = [startLine, closing + 1];
|
||||
token.meta = { sourceStart: start };
|
||||
token.attrSet('data-math-block', encodeURIComponent(token.content));
|
||||
token.attrSet('class', 'math-block');
|
||||
state.line = closing + 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
function inlineMath(state: StateInline, silent: boolean): boolean {
|
||||
const start = state.pos;
|
||||
if (state.src[start] !== '$' || state.src[start - 1] === '$' ||
|
||||
start + 1 >= state.posMax || /[\s$]/u.test(state.src[start + 1])) return false;
|
||||
let end = start + 1;
|
||||
for (; end < state.posMax; end++) {
|
||||
const char = state.src[end];
|
||||
if (char === '\n') return false;
|
||||
if (char === '\\') { end++; continue; }
|
||||
if (char === '$') break;
|
||||
}
|
||||
if (end >= state.posMax || end === start + 1 || /\s/u.test(state.src[end - 1]) ||
|
||||
state.src[end + 1] === '$' || /[0-9]/.test(state.src[end + 1] ?? '')) return false;
|
||||
if (!silent) {
|
||||
const token = state.push('helix_math_inline', 'span', 0);
|
||||
token.content = state.src.slice(start + 1, end).trim();
|
||||
token.meta = { from: start, to: end + 1 };
|
||||
token.attrSet('data-math-inline', encodeURIComponent(token.content));
|
||||
token.attrSet('class', 'math-inline');
|
||||
}
|
||||
state.pos = end + 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
// markdown-it trims two spaces even when a code span contains only spaces.
|
||||
// Preserve CommonMark's all-space exception without replacing its normal backtick parser.
|
||||
function spaceCode(state: StateInline, silent: boolean): boolean {
|
||||
if (state.src[state.pos] !== '`') return false;
|
||||
let content = state.pos;
|
||||
while (content < state.posMax && state.src[content] === '`') content++;
|
||||
const length = content - state.pos;
|
||||
let closing = content;
|
||||
while (closing < state.posMax && (state.src[closing] === ' ' || state.src[closing] === '\n')) closing++;
|
||||
if (closing === content) return false;
|
||||
let end = closing;
|
||||
while (end < state.posMax && state.src[end] === '`') end++;
|
||||
if (end - closing !== length) return false;
|
||||
if (!silent) {
|
||||
const token = state.push('code_inline', 'code', 0);
|
||||
token.markup = state.src.slice(state.pos, content);
|
||||
token.content = state.src.slice(content, closing).replace(/\n/g, ' ');
|
||||
}
|
||||
state.pos = end;
|
||||
return true;
|
||||
}
|
||||
|
||||
function installMath(md: MarkdownIt) {
|
||||
md.block.ruler.before('fence', 'helix_math_block', displayMath, { alt: ['paragraph', 'reference', 'blockquote', 'list'] });
|
||||
md.inline.ruler.after('backticks', 'helix_math_inline', inlineMath);
|
||||
md.renderer.rules.helix_math_block = (tokens, index, _options, _env, renderer) =>
|
||||
`<div${renderer.renderAttrs(tokens[index])}></div>\n`;
|
||||
md.renderer.rules.helix_math_inline = (tokens, index, _options, _env, renderer) =>
|
||||
`<span${renderer.renderAttrs(tokens[index])}></span>`;
|
||||
}
|
||||
|
||||
function wikiLink(state: StateInline, silent: boolean): boolean {
|
||||
const notes: readonly WikiTitle[] | undefined = state.env.wikiLinkTitles;
|
||||
if (!notes || state.src.slice(state.pos, state.pos + 2) !== '[[') return false;
|
||||
const end = state.src.indexOf(']]', state.pos + 2);
|
||||
if (end < 0 || end + 2 > state.posMax) return false;
|
||||
const raw = state.src.slice(state.pos + 2, end);
|
||||
if (!raw || raw.includes(']')) return false;
|
||||
if (!silent) {
|
||||
let index = wikiIndexes.get(notes);
|
||||
if (!index) {
|
||||
index = { paths: new Map(), titles: new Map() };
|
||||
for (const note of notes) {
|
||||
if (!index.paths.has(note.path)) index.paths.set(note.path, note.path);
|
||||
const title = note.title.toLowerCase();
|
||||
let depth = 0;
|
||||
for (let i = 0; i < note.path.length; i++) if (note.path[i] === '/') depth++;
|
||||
const previous = index.titles.get(title);
|
||||
if (!previous || depth < previous.depth) index.titles.set(title, { path: note.path, depth });
|
||||
}
|
||||
wikiIndexes.set(notes, index);
|
||||
}
|
||||
const pipe = raw.indexOf('|');
|
||||
const reference = (pipe < 0 ? raw : raw.slice(0, pipe)).trim();
|
||||
const display = (pipe < 0 ? reference : raw.slice(pipe + 1)).trim();
|
||||
const title = reference.replace(/#.*$/, '').replace(/\^.*$/, '').trim();
|
||||
const basename = title.includes('/') ? title.slice(title.lastIndexOf('/') + 1) : title;
|
||||
const path = (title.includes('/') ? index.paths.get(title + '.md') : undefined)
|
||||
?? index.titles.get(basename.toLowerCase())?.path ?? '';
|
||||
const token = state.push('helix_wiki', 'span', 0);
|
||||
token.attrSet('data-wiki-link', '');
|
||||
token.attrSet('data-path', path);
|
||||
token.attrSet('data-title', reference);
|
||||
token.attrSet('class', 'wiki-link');
|
||||
token.content = display;
|
||||
}
|
||||
state.pos = end + 2;
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a trailing `"title"` or `'title'` (preceded by whitespace or %20, optionally followed by %20) from a
|
||||
* legacy link destination. A single scan from the end: the equivalent regular expression is quadratic on a
|
||||
* long run of spaces.
|
||||
*/
|
||||
export function stripLinkTitle(destination: string): string {
|
||||
const skippableBefore = (index: number) => (index >= 3 && destination.startsWith('%20', index - 3) ? 3 : /\s/u.test(destination[index - 1] ?? '') ? 1 : 0);
|
||||
let end = destination.length;
|
||||
for (let width = skippableBefore(end); width; width = skippableBefore(end)) end -= width;
|
||||
const quote = destination[end - 1];
|
||||
if (quote !== '"' && quote !== "'") return destination.trim();
|
||||
const open = destination.lastIndexOf(quote, end - 2);
|
||||
if (open <= 0) return destination.trim();
|
||||
let start = open;
|
||||
for (let width = skippableBefore(start); width; width = skippableBefore(start)) start -= width;
|
||||
return start === open ? destination.trim() : destination.slice(0, start).trim();
|
||||
}
|
||||
|
||||
/** The title text after a legacy destination (`"title"` or `'title'`, maybe after `>` or %20), or null. */
|
||||
function legacyImageTitle(rest: string): string | null {
|
||||
let text = rest.startsWith('>') ? rest.slice(1) : rest;
|
||||
text = text.replace(/^(?:\s|%20)+/u, '');
|
||||
while (text.endsWith('%20') || /\s$/u.test(text)) text = text.endsWith('%20') ? text.slice(0, -3) : text.slice(0, -1);
|
||||
const quote = text[0];
|
||||
if ((quote !== '"' && quote !== "'") || text.length < 2 || text[text.length - 1] !== quote) return null;
|
||||
return text.slice(1, -1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether `src[start, end)` is a valid CommonMark destination with an optional title. Such images
|
||||
* are left to markdown-it's own image rule, which handles escaped quotes and `(title)` correctly.
|
||||
*/
|
||||
function isCommonMarkDestination(state: StateInline, start: number, end: number): boolean {
|
||||
const { helpers } = state.md;
|
||||
const skipSpace = (pos: number) => {
|
||||
while (pos < end && /[ \t\n]/u.test(state.src[pos])) pos++;
|
||||
return pos;
|
||||
};
|
||||
let pos = skipSpace(start);
|
||||
const destination = helpers.parseLinkDestination(state.src, pos, end);
|
||||
if (!destination.ok) return false;
|
||||
pos = destination.pos;
|
||||
const afterDestination = pos;
|
||||
pos = skipSpace(pos);
|
||||
if (pos < end && pos !== afterDestination) {
|
||||
const title = helpers.parseLinkTitle(state.src, pos, end);
|
||||
if (!title.ok) return false;
|
||||
pos = skipSpace(title.pos);
|
||||
}
|
||||
return pos === end;
|
||||
}
|
||||
|
||||
/**
|
||||
* Looking for the `)` that ends a destination reads to the end of the line when there is none, and a
|
||||
* line can hold thousands of `[label](` starts (pasted or generated text), which made parsing it
|
||||
* quadratic. Two guards keep it linear: no search starts beyond the block's last `)`, and once the
|
||||
* searches that found nothing have read this many characters in one block, the rest of the block
|
||||
* is left to the CommonMark link rule.
|
||||
*/
|
||||
const LEGACY_LINK_SCAN_BUDGET = 2_000_000;
|
||||
const legacyLinkScans = new WeakMap<StateInline, { max: number; lastClose: number; wasted: number }>();
|
||||
|
||||
/** Preserve legacy space-containing and %20/title destinations only in real link syntax. */
|
||||
function legacyLink(state: StateInline, silent: boolean): boolean {
|
||||
const start = state.pos;
|
||||
const image = state.src[start] === '!' && state.src[start + 1] === '[';
|
||||
const labelStart = start + (image ? 1 : 0);
|
||||
if (state.src[labelStart] !== '[') return false;
|
||||
const labelEnd = state.md.helpers.parseLinkLabel(state, labelStart, !image);
|
||||
if (labelEnd < 0 || state.src[labelEnd + 1] !== '(') return false;
|
||||
const destinationStart = labelEnd + 2;
|
||||
let scans = legacyLinkScans.get(state);
|
||||
if (!scans || scans.max < state.posMax) {
|
||||
scans = { max: state.posMax, lastClose: state.src.lastIndexOf(')', state.posMax - 1), wasted: scans?.wasted ?? 0 };
|
||||
legacyLinkScans.set(state, scans);
|
||||
}
|
||||
if (destinationStart > scans.lastClose || scans.wasted > LEGACY_LINK_SCAN_BUDGET) return false;
|
||||
let end = destinationStart;
|
||||
let depth = 0;
|
||||
let quote = '';
|
||||
let angle = false;
|
||||
for (; end < state.posMax; end++) {
|
||||
const char = state.src[end];
|
||||
if (char === '\n') { scans.wasted += end - destinationStart; return false; }
|
||||
if (char === '\\') { end++; continue; }
|
||||
if (quote) { if (char === quote) quote = ''; continue; }
|
||||
if (angle) { if (char === '>') angle = false; continue; }
|
||||
if (char === '<') { angle = true; continue; }
|
||||
if ((char === '"' || char === "'") &&
|
||||
(/\s/u.test(state.src[end - 1]) || state.src.slice(end - 3, end) === '%20')) { quote = char; continue; }
|
||||
if (char === '(') depth++;
|
||||
else if (char === ')') { if (!depth) break; depth--; }
|
||||
}
|
||||
if (end >= state.posMax) { scans.wasted += end - destinationStart; return false; }
|
||||
const raw = state.src.slice(destinationStart, end);
|
||||
// Links and images with a valid CommonMark destination and title keep the native parser (and
|
||||
// their title). A `%20"title"` suffix (exported by some apps) is still legacy syntax, not part of the path.
|
||||
if (!/%20["'(]/u.test(raw) && isCommonMarkDestination(state, destinationStart, end)) return false;
|
||||
// Native CommonMark links, including nested destinations, retain their normal parser.
|
||||
if (!/\s|%20["'(]/u.test(raw)) return false;
|
||||
let destination = raw.trim();
|
||||
if (destination.startsWith('<')) {
|
||||
const angle = destination.match(/^<([^>]*)>(?:(?:\s|%20)*(?:"[^"]*"|'[^']*'|\([^)]*\)))?(?:\s|%20)*$/u);
|
||||
if (!angle) return false;
|
||||
destination = angle[1];
|
||||
} else {
|
||||
destination = stripLinkTitle(destination);
|
||||
}
|
||||
const href = state.md.normalizeLink(destination.replace(/ /g, '%20'));
|
||||
if (!state.md.validateLink(href)) return false;
|
||||
if (!silent) {
|
||||
const label = state.src.slice(labelStart + 1, labelEnd);
|
||||
const from = destinationStart + raw.indexOf(destination);
|
||||
const sourceHref = { from, to: from + destination.length };
|
||||
if (image) {
|
||||
const children: Token[] = [];
|
||||
state.md.inline.parse(label, state.md, state.env, children);
|
||||
const token = state.push('image', 'img', 0);
|
||||
token.meta = { sourceHref };
|
||||
token.attrSet('src', href.replace(/^\/{2,}(?=home\/)/u, '/'));
|
||||
token.attrSet('alt', '');
|
||||
const title = legacyImageTitle(raw.slice(raw.indexOf(destination) + destination.length));
|
||||
if (title) token.attrSet('title', state.md.utils.unescapeAll(title));
|
||||
token.children = children;
|
||||
token.content = label;
|
||||
} else {
|
||||
const token = state.push('link_open', 'a', 1);
|
||||
token.meta = { sourceHref };
|
||||
token.attrSet('href', href);
|
||||
const title = legacyImageTitle(raw.slice(raw.indexOf(destination) + destination.length));
|
||||
if (title) token.attrSet('title', state.md.utils.unescapeAll(title));
|
||||
const oldMax = state.posMax;
|
||||
state.pos = labelStart + 1;
|
||||
state.posMax = labelEnd;
|
||||
const linkState = state as StateInline & { linkLevel: number };
|
||||
linkState.linkLevel++;
|
||||
state.md.inline.tokenize(state);
|
||||
linkState.linkLevel--;
|
||||
state.push('link_close', 'a', -1);
|
||||
state.posMax = oldMax;
|
||||
}
|
||||
}
|
||||
state.pos = end + 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
const EMPTY_PARAGRAPH_MARKER = '<!-- -->';
|
||||
|
||||
function emptyParagraph(state: StateBlock, startLine: number, endLine: number, silent: boolean): boolean {
|
||||
const from = state.bMarks[startLine] + state.tShift[startLine];
|
||||
const line = state.src.slice(from, state.eMarks[startLine]);
|
||||
// Versions before 1.3.7 glued the marker to a following image (`<!-- -->`), which
|
||||
// reads as a raw HTML line and showed the image as text. Read it as the empty paragraph and the
|
||||
// image it was written from.
|
||||
const glued = line.startsWith(EMPTY_PARAGRAPH_MARKER) && line.slice(EMPTY_PARAGRAPH_MARKER.length).trimStart().startsWith('![');
|
||||
if (!glued && line.trim() !== EMPTY_PARAGRAPH_MARKER) return false;
|
||||
if (silent) return true;
|
||||
const token = state.push('helix_empty', 'p', 0);
|
||||
token.block = true;
|
||||
token.map = [startLine, startLine + 1];
|
||||
if (!glued) {
|
||||
state.line = startLine + 1;
|
||||
return true;
|
||||
}
|
||||
const rest = from + EMPTY_PARAGRAPH_MARKER.length;
|
||||
state.bMarks[startLine] = rest;
|
||||
state.tShift[startLine] = state.src.slice(rest, state.eMarks[startLine]).search(/\S/);
|
||||
state.md.block.tokenize(state, startLine, endLine);
|
||||
return true;
|
||||
}
|
||||
|
||||
/** True when `text` is exactly one Markdown image and nothing else (no caption, no link around it). */
|
||||
function isSingleImage(state: StateBlock, text: string): boolean {
|
||||
if (!text.startsWith('![')) return false;
|
||||
const tokens: Token[] = [];
|
||||
state.md.inline.parse(text, state.md, state.env, tokens);
|
||||
return tokens.length === 1 && tokens[0].type === 'image';
|
||||
}
|
||||
|
||||
/**
|
||||
* `:::img-grid` image grids (see imageGrid.ts). As a block rule, it never sees lines inside code
|
||||
* blocks. A block that isn't a well-formed grid is left completely to the other rules.
|
||||
*/
|
||||
function imageGrid(state: StateBlock, startLine: number, endLine: number, silent: boolean): boolean {
|
||||
if (state.sCount[startLine] - state.blkIndent >= 4) return false;
|
||||
const lineText = (line: number) => state.src.slice(state.bMarks[line] + state.tShift[line], state.eMarks[line]);
|
||||
const header = lineText(startLine);
|
||||
if (!header.startsWith(':::img-grid')) return false;
|
||||
const attrs = parseImgGridHeader(header);
|
||||
if (!attrs) return false;
|
||||
const images: { line: number; content: string }[] = [];
|
||||
let closing = -1;
|
||||
for (let line = startLine + 1; line < endLine && closing < 0; line++) {
|
||||
if (state.isEmpty(line) || state.sCount[line] < state.blkIndent) return false;
|
||||
const text = lineText(line).replace(/[ \t]+$/, '');
|
||||
if (text === IMG_GRID_CLOSER) {
|
||||
closing = line;
|
||||
break;
|
||||
}
|
||||
const beforeCloser = splitTrailingCloser(text);
|
||||
const image = beforeCloser ?? text;
|
||||
if (!isSingleImage(state, image)) return false;
|
||||
images.push({ line, content: image });
|
||||
if (beforeCloser !== null) closing = line;
|
||||
}
|
||||
if (closing < 0 || images.length === 0) return false;
|
||||
if (silent) return true;
|
||||
const open = state.push('helix_img_grid_open', 'div', 1);
|
||||
open.block = true;
|
||||
open.map = [startLine, closing + 1];
|
||||
open.attrSet('data-img-grid', '');
|
||||
open.attrSet('data-cols', String(attrs.cols));
|
||||
open.attrSet('data-layout', attrs.layout);
|
||||
open.attrSet('class', 'img-grid');
|
||||
for (const image of images) {
|
||||
const inline = state.push('inline', '', 0);
|
||||
inline.content = image.content;
|
||||
inline.map = [image.line, image.line + 1];
|
||||
inline.children = [];
|
||||
}
|
||||
state.push('helix_img_grid_close', 'div', -1).block = true;
|
||||
state.line = closing + 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
// Elements a note may hold as HTML. Anything else written in angle brackets is the user's text,
|
||||
// such as `List<String>`, and a browser would drop it without a trace.
|
||||
const HTML_ELEMENTS = new Set((
|
||||
'a abbr address area article aside audio b base bdi bdo big blockquote body br button canvas caption center cite code '
|
||||
+ 'col colgroup data datalist dd del details dfn dialog dir div dl dt em embed fieldset figcaption figure font footer '
|
||||
+ 'form frame frameset h1 h2 h3 h4 h5 h6 head header hgroup hr html i iframe img input ins kbd label legend li link '
|
||||
+ 'main map mark menu meta meter nav nobr noscript object ol optgroup option output p param picture pre progress q rp '
|
||||
+ 'rt ruby s samp script search section select slot small source span strike strong style sub summary sup svg math '
|
||||
+ 'table tbody td template textarea tfoot th thead time title tr track tt u ul var video wbr'
|
||||
).split(' '));
|
||||
const HTML_PIECE = /<!--[\s\S]*?-->|<\/?([A-Za-z][A-Za-z0-9-]*)(?:\s[^<>]*)?\/?>/g;
|
||||
|
||||
/** Whether a tag or comment is shown as the text it is instead of being handed to the browser. */
|
||||
function isLiteralHtml(piece: string, tagName: string | undefined): boolean {
|
||||
// A comment would vanish on the first save; the empty one is the editor's own blank-line marker.
|
||||
if (piece.startsWith('<!--')) return piece.replace(/\s/g, '') !== '<!---->';
|
||||
return !!tagName && !HTML_ELEMENTS.has(tagName.toLowerCase());
|
||||
}
|
||||
|
||||
function literalHtml(state: { tokens: Token[]; md: MarkdownIt }): void {
|
||||
for (const token of state.tokens) {
|
||||
if (token.type === 'inline') {
|
||||
for (const child of token.children ?? []) {
|
||||
if (child.type !== 'html_inline') continue;
|
||||
HTML_PIECE.lastIndex = 0;
|
||||
const match = HTML_PIECE.exec(child.content);
|
||||
if (match && match[0] === child.content && isLiteralHtml(match[0], match[1])) child.type = 'text';
|
||||
}
|
||||
} else if (token.type === 'html_block') {
|
||||
let literal = false;
|
||||
const content = token.content.replace(HTML_PIECE, (piece, tagName) => {
|
||||
if (!isLiteralHtml(piece, tagName)) return piece;
|
||||
literal = true;
|
||||
return state.md.utils.escapeHtml(piece);
|
||||
});
|
||||
if (!literal) continue;
|
||||
// Text without an element around it becomes a paragraph that keeps its lines.
|
||||
token.content = content.startsWith('<')
|
||||
? `<p>${content.trim().split('\n').map((line) => line.trimEnd()).join('<br>')}</p>\n` : content;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export function createEditorMarkdownParser(): MarkdownIt {
|
||||
const md = MarkdownIt({ html: true, linkify: false, breaks: false })
|
||||
.use(markdownItMark).use(markdownItSup).use(markdownItSub);
|
||||
// Existing editor convention: tab-indented prose does not become an indented code block.
|
||||
md.disable('code');
|
||||
installMath(md);
|
||||
md.inline.ruler.before('link', 'helix_wiki', wikiLink);
|
||||
md.inline.ruler.before('backticks', 'helix_space_code', spaceCode);
|
||||
md.inline.ruler.before('link', 'helix_legacy_link', legacyLink);
|
||||
md.block.ruler.before('html_block', 'helix_empty', emptyParagraph, { alt: ['paragraph', 'reference', 'blockquote', 'list'] });
|
||||
md.block.ruler.before('fence', 'helix_img_grid', imageGrid, { alt: ['paragraph', 'reference', 'blockquote', 'list'] });
|
||||
md.renderer.rules.helix_empty = () => '<p></p>\n';
|
||||
md.renderer.rules.helix_wiki = (tokens, index, _options, _env, renderer) =>
|
||||
`<span${renderer.renderAttrs(tokens[index])}>${md.utils.escapeHtml(tokens[index].content)}</span>`;
|
||||
|
||||
md.core.ruler.after('inline', 'helix_literal_html', literalHtml);
|
||||
|
||||
md.core.ruler.before('inline', 'helix_tasks', state => {
|
||||
const lists: { open: Token; firstItem: boolean; item: Token | null; firstParagraph: boolean }[] = [];
|
||||
for (const token of state.tokens) {
|
||||
if (token.type === 'bullet_list_open' || token.type === 'ordered_list_open') {
|
||||
lists.push({ open: token, firstItem: true, item: null, firstParagraph: true });
|
||||
} else if (token.type === 'bullet_list_close' || token.type === 'ordered_list_close') lists.pop();
|
||||
else if (token.type === 'list_item_open' && lists.length) {
|
||||
const list = lists[lists.length - 1];
|
||||
list.item = token;
|
||||
list.firstParagraph = true;
|
||||
} else if (token.type === 'list_item_close' && lists.length) {
|
||||
const list = lists[lists.length - 1];
|
||||
list.item = null;
|
||||
list.firstItem = false;
|
||||
} else if (token.type === 'inline' && lists.length) {
|
||||
const list = lists[lists.length - 1];
|
||||
if (!list.item || !list.firstParagraph || token.level !== list.item.level + 2) continue;
|
||||
list.firstParagraph = false;
|
||||
// Task items only exist in bullet lists; `1. [x] text` stays an ordinary numbered item.
|
||||
if (list.open.type !== 'bullet_list_open') continue;
|
||||
const checkbox = token.content.match(/^\[(x| )\](?:[^\S\n]+|$)/u);
|
||||
if (!checkbox) continue;
|
||||
token.content = token.content.slice(checkbox[0].length);
|
||||
list.item.attrSet('data-type', 'taskItem');
|
||||
list.item.attrSet('data-checked', checkbox[1] === 'x' ? 'true' : 'false');
|
||||
if (list.firstItem) list.open.attrSet('data-type', 'taskList');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
md.core.ruler.after('inline', 'helix_images', state => {
|
||||
let paragraph: Token | null = null;
|
||||
let cell: Token | null = null;
|
||||
// Tight list items render no <p>, so a simple item (open, hidden paragraph, inline, close) carries the marker.
|
||||
const items: { token: Token; index: number; hasCode: boolean }[] = [];
|
||||
let lines: string[] | undefined;
|
||||
for (const [index, token] of state.tokens.entries()) {
|
||||
if (token.type === 'paragraph_open' || token.type === 'heading_open') paragraph = token;
|
||||
else if (token.type === 'paragraph_close' || token.type === 'heading_close') paragraph = null;
|
||||
else if (token.type === 'th_open' || token.type === 'td_open') cell = token;
|
||||
else if (token.type === 'th_close' || token.type === 'td_close') cell = null;
|
||||
else if (token.type === 'list_item_open') items.push({ token, index, hasCode: false });
|
||||
else if (token.type === 'list_item_close') {
|
||||
const item = items.pop();
|
||||
if (item?.hasCode && index - item.index === 4) item.token.attrSet('data-helix-code', '');
|
||||
}
|
||||
if (token.type !== 'inline') continue;
|
||||
for (const child of token.children ?? []) {
|
||||
// ProseMirror's DOM parser otherwise collapses or drops whitespace-only code spans.
|
||||
if (child.type === 'code_inline') {
|
||||
child.attrSet('style', 'white-space: pre-wrap');
|
||||
paragraph?.attrSet('data-helix-code', '');
|
||||
cell?.attrSet('data-helix-code', '');
|
||||
if (paragraph?.hidden && items.length) items[items.length - 1].hasCode = true;
|
||||
}
|
||||
if (child.type === 'image') {
|
||||
const src = child.attrGet('src');
|
||||
if (src?.startsWith('//')) child.attrSet('src', src.replace(/^\/{2,}(?=home\/)/u, '/'));
|
||||
}
|
||||
}
|
||||
if (!paragraph || paragraph.type !== 'paragraph_open' || paragraph.level !== 0 || token.children?.length !== 1 ||
|
||||
token.children[0].type !== 'image' || !token.map || token.map[0] < 2) continue;
|
||||
lines ??= state.src.split('\n');
|
||||
const line = token.map[0];
|
||||
if (lines[line].startsWith('![') && lines[line - 1].trim() === '') paragraph.meta = { helixImageGap: true };
|
||||
}
|
||||
});
|
||||
// Callout rendering splits the title line from the body at the first newline of the opening
|
||||
// paragraph, so that one soft break must stay a newline instead of becoming a space.
|
||||
md.core.ruler.after('inline', 'helix_callout_title', state => {
|
||||
for (let index = 0; index + 2 < state.tokens.length; index++) {
|
||||
const [quote, paragraph, inline] = [state.tokens[index], state.tokens[index + 1], state.tokens[index + 2]];
|
||||
if (quote.type !== 'blockquote_open' || paragraph.type !== 'paragraph_open' || inline.type !== 'inline') continue;
|
||||
if (!/^\[![\w-]+\]/u.test(inline.content)) continue;
|
||||
const softbreak = inline.children?.find(child => child.type === 'softbreak');
|
||||
if (softbreak) softbreak.meta = { helixCalloutTitle: true };
|
||||
}
|
||||
});
|
||||
md.renderer.rules.paragraph_open = (tokens, index, options, _env, renderer) =>
|
||||
(tokens[index].meta?.helixImageGap ? '<p></p>\n' : '') + renderer.renderToken(tokens, index, options);
|
||||
|
||||
md.block.ruler.at('fence', (state, startLine, endLine, silent) => {
|
||||
if (!fenceRule(state, startLine, endLine, silent)) return false;
|
||||
if (silent) return true;
|
||||
const token = state.tokens[state.tokens.length - 1];
|
||||
if (token.info.trim() === 'helix-secret' && token.map) {
|
||||
const line = token.map[1] - 1;
|
||||
const closing = state.src.slice(state.bMarks[line] + state.tShift[line], state.eMarks[line]);
|
||||
let length = 0;
|
||||
while (closing[length] === token.markup[0]) length++;
|
||||
const indentation = state.sCount[line] - state.blkIndent;
|
||||
token.meta = { helixSecretClosed: indentation >= 0 && indentation < 4 &&
|
||||
length >= token.markup.length && /^[ \t]*$/u.test(closing.slice(length)) };
|
||||
}
|
||||
return true;
|
||||
}, { alt: ['paragraph', 'reference', 'blockquote', 'list'] });
|
||||
const renderFence = md.renderer.rules.fence!;
|
||||
md.renderer.rules.fence = (tokens, index, options, env, renderer) => {
|
||||
const token = tokens[index];
|
||||
if (token.info.trim() === 'helix-secret' && token.meta?.helixSecretClosed) {
|
||||
return `<div data-secret-block="${md.utils.escapeHtml(encodeURIComponent(token.content.replace(/\n$/, '')))}"></div>\n`;
|
||||
}
|
||||
// Only the final structural LF is parser-added; leading and extra trailing blank lines are literal.
|
||||
return renderFence(tokens, index, options, env, renderer).replace(/\n<\/code>/u, '</code>');
|
||||
};
|
||||
md.renderer.rules.softbreak = (tokens, index) => (tokens[index].meta?.helixCalloutTitle ? '\n' : ' ');
|
||||
md.renderer.rules.hardbreak = () => '<br>';
|
||||
return md;
|
||||
}
|
||||
|
||||
const mathBlocks = MarkdownIt({ html: true });
|
||||
installMath(mathBlocks);
|
||||
mathBlocks.inline.ruler.before('link', 'helix_legacy_link', legacyLink);
|
||||
|
||||
/**
|
||||
* Inline tokens of each blank-line-separated block, parsed on its own like the editor does, with
|
||||
* source ranges relative to the whole note. Inline syntax such as a code span cannot pair across
|
||||
* blocks, so one stray backtick must not hide the links and formulas after it.
|
||||
*/
|
||||
function inlineTokensByBlock(source: string): Token[] {
|
||||
const tokens: Token[] = [];
|
||||
let start = 0;
|
||||
let offset = 0;
|
||||
const flush = (end: number) => {
|
||||
if (end <= start) return;
|
||||
const found: Token[] = [];
|
||||
mathBlocks.inline.parse(source.slice(start, end), mathBlocks, {}, found);
|
||||
for (const token of found) {
|
||||
if (token.meta?.sourceHref) {
|
||||
const { from, to } = token.meta.sourceHref;
|
||||
token.meta = { ...token.meta, sourceHref: { from: from + start, to: to + start } };
|
||||
} else if (token.type === 'helix_math_inline') {
|
||||
token.meta = { ...token.meta, from: token.meta.from + start, to: token.meta.to + start };
|
||||
}
|
||||
tokens.push(token);
|
||||
}
|
||||
};
|
||||
for (const line of source.split('\n')) {
|
||||
if (/^[ \t\r]*$/.test(line)) {
|
||||
flush(offset);
|
||||
start = offset + line.length + 1;
|
||||
}
|
||||
offset += line.length + 1;
|
||||
}
|
||||
flush(source.length);
|
||||
return tokens;
|
||||
}
|
||||
|
||||
/** Source destinations for the editor's legacy space/title link compatibility. */
|
||||
export function legacyLinkRanges(source: string): { from: number; to: number }[] {
|
||||
if (!source.includes('](')) return [];
|
||||
return inlineTokensByBlock(source).filter(token => token.meta?.sourceHref).map(token => token.meta.sourceHref);
|
||||
}
|
||||
|
||||
/** Inline math coordinates use the same delimiter and escape rules as rendering. */
|
||||
export function inlineMathRanges(source: string): { from: number; to: number }[] {
|
||||
if (!source.includes('$')) return [];
|
||||
return inlineTokensByBlock(source).filter(token => token.type === 'helix_math_inline').map(token => token.meta);
|
||||
}
|
||||
|
||||
/** Source coordinates of semantic display-math blocks, including nested containers. */
|
||||
export function displayMathRanges(source: string): { from: number; to: number; prefix: string }[] {
|
||||
if (!source.includes('$$')) return [];
|
||||
const tokens: Token[] = [];
|
||||
mathBlocks.block.parse(source, mathBlocks, {}, tokens);
|
||||
const ranges = tokens.filter(token => token.type === 'helix_math_block' && token.map);
|
||||
if (!ranges.length) return [];
|
||||
const starts = [0];
|
||||
for (let i = 0; i < source.length; i++) if (source[i] === '\n') starts.push(i + 1);
|
||||
return ranges.map(token => {
|
||||
const from = starts[token.map![0]];
|
||||
return { from, to: starts[token.map![1]] ?? source.length,
|
||||
prefix: source.slice(from, token.meta.sourceStart) };
|
||||
});
|
||||
}
|
||||
Vendored
+5
@@ -0,0 +1,5 @@
|
||||
declare module 'markdown-it/lib/rules_block/fence.mjs' {
|
||||
import type StateBlock from 'markdown-it/lib/rules_block/state_block.mjs';
|
||||
const fence: (state: StateBlock, startLine: number, endLine: number, silent: boolean) => boolean;
|
||||
export default fence;
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
import { markdownLanguage } from '@codemirror/lang-markdown';
|
||||
import { MapMode, type ChangeDesc, type EditorState } from '@codemirror/state';
|
||||
import type { Node as ProseMirrorNode } from '@tiptap/pm/model';
|
||||
import type { Mapping } from '@tiptap/pm/transform';
|
||||
import MarkdownIt from 'markdown-it';
|
||||
import type Token from 'markdown-it/lib/token.mjs';
|
||||
import markdownItMark from 'markdown-it-mark';
|
||||
import markdownItSub from 'markdown-it-sub';
|
||||
import markdownItSup from 'markdown-it-sup';
|
||||
import { displayMathRanges } from './markdownParser.ts';
|
||||
|
||||
export interface OutlineHeading {
|
||||
level: number;
|
||||
text: string;
|
||||
pos: number;
|
||||
end: number;
|
||||
}
|
||||
|
||||
const inlineMarkdown = MarkdownIt({ html: true, linkify: false, breaks: false })
|
||||
.use(markdownItMark)
|
||||
.use(markdownItSub)
|
||||
.use(markdownItSup);
|
||||
|
||||
function inlineText(tokens: readonly Token[]): string {
|
||||
let text = '';
|
||||
for (const token of tokens) {
|
||||
if (token.children) text += inlineText(token.children);
|
||||
else if (token.type === 'text' || token.type === 'code_inline') text += token.content;
|
||||
else if (token.type === 'softbreak' || token.type === 'hardbreak' ||
|
||||
(token.type === 'html_inline' && /^<br\s*\/?\s*>$/i.test(token.content))) text += ' ';
|
||||
}
|
||||
return text;
|
||||
}
|
||||
|
||||
export function documentHeadings(doc: ProseMirrorNode): OutlineHeading[] {
|
||||
const headings: OutlineHeading[] = [];
|
||||
doc.descendants((node, pos) => {
|
||||
if (node.type.name !== 'heading') return;
|
||||
headings.push({ level: node.attrs.level, text: node.textContent, pos, end: pos + node.nodeSize });
|
||||
return false;
|
||||
});
|
||||
return headings;
|
||||
}
|
||||
|
||||
/** Match the rich editor's closed $$ blocks without shifting source coordinates. */
|
||||
function maskDisplayMath(markdown: string): string {
|
||||
const ranges = displayMathRanges(markdown);
|
||||
if (!ranges.length) return markdown;
|
||||
const parts: string[] = [];
|
||||
let copied = 0;
|
||||
for (const { from, to, prefix } of ranges) {
|
||||
parts.push(markdown.slice(copied, from), prefix, markdown.slice(from + prefix.length, to).replace(/[^\n]/g, ' '));
|
||||
copied = to;
|
||||
}
|
||||
parts.push(markdown.slice(copied));
|
||||
return parts.join('');
|
||||
}
|
||||
|
||||
/** Markdown headings only: raw HTML heading blocks are not interpreted as headings. */
|
||||
export function sourceHeadings(state: EditorState): OutlineHeading[] {
|
||||
const headings: OutlineHeading[] = [];
|
||||
// Parse the complete document, independent of CodeMirror's viewport/time-limited syntax tree.
|
||||
const markdown = state.doc.toString();
|
||||
const parsedMarkdown = maskDisplayMath(markdown);
|
||||
const tree = markdownLanguage.parser.parse(parsedMarkdown);
|
||||
const environment = {};
|
||||
// Resolve reference labels only when the document can contain link definitions.
|
||||
if (parsedMarkdown.includes(']:')) inlineMarkdown.parse(parsedMarkdown, environment);
|
||||
tree.iterate({
|
||||
enter(node) {
|
||||
if (!/^(?:ATX|Setext)Heading[1-6]$/.test(node.name)) return;
|
||||
const setext = node.name.startsWith('SetextHeading');
|
||||
const cursor = node.node.cursor();
|
||||
let from = node.from;
|
||||
let label = '';
|
||||
do {
|
||||
if (cursor.name !== 'HeaderMark' && cursor.name !== 'QuoteMark' && cursor.name !== 'ListMark') continue;
|
||||
// Setext's underline and its enclosing quote/list prefix are not label content.
|
||||
const to = setext && cursor.name === 'HeaderMark'
|
||||
? state.doc.lineAt(cursor.from).from : cursor.from;
|
||||
label += state.sliceDoc(from, Math.max(from, to));
|
||||
from = cursor.to;
|
||||
} while (cursor.next() && cursor.from < node.to);
|
||||
if (!setext) label += state.sliceDoc(from, node.to);
|
||||
headings.push({
|
||||
level: Number(node.name.at(-1)),
|
||||
text: inlineText(inlineMarkdown.parseInline(label, environment)).replace(/\s+/gu, ' ').trim(),
|
||||
pos: node.from,
|
||||
end: node.to,
|
||||
});
|
||||
return false;
|
||||
},
|
||||
});
|
||||
return headings;
|
||||
}
|
||||
|
||||
/** Headings are in document order; body content remains associated with the preceding heading. */
|
||||
export function activeHeadingIndex(headings: readonly OutlineHeading[], pos: number): number {
|
||||
let low = 0;
|
||||
let high = headings.length;
|
||||
while (low < high) {
|
||||
const middle = (low + high) >>> 1;
|
||||
if (headings[middle].pos <= pos) low = middle + 1;
|
||||
else high = middle;
|
||||
}
|
||||
return low - 1;
|
||||
}
|
||||
|
||||
/** Temporary anchors only; validate against fresh extraction before navigating. */
|
||||
export function mapSourceHeadings(headings: readonly OutlineHeading[], changes: ChangeDesc): OutlineHeading[] {
|
||||
const mapped: OutlineHeading[] = [];
|
||||
for (const heading of headings) {
|
||||
const pos = changes.mapPos(heading.pos, 1, MapMode.TrackAfter);
|
||||
const end = changes.mapPos(heading.end, -1);
|
||||
if (pos !== null && pos < end) mapped.push({ ...heading, pos, end });
|
||||
}
|
||||
return mapped;
|
||||
}
|
||||
|
||||
/** A replaced opening token no longer identifies the original semantic heading. */
|
||||
export function mapDocumentHeadings(headings: readonly OutlineHeading[], mapping: Mapping): OutlineHeading[] {
|
||||
const mapped: OutlineHeading[] = [];
|
||||
for (const heading of headings) {
|
||||
const start = mapping.mapResult(heading.pos, 1);
|
||||
const end = mapping.map(heading.end, -1);
|
||||
if (!start.deleted && start.pos < end) mapped.push({ ...heading, pos: start.pos, end });
|
||||
}
|
||||
return mapped;
|
||||
}
|
||||
@@ -0,0 +1,233 @@
|
||||
/*
|
||||
* Renaming a note rewrites the links to it in every note that links there (see
|
||||
* `update_wikilinks_after_rename` in the backend). A note that is open with unsaved edits has to
|
||||
* follow in the editor, or its next save would write the old links back. These rules mirror the
|
||||
* backend's; both are checked against `tests/fixtures/renamed-links.json`.
|
||||
*/
|
||||
|
||||
export interface LinkRename {
|
||||
/** Vault-relative path of the note without `.md`, before and after. */
|
||||
old_ref: string;
|
||||
new_ref: string;
|
||||
old_title: string;
|
||||
new_title: string;
|
||||
/** Links written with the title follow (the title changed and no other note has it). */
|
||||
title_rules: boolean;
|
||||
/** No other note has this file name, so a bare file name or top-level path means this note. */
|
||||
file_rules?: boolean;
|
||||
}
|
||||
|
||||
export interface RenamedLink {
|
||||
ref: string;
|
||||
display: string | null;
|
||||
}
|
||||
|
||||
const lower = (value: string) => value.toLowerCase();
|
||||
|
||||
function splitRef(ref: string): [string, string] {
|
||||
const slash = ref.lastIndexOf('/');
|
||||
return slash < 0 ? ['', ref] : [ref.slice(0, slash), ref.slice(slash + 1)];
|
||||
}
|
||||
|
||||
const joinRef = (dir: string, name: string) => (dir ? `${dir}/${name}` : name);
|
||||
|
||||
/** `name` without a trailing `.md` (any capitals), and that extension as written. */
|
||||
function splitMdExt(name: string): [string, string] {
|
||||
return /\.md$/i.test(name) ? [name.slice(0, -3), name.slice(-3)] : [name, ''];
|
||||
}
|
||||
|
||||
const byPath = (renames: readonly LinkRename[], ref: string) =>
|
||||
renames.find((rename) => lower(rename.old_ref) === lower(ref));
|
||||
|
||||
/**
|
||||
* The wiki link `[[ref]]` or `[[ref|display]]` after the renames, or null when it is not affected.
|
||||
* `ref` may carry a heading or block (`Note#Part`, `Note^id`) and a `.md` extension; both are kept.
|
||||
*/
|
||||
export function renamedLink(ref: string, display: string | null, renames: LinkRename | readonly LinkRename[]): RenamedLink | null {
|
||||
const list = Array.isArray(renames) ? renames : [renames as LinkRename];
|
||||
const anchorAt = ref.search(/[#^]/);
|
||||
const name = anchorAt < 0 ? ref : ref.slice(0, anchorAt);
|
||||
const anchor = anchorAt < 0 ? '' : ref.slice(anchorAt);
|
||||
const [base, ext] = splitMdExt(name);
|
||||
let rename = list.find((candidate) => candidate.title_rules && lower(candidate.old_title) === lower(base));
|
||||
let next = rename?.new_title;
|
||||
if (!rename) {
|
||||
rename = byPath(list, base.replace(/\\/g, '/'));
|
||||
if (!rename || rename.old_ref === rename.new_ref) return null;
|
||||
const stemChanges = splitRef(rename.old_ref)[1] !== splitRef(rename.new_ref)[1];
|
||||
// At the top of the vault the path is the bare name, as unsure as a title link.
|
||||
if (!rename.old_ref.includes('/') && !(rename.file_rules && stemChanges)) return null;
|
||||
next = rename.new_ref;
|
||||
}
|
||||
const followsTitle = display === rename.old_title && rename.old_title !== rename.new_title;
|
||||
return { ref: next + ext + anchor, display: followsTitle ? rename.new_title : display };
|
||||
}
|
||||
|
||||
/** Resolve `.` and `..` in a slash path; null when it climbs out of the vault. */
|
||||
function normalizeDir(path: string): string | null {
|
||||
const parts: string[] = [];
|
||||
for (const part of path.split('/')) {
|
||||
if (!part || part === '.') continue;
|
||||
if (part === '..') {
|
||||
if (!parts.length) return null;
|
||||
parts.pop();
|
||||
} else parts.push(part);
|
||||
}
|
||||
return parts.join('/');
|
||||
}
|
||||
|
||||
/** The `../`-style prefix that leads from folder `from` to folder `to`, ending in `/` unless empty. */
|
||||
function relativeDir(from: string, to: string): string {
|
||||
const a = from.split('/').filter(Boolean);
|
||||
const b = to.split('/').filter(Boolean);
|
||||
let common = 0;
|
||||
while (common < a.length && common < b.length && a[common] === b[common]) common++;
|
||||
return '../'.repeat(a.length - common) + b.slice(common).map((part) => `${part}/`).join('');
|
||||
}
|
||||
|
||||
function decode(value: string): string {
|
||||
try {
|
||||
return decodeURIComponent(value);
|
||||
} catch {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
/** Characters a link destination without `<>` cannot hold as they are. */
|
||||
function encodeFileName(name: string): string {
|
||||
return name.replace(/[% \t()<>#]/g, (char) => `%${char.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0')}`);
|
||||
}
|
||||
|
||||
const encodePath = (path: string, angled: boolean) => (angled ? path : path.split('/').map(encodeFileName).join('/'));
|
||||
|
||||
/**
|
||||
* The destination of a Markdown link (`Note.md`, `../Folder/Note%20name.md#Part`, `<Note name.md>`)
|
||||
* after the renames, or null when it does not point at a renamed note. `noteDir` is the
|
||||
* vault-relative folder of the note holding the link. The link keeps its form: relative stays
|
||||
* relative, from the vault root stays so, and a bare name stays bare when it still finds the note.
|
||||
*/
|
||||
export function renamedHref(href: string, noteDir: string, renames: LinkRename | readonly LinkRename[]): string | null {
|
||||
const list = Array.isArray(renames) ? renames : [renames as LinkRename];
|
||||
const angled = href.length >= 2 && href.startsWith('<') && href.endsWith('>');
|
||||
const dest = angled ? href.slice(1, -1) : href;
|
||||
if (/^[a-z][a-z0-9+.-]*:/i.test(dest) || !dest || dest.startsWith('#')) return null;
|
||||
const hashAt = dest.indexOf('#');
|
||||
const path = hashAt < 0 ? dest : dest.slice(0, hashAt);
|
||||
const anchor = hashAt < 0 ? '' : dest.slice(hashAt);
|
||||
const slash = path.lastIndexOf('/');
|
||||
const rawDir = slash < 0 ? '' : path.slice(0, slash + 1);
|
||||
const rawFile = path.slice(slash + 1);
|
||||
const [, ext] = splitMdExt(rawFile);
|
||||
if (!ext) return null;
|
||||
const [stem] = splitMdExt(decode(rawFile));
|
||||
const dir = decode(rawDir).replace(/\\/g, '/');
|
||||
let rename: LinkRename | undefined;
|
||||
let form: 'bare' | 'relative' | 'root' = 'relative';
|
||||
if (!dir) {
|
||||
rename = byPath(list, joinRef(noteDir, stem));
|
||||
if (!rename) {
|
||||
// A bare name from another folder finds the note by its unique file name.
|
||||
rename = list.find((candidate) => {
|
||||
const [, oldStem] = splitRef(candidate.old_ref);
|
||||
return candidate.file_rules && lower(oldStem) === lower(stem) && oldStem !== splitRef(candidate.new_ref)[1];
|
||||
});
|
||||
form = 'bare';
|
||||
}
|
||||
} else {
|
||||
const relative = dir.startsWith('/') ? null : normalizeDir(`${noteDir}/${dir}`);
|
||||
rename = relative === null ? undefined : byPath(list, joinRef(relative, stem));
|
||||
if (!rename) {
|
||||
const root = normalizeDir(dir);
|
||||
rename = root === null ? undefined : byPath(list, joinRef(root, stem));
|
||||
form = 'root';
|
||||
}
|
||||
}
|
||||
if (!rename || rename.old_ref === rename.new_ref) return null;
|
||||
const [oldDir] = splitRef(rename.old_ref);
|
||||
const [newDir, newStem] = splitRef(rename.new_ref);
|
||||
const file = encodePath(newStem + ext, angled);
|
||||
const prefix = lower(oldDir) === lower(newDir)
|
||||
? rawDir
|
||||
: form === 'bare'
|
||||
? ''
|
||||
: form === 'relative'
|
||||
? encodePath(relativeDir(noteDir, newDir), angled)
|
||||
: (dir.startsWith('/') ? '/' : '') + (newDir ? `${encodePath(newDir, angled)}/` : '');
|
||||
const next = prefix + file + anchor;
|
||||
return angled ? `<${next}>` : next;
|
||||
}
|
||||
|
||||
export interface TextChange {
|
||||
from: number;
|
||||
to: number;
|
||||
insert: string;
|
||||
}
|
||||
|
||||
/** Ranges of `text` outside fenced code blocks and inline code, where links are links. */
|
||||
function proseRanges(text: string): [number, number][] {
|
||||
const ranges: [number, number][] = [];
|
||||
let fence: { char: string; length: number } | null = null;
|
||||
let offset = 0;
|
||||
for (const line of text.split(/(?<=\n)/)) {
|
||||
const start = offset;
|
||||
offset += line.length;
|
||||
const opening = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(line.replace(/\r?\n$/, ''));
|
||||
if (fence) {
|
||||
if (opening && opening[1][0] === fence.char && opening[1].length >= fence.length && !opening[2].trim()) fence = null;
|
||||
continue;
|
||||
}
|
||||
if (opening && !(opening[1][0] === '`' && opening[2].includes('`'))) {
|
||||
fence = { char: opening[1][0], length: opening[1].length };
|
||||
continue;
|
||||
}
|
||||
let from = start;
|
||||
const ticks = /`+/g;
|
||||
let match: RegExpExecArray | null;
|
||||
while ((match = ticks.exec(line))) {
|
||||
const closing = new RegExp(`(?<!\`)${match[0]}(?!\`)`, 'g');
|
||||
closing.lastIndex = match.index + match[0].length;
|
||||
const end = closing.exec(line);
|
||||
if (!end) continue;
|
||||
ranges.push([from, start + match.index]);
|
||||
from = start + end.index + end[0].length;
|
||||
ticks.lastIndex = end.index + end[0].length;
|
||||
}
|
||||
ranges.push([from, offset]);
|
||||
}
|
||||
return ranges;
|
||||
}
|
||||
|
||||
const WIKI_LINK = /\[\[([^[\]\n]+?)\]\]/g;
|
||||
const MARKDOWN_LINK = /\[([^[\]\n]*)\]\((<[^<>\n]*>|(?:[^\s()<>]|\([^\s()<>]*\))+)([^)\n]*)\)/g;
|
||||
|
||||
/** The edits that bring the wiki and Markdown links in Markdown text in line with the rename. */
|
||||
export function renamedLinkChanges(text: string, renames: LinkRename | readonly LinkRename[], noteDir = ''): TextChange[] {
|
||||
const list = Array.isArray(renames) ? renames : [renames as LinkRename];
|
||||
const changes: TextChange[] = [];
|
||||
for (const [from, to] of proseRanges(text)) {
|
||||
const prose = text.slice(from, to);
|
||||
for (const match of prose.matchAll(WIKI_LINK)) {
|
||||
const inner = match[1];
|
||||
// In a table cell the alias separator is written `\|`, since a bare `|` ends the cell.
|
||||
const bar = inner.indexOf('|');
|
||||
const escaped = bar > 0 && inner[bar - 1] === '\\';
|
||||
const ref = bar < 0 ? inner : inner.slice(0, escaped ? bar - 1 : bar);
|
||||
const display = bar < 0 ? null : inner.slice(bar + 1);
|
||||
const next = renamedLink(ref, display, list);
|
||||
if (!next) continue;
|
||||
const separator = escaped ? '\\|' : '|';
|
||||
const insert = next.display === null ? `[[${next.ref}]]` : `[[${next.ref}${separator}${next.display}]]`;
|
||||
if (insert !== match[0]) changes.push({ from: from + match.index!, to: from + match.index! + match[0].length, insert });
|
||||
}
|
||||
for (const match of prose.matchAll(MARKDOWN_LINK)) {
|
||||
const href = renamedHref(match[2], noteDir, list);
|
||||
if (href === null) continue;
|
||||
// Link text that was the old title follows the new one.
|
||||
const titled = list.find((rename) => rename.old_title === match[1] && rename.old_title !== rename.new_title);
|
||||
const label = titled ? titled.new_title : match[1];
|
||||
const insert = `[${label}](${href}${match[3]})`;
|
||||
if (insert !== match[0]) changes.push({ from: from + match.index!, to: from + match.index! + match[0].length, insert });
|
||||
}
|
||||
}
|
||||
return changes.sort((a, b) => a.from - b.from);
|
||||
}
|
||||
@@ -64,6 +64,18 @@ export function findDocumentMatches(doc: ProseMirrorNode, query: string, options
|
||||
return results;
|
||||
}
|
||||
|
||||
/** Matches may overlap ("aa" in "aaa"); replacing all of them takes each stretch of text once. */
|
||||
export function replaceableMatches(results: NoteSearchMatch[]): NoteSearchMatch[] {
|
||||
const picked: NoteSearchMatch[] = [];
|
||||
let end = -1;
|
||||
for (const match of results) {
|
||||
if (match.from < end) continue;
|
||||
picked.push(match);
|
||||
end = match.to;
|
||||
}
|
||||
return picked;
|
||||
}
|
||||
|
||||
export function closestSearchMatch(results: NoteSearchMatch[], anchor: number): number {
|
||||
if (!results.length) return 0;
|
||||
let lo = 0;
|
||||
|
||||
@@ -77,6 +77,7 @@ export class SourceController {
|
||||
constructor(onChange: (changes: ChangeDesc, edited: boolean) => void = () => {}, events: {
|
||||
paste?: (event: ClipboardEvent) => boolean;
|
||||
drop?: (event: DragEvent) => boolean;
|
||||
scroll?: () => void;
|
||||
} = {}) {
|
||||
this.onChange = onChange;
|
||||
this.extensions = [
|
||||
@@ -95,6 +96,7 @@ export class SourceController {
|
||||
},
|
||||
paste: (event, view) => !view.state.readOnly && (events.paste?.(event) ?? false),
|
||||
drop: (event, view) => !view.state.readOnly && (events.drop?.(event) ?? false),
|
||||
scroll: () => { events.scroll?.(); return false; },
|
||||
}),
|
||||
this.configuration.of(this.settings()),
|
||||
];
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
import { Table } from '@tiptap/extension-table';
|
||||
import { columnResizing, tableEditing } from '@tiptap/pm/tables';
|
||||
|
||||
/**
|
||||
* TipTap registers the table node view together with its column-resizing plugin, and skips both
|
||||
* when the editor is created read-only. Without the node view there is no `.tableWrapper`, so a
|
||||
* wide table loses its horizontal scroll until the app is restarted in Edit mode.
|
||||
*
|
||||
* Keep the table view and its wrapper even when the initial state is View mode. The resizing
|
||||
* handlers already ignore non-editable views; this only makes the wrapper available to scroll.
|
||||
*/
|
||||
export const AlwaysResizableTable = Table.extend({
|
||||
addProseMirrorPlugins() {
|
||||
const plugins = [];
|
||||
if (this.options.resizable) {
|
||||
plugins.push(columnResizing({
|
||||
handleWidth: this.options.handleWidth,
|
||||
cellMinWidth: this.options.cellMinWidth,
|
||||
defaultCellMinWidth: this.options.cellMinWidth,
|
||||
View: this.options.View,
|
||||
lastColumnResizable: this.options.lastColumnResizable,
|
||||
}));
|
||||
}
|
||||
plugins.push(tableEditing({ allowTableNodeSelection: this.options.allowTableNodeSelection }));
|
||||
return plugins;
|
||||
},
|
||||
});
|
||||
@@ -19,11 +19,15 @@ export interface ActionDef {
|
||||
|
||||
// Every customizable action and its factory-default binding. These mirror the
|
||||
// handlers in AppLayout.handleKeydown and the rows in InfoPanel's Shortcuts tab.
|
||||
const isMac = typeof navigator !== "undefined" && navigator.platform.startsWith("Mac");
|
||||
|
||||
export const ACTIONS: ActionDef[] = [
|
||||
{ id: "new-note", label: "New note", group: "General", default: { mod: true, code: "KeyN" } },
|
||||
{ id: "save", label: "Save", group: "General", default: { mod: true, code: "KeyS" } },
|
||||
{ id: "quick-open", label: "Quick open", group: "General", default: { mod: true, code: "KeyP" } },
|
||||
{ id: "find-in-note", label: "Find in note", group: "General", default: { mod: true, code: "KeyF" } },
|
||||
// Cmd+H hides the application on macOS.
|
||||
{ id: "replace-in-note", label: "Replace in note", group: "General", default: isMac ? { mod: true, alt: true, code: "KeyF" } : { mod: true, code: "KeyH" } },
|
||||
{ id: "search-vault", label: "Search vault", group: "General", default: { mod: true, shift: true, code: "KeyF" } },
|
||||
{ id: "open-new-window", label: "Open note in new window", group: "General", default: { mod: true, shift: true, code: "KeyW" } },
|
||||
|
||||
@@ -123,8 +127,6 @@ export function bindingsEqual(a: Binding, b: Binding): boolean {
|
||||
return !!a.mod === !!b.mod && !!a.shift === !!b.shift && !!a.alt === !!b.alt && a.code === b.code;
|
||||
}
|
||||
|
||||
const isMac = typeof navigator !== "undefined" && navigator.platform.startsWith("Mac");
|
||||
|
||||
const CODE_LABELS: Record<string, string> = {
|
||||
Backslash: "\\",
|
||||
BracketLeft: "[",
|
||||
|
||||
@@ -43,6 +43,13 @@ export const darkThemes = [
|
||||
'cyberpunk',
|
||||
'black',
|
||||
'one-dark',
|
||||
'matrix',
|
||||
'amber-crt',
|
||||
'deep-ocean',
|
||||
'graphite',
|
||||
'nebula',
|
||||
'wine',
|
||||
'jade',
|
||||
];
|
||||
|
||||
export function isDarkTheme(theme: string): boolean {
|
||||
|
||||
+22
-3
@@ -117,9 +117,23 @@ export const resolvedTheme = derived(
|
||||
|
||||
// Sync (WebDAV) - global status so the top-bar button reflects any sync,
|
||||
// whoever triggered it (manual button, settings, interval, on-change).
|
||||
export const syncState = writable<{ running: boolean; error: string | null }>({
|
||||
export interface SyncSummary {
|
||||
uploaded?: number;
|
||||
downloaded?: number;
|
||||
deleted_local?: number;
|
||||
deleted_remote?: number;
|
||||
conflicts?: number;
|
||||
}
|
||||
// `result` is what the last finished sync did, so Settings reports the same outcome for every
|
||||
// way a sync can start.
|
||||
export const syncState = writable<{
|
||||
running: boolean;
|
||||
error: string | null;
|
||||
result: { vault: string; summary: SyncSummary } | null;
|
||||
}>({
|
||||
running: false,
|
||||
error: null,
|
||||
result: null,
|
||||
});
|
||||
|
||||
// Update state
|
||||
@@ -264,6 +278,9 @@ export function activateVaultData(vaultPath: string | null): void {
|
||||
}
|
||||
|
||||
// Derived
|
||||
// Entries are replaced, not mutated, when a note changes, so a parsed date stays valid for its entry.
|
||||
const noteTimestamps = { created: new WeakMap<NoteEntry, number>(), modified: new WeakMap<NoteEntry, number>() };
|
||||
|
||||
export const sortedNotes = derived(
|
||||
[notes, sortMode, viewMode, noteOrder],
|
||||
([$notes, $sortMode, $viewMode, $noteOrder]) => {
|
||||
@@ -277,9 +294,11 @@ export const sortedNotes = derived(
|
||||
const dateField = $sortMode === "title" || ($sortMode === "custom" && customSortable)
|
||||
? null
|
||||
: $sortMode === "created" ? "created" : "modified";
|
||||
const timestamps = dateField ? new Map<NoteEntry, number>() : null;
|
||||
const timestamps = dateField ? noteTimestamps[dateField] : null;
|
||||
if (dateField && timestamps) {
|
||||
for (const note of $notes) timestamps.set(note, Date.parse(note.meta[dateField]));
|
||||
for (const note of $notes) {
|
||||
if (!timestamps.has(note)) timestamps.set(note, Date.parse(note.meta[dateField]));
|
||||
}
|
||||
}
|
||||
|
||||
const sortFn = (a: NoteEntry, b: NoteEntry) => {
|
||||
|
||||
@@ -63,6 +63,7 @@ export interface VaultConfig {
|
||||
sync_on_open?: boolean;
|
||||
sync_on_change?: boolean;
|
||||
sync_interval_minutes?: number;
|
||||
sync_folder_requests?: number;
|
||||
last_sync_time?: string | null;
|
||||
last_backup_time?: string | null;
|
||||
}
|
||||
@@ -113,6 +114,7 @@ export interface AppConfig {
|
||||
system_dark_theme: string;
|
||||
accent_color: string | null;
|
||||
font_size: number | null;
|
||||
preferred_font_size?: number | null;
|
||||
scroll_to_change_font_size: boolean;
|
||||
toolbar_layout: ToolbarLayout | null;
|
||||
font_family: string | null;
|
||||
@@ -250,6 +252,8 @@ export interface BackupEntry {
|
||||
path: string;
|
||||
size: number;
|
||||
created: string;
|
||||
/** Made from a different vault folder; all vaults share one backup folder. */
|
||||
other_vault?: boolean;
|
||||
}
|
||||
|
||||
export interface VersionEntry {
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
import { getCurrentWebview } from '@tauri-apps/api/webview';
|
||||
import { isAndroid } from '$lib/platform';
|
||||
|
||||
// Interface scale (#288). The CSS is sized in desktop px, which reads too small on phones, so
|
||||
// Android starts one step up when the user hasn't picked a scale yet.
|
||||
export const defaultUiScale = isAndroid ? 1.15 : 1;
|
||||
|
||||
// Scaling up narrows the layout viewport. Keep it at least as wide as the widest mobile menus
|
||||
// (~290px) so they still fit on narrow phones. Uses the short side so rotating doesn't change it.
|
||||
const minAndroidLayoutWidth = 290;
|
||||
const maxAndroidUiScale =
|
||||
isAndroid && typeof screen !== 'undefined'
|
||||
? Math.max(1, Math.min(screen.width, screen.height) / minAndroidLayoutWidth)
|
||||
: Infinity;
|
||||
|
||||
export const uiScalePresets: { label: string; value: number }[] = isAndroid
|
||||
? [
|
||||
{ label: '100%', value: 1 },
|
||||
{ label: '115%', value: 1.15 },
|
||||
{ label: '125%', value: 1.25 },
|
||||
{ label: '140%', value: 1.4 },
|
||||
].filter((preset) => preset.value <= maxAndroidUiScale)
|
||||
: [
|
||||
{ label: '80%', value: 0.8 },
|
||||
{ label: '90%', value: 0.9 },
|
||||
{ label: '100%', value: 1 },
|
||||
{ label: '125%', value: 1.25 },
|
||||
{ label: '150%', value: 1.5 },
|
||||
{ label: '175%', value: 1.75 },
|
||||
{ label: '200%', value: 2 },
|
||||
];
|
||||
|
||||
// Android's WebView ignores setZoom (wry no-op), and CSS `zoom` would double-scale every popup
|
||||
// positioned from clientX/getBoundingClientRect. Pinning the viewport scale instead shrinks the
|
||||
// layout viewport, like the system "Display size" setting, so all coordinates stay in CSS px.
|
||||
// Needs useWideViewPort, which MainActivity enables.
|
||||
let androidUiScale = defaultUiScale;
|
||||
let androidResizeListenerInstalled = false;
|
||||
|
||||
function updateAndroidViewportScale() {
|
||||
const meta = document.querySelector('meta[name="viewport"]');
|
||||
if (!meta) return;
|
||||
const viewport = window.visualViewport;
|
||||
// WebView can keep its 980px fallback layout if only a scale is specified. Give it the
|
||||
// actual visible width in CSS px, including in landscape and split-screen windows.
|
||||
const availableWidth = Math.round(viewport ? viewport.width * viewport.scale : screen.width);
|
||||
const scale = Math.min(androidUiScale, maxAndroidUiScale, Math.max(1, availableWidth / minAndroidLayoutWidth));
|
||||
const width = Math.floor(availableWidth / scale);
|
||||
const content = `width=${width}, initial-scale=${scale}, minimum-scale=${scale}, maximum-scale=${scale}, user-scalable=no, viewport-fit=cover`;
|
||||
if (meta.getAttribute('content') !== content) meta.setAttribute('content', content);
|
||||
}
|
||||
|
||||
function applyAndroidViewportScale(scale: number) {
|
||||
androidUiScale = scale;
|
||||
updateAndroidViewportScale();
|
||||
if (!androidResizeListenerInstalled) {
|
||||
window.addEventListener('resize', updateAndroidViewportScale);
|
||||
androidResizeListenerInstalled = true;
|
||||
}
|
||||
}
|
||||
|
||||
export async function applyUiScale(scale: number) {
|
||||
if (isAndroid) {
|
||||
applyAndroidViewportScale(scale);
|
||||
return;
|
||||
}
|
||||
try {
|
||||
await getCurrentWebview().setZoom(scale);
|
||||
} catch (e) {
|
||||
console.error('Failed to apply interface scale:', e);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
/**
|
||||
* HTML copies are styled for the receiving document. Word, LibreOffice and many email
|
||||
* editors apply their own Normal paragraph style (typically 1.08 line spacing plus space
|
||||
* after) to bare `<p>` tags, so a copied note arrives with more vertical space than it has
|
||||
* in HelixNotes. Inline single spacing keeps the note's own blank lines as the only
|
||||
* paragraph spacing; the generated HTML stays semantic (p, h1, li, ...).
|
||||
*/
|
||||
|
||||
const COPY_BLOCK_TAGS = 'p|h[1-6]|li|blockquote';
|
||||
const COPY_BLOCK_STYLE = 'line-height:100%';
|
||||
const COPY_PARAGRAPH_STYLE = 'line-height:100%;margin:0';
|
||||
|
||||
/**
|
||||
* Add single-line spacing to the block elements of a copied HTML fragment. Appending the
|
||||
* declarations lets them win over any inline line-height or margin already on the element.
|
||||
*/
|
||||
export function applySingleLineSpacing(html: string): string {
|
||||
return html.replace(
|
||||
new RegExp(`<(${COPY_BLOCK_TAGS})\\b([^>]*)>`, 'gi'),
|
||||
(_match, tag: string, attributes: string) => {
|
||||
const blockStyle = tag.toLowerCase() === 'blockquote' ? COPY_BLOCK_STYLE : COPY_PARAGRAPH_STYLE;
|
||||
if (!/\bstyle\s*=/i.test(attributes)) {
|
||||
return `<${tag}${attributes} style="${blockStyle}">`;
|
||||
}
|
||||
const styled = attributes.replace(
|
||||
/\bstyle\s*=\s*(["'])(.*?)\1/i,
|
||||
(_styleMatch, quote: string, value: string) => {
|
||||
const existing = value.trim().replace(/;?\s*$/, '');
|
||||
return `style=${quote}${existing ? `${existing};` : ''}${blockStyle}${quote}`;
|
||||
},
|
||||
);
|
||||
return `<${tag}${styled}>`;
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,103 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import {
|
||||
classifyClipboardType,
|
||||
collectClipboardPayload,
|
||||
isEmptyPayload,
|
||||
needsNativeClipboard,
|
||||
pastedFileName,
|
||||
plainTextFromUriList,
|
||||
withNativeClipboard
|
||||
} from './clipboard-paste.ts';
|
||||
|
||||
const item = entries => ({
|
||||
types: Object.keys(entries),
|
||||
getType: async type => {
|
||||
const value = entries[type];
|
||||
return value instanceof Blob ? value : new Blob([value], { type });
|
||||
}
|
||||
});
|
||||
const png = new Blob([new Uint8Array([0x89, 0x50, 0x4e, 0x47])], { type: 'image/png' });
|
||||
|
||||
test('classifies text formats as text, attachments as files and metadata as ignored', () => {
|
||||
assert.equal(classifyClipboardType('text/plain'), 'plain');
|
||||
assert.equal(classifyClipboardType('text/plain;charset=utf-8'), 'plain');
|
||||
assert.equal(classifyClipboardType('TEXT/HTML'), 'html');
|
||||
for (const type of ['text/uri-list', 'text/rtf', 'text/x-moz-url', 'text/csv']) {
|
||||
assert.equal(classifyClipboardType(type), 'string', type);
|
||||
}
|
||||
for (const type of ['image/png', 'image/jpeg', 'image/svg+xml', 'application/pdf']) {
|
||||
assert.equal(classifyClipboardType(type), 'file', type);
|
||||
}
|
||||
for (const type of ['web application/x-custom', 'chromium/x-web-custom-data', 'application/x-moz-nativeimage', 'application/octet-stream', '']) {
|
||||
assert.equal(classifyClipboardType(type), 'ignore', type);
|
||||
}
|
||||
});
|
||||
|
||||
test('a copied link stays text and never becomes a uri-list attachment', async () => {
|
||||
const payload = await collectClipboardPayload([item({ 'text/uri-list': 'https://example.com/a\r\n' })]);
|
||||
assert.equal(payload.files.length, 0);
|
||||
assert.equal(payload.text, 'https://example.com/a');
|
||||
assert.deepEqual(payload.strings, [['text/uri-list', 'https://example.com/a\r\n']]);
|
||||
});
|
||||
|
||||
test('text/plain wins over the uri-list fallback', async () => {
|
||||
const payload = await collectClipboardPayload([item({ 'text/plain': 'Example', 'text/uri-list': 'https://example.com' })]);
|
||||
assert.equal(payload.text, 'Example');
|
||||
assert.equal(payload.files.length, 0);
|
||||
});
|
||||
|
||||
test('uri-list comments and blank lines are skipped', () => {
|
||||
assert.equal(plainTextFromUriList('# copied from browser\n\n https://a.example \nhttps://b.example'), 'https://a.example');
|
||||
assert.equal(plainTextFromUriList('# only a comment\n'), '');
|
||||
});
|
||||
|
||||
test('images and PDFs become named files alongside the text and HTML', async () => {
|
||||
const pdf = new Blob(['%PDF-1.7'], { type: 'application/pdf' });
|
||||
const payload = await collectClipboardPayload([
|
||||
item({ 'text/html': '<img src="https://example.com/cat.png">', 'image/png': png }),
|
||||
item({ 'application/pdf': pdf })
|
||||
]);
|
||||
assert.equal(payload.html, '<img src="https://example.com/cat.png">');
|
||||
assert.deepEqual(payload.files.map(file => [file.name, file.type]), [
|
||||
['pasted-image.png', 'image/png'],
|
||||
['pasted-file-2.pdf', 'application/pdf']
|
||||
]);
|
||||
assert.equal(isEmptyPayload(payload), false);
|
||||
});
|
||||
|
||||
test('metadata-only clipboards are empty and are never read', async () => {
|
||||
const read = [];
|
||||
const payload = await collectClipboardPayload([{
|
||||
types: ['chromium/x-web-custom-data', 'web application/x-custom'],
|
||||
getType: async type => { read.push(type); return new Blob(['x']); }
|
||||
}]);
|
||||
assert.deepEqual(read, []);
|
||||
assert.equal(isEmptyPayload(payload), true);
|
||||
});
|
||||
|
||||
test('pasted file names use friendly extensions', () => {
|
||||
assert.equal(pastedFileName('image/jpeg', 0), 'pasted-image.jpg');
|
||||
assert.equal(pastedFileName('image/svg+xml', 1), 'pasted-image-2.svg');
|
||||
assert.equal(pastedFileName('application/pdf', 0), 'pasted-file.pdf');
|
||||
});
|
||||
|
||||
test('formatting from other apps survives when the web clipboard only offers plain text (P6)', async () => {
|
||||
// WebKitGTK: navigator.clipboard.read() gives just text/plain for a web page copied in a browser.
|
||||
const web = await collectClipboardPayload([item({ 'text/plain': 'Bold link' })]);
|
||||
assert.equal(needsNativeClipboard(web), true);
|
||||
const merged = withNativeClipboard(web, { text: 'Bold link (native)', html: '<b>Bold</b> <a href="https://x.example">link</a>' });
|
||||
assert.equal(merged.html, '<b>Bold</b> <a href="https://x.example">link</a>');
|
||||
assert.equal(merged.text, 'Bold link', 'web text is kept when present');
|
||||
});
|
||||
|
||||
test('a failed web clipboard read falls back to native text and HTML entirely', () => {
|
||||
assert.equal(needsNativeClipboard(null), true);
|
||||
assert.deepEqual(withNativeClipboard(null, { text: 'plain', html: null }), { text: 'plain', html: '', strings: [], files: [] });
|
||||
assert.equal(isEmptyPayload(withNativeClipboard(null, {})), true, 'nothing textual: the native image read comes next');
|
||||
});
|
||||
|
||||
test('the native clipboard is not consulted when the web clipboard already has HTML or files', async () => {
|
||||
assert.equal(needsNativeClipboard(await collectClipboardPayload([item({ 'text/html': '<b>x</b>' })])), false);
|
||||
assert.equal(needsNativeClipboard(await collectClipboardPayload([item({ 'image/png': png })])), false);
|
||||
});
|
||||
@@ -0,0 +1,117 @@
|
||||
/**
|
||||
* Turns what the async clipboard API (`navigator.clipboard.read()`) returns into the data a keyboard
|
||||
* paste would carry, so the editor's context-menu Paste can replay it as a real paste event.
|
||||
*
|
||||
* The clipboard holds many representations of one copy: plain text, HTML, URI lists, bitmaps, and
|
||||
* browser/OS bookkeeping formats. Only actual attachments may become files. Text formats such as
|
||||
* `text/uri-list` stay text, and unknown metadata is dropped. Turning them into files would insert
|
||||
* junk attachments like `pasted-0.uri-list`.
|
||||
*/
|
||||
|
||||
/** How one clipboard MIME type is pasted. */
|
||||
export type ClipboardTypeRole = 'plain' | 'html' | 'string' | 'file' | 'ignore';
|
||||
|
||||
/** Attachment types a keyboard paste would deliver as files (see `insertFile` in Editor.svelte). */
|
||||
const FILE_TYPES = /^(?:image\/[\w.+-]+|application\/pdf)$/;
|
||||
|
||||
/** Strips parameters (`text/plain;charset=utf-8`) and case. */
|
||||
export function normalizeClipboardType(type: string): string {
|
||||
return type.split(';')[0].trim().toLowerCase();
|
||||
}
|
||||
|
||||
export function classifyClipboardType(type: string): ClipboardTypeRole {
|
||||
const mime = normalizeClipboardType(type);
|
||||
if (mime === 'text/plain') return 'plain';
|
||||
if (mime === 'text/html') return 'html';
|
||||
// Other text formats (uri-list, rtf, x-moz-url, ...) are string data on the paste event, never files.
|
||||
if (/^text\/[\w.+-]+$/.test(mime)) return 'string';
|
||||
if (FILE_TYPES.test(mime)) return 'file';
|
||||
// `web ...` custom formats, chromium/..., application/x-..., and anything else unrecognized.
|
||||
return 'ignore';
|
||||
}
|
||||
|
||||
/** First URI of an RFC 2483 `text/uri-list`. Lines starting with `#` are comments. */
|
||||
export function plainTextFromUriList(list: string): string {
|
||||
for (const line of list.split(/\r?\n/)) {
|
||||
const uri = line.trim();
|
||||
if (uri && !uri.startsWith('#')) return uri;
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
const EXTENSIONS: Record<string, string> = { 'image/jpeg': 'jpg', 'image/svg+xml': 'svg', 'application/pdf': 'pdf' };
|
||||
|
||||
/** File name for a pasted attachment, matching the `pasted-image.png` name of the native image fallback. */
|
||||
export function pastedFileName(type: string, index: number): string {
|
||||
const mime = normalizeClipboardType(type);
|
||||
const extension = EXTENSIONS[mime] ?? (mime.split('/')[1]?.replace(/[^\w]/g, '') || 'bin');
|
||||
const base = mime.startsWith('image/') ? 'pasted-image' : 'pasted-file';
|
||||
return `${base}${index > 0 ? `-${index + 1}` : ''}.${extension}`;
|
||||
}
|
||||
|
||||
export interface ClipboardItemLike {
|
||||
readonly types: readonly string[];
|
||||
getType(type: string): Promise<Blob>;
|
||||
}
|
||||
|
||||
export interface ClipboardPastePayload {
|
||||
text: string;
|
||||
html: string;
|
||||
/** Other text formats, keyed by normalized MIME type. */
|
||||
strings: [type: string, value: string][];
|
||||
files: File[];
|
||||
}
|
||||
|
||||
/** Web clipboard data still missing formats a keyboard paste would carry, so the native clipboard is needed. */
|
||||
export function needsNativeClipboard(payload: ClipboardPastePayload | null): boolean {
|
||||
return !payload || (!payload.html && payload.files.length === 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fill in what the web clipboard didn't provide from the native clipboard. WebKitGTK often returns
|
||||
* nothing, or only `text/plain`, for content copied from other applications; Ctrl+V would still
|
||||
* have received the HTML (formatting, links), so a paste without it is not the same paste.
|
||||
*/
|
||||
export function withNativeClipboard(
|
||||
payload: ClipboardPastePayload | null,
|
||||
native: { text?: string | null; html?: string | null },
|
||||
): ClipboardPastePayload {
|
||||
return {
|
||||
text: payload?.text || native.text || '',
|
||||
html: payload?.html || native.html || '',
|
||||
strings: payload?.strings ?? [],
|
||||
files: payload?.files ?? [],
|
||||
};
|
||||
}
|
||||
|
||||
export function isEmptyPayload(payload: ClipboardPastePayload): boolean {
|
||||
return !payload.text && !payload.html && payload.files.length === 0;
|
||||
}
|
||||
|
||||
/** Reads every clipboard item into paste data, classifying each representation. */
|
||||
export async function collectClipboardPayload(items: readonly ClipboardItemLike[]): Promise<ClipboardPastePayload> {
|
||||
const payload: ClipboardPastePayload = { text: '', html: '', strings: [], files: [] };
|
||||
for (const item of items) {
|
||||
for (const type of item.types) {
|
||||
const role = classifyClipboardType(type);
|
||||
if (role === 'ignore') continue;
|
||||
const blob = await item.getType(type);
|
||||
if (role === 'file') {
|
||||
const mime = normalizeClipboardType(type);
|
||||
payload.files.push(new File([blob], pastedFileName(mime, payload.files.length), { type: mime }));
|
||||
continue;
|
||||
}
|
||||
const value = await blob.text();
|
||||
if (!value) continue;
|
||||
if (role === 'plain') payload.text ||= value;
|
||||
else if (role === 'html') payload.html ||= value;
|
||||
else payload.strings.push([normalizeClipboardType(type), value]);
|
||||
}
|
||||
}
|
||||
// Some apps offer a copied link only as a URI list. Paste the link as text instead of nothing.
|
||||
if (!payload.text) {
|
||||
const uriList = payload.strings.find(([type]) => type === 'text/uri-list');
|
||||
if (uriList) payload.text = plainTextFromUriList(uriList[1]);
|
||||
}
|
||||
return payload;
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { buildGraphTopology, getGraphNeighborhood } from './graph-topology.ts';
|
||||
|
||||
const edge = (sourceIdx, targetIdx) => ({ sourceIdx, targetIdx });
|
||||
|
||||
function scannedNeighborhood(nodeIdx, edges) {
|
||||
const nodeSet = new Set();
|
||||
const edgeSet = new Set();
|
||||
if (nodeIdx < 0) return { nodeSet, edgeSet };
|
||||
nodeSet.add(nodeIdx);
|
||||
edges.forEach((e, i) => {
|
||||
if (e.sourceIdx === nodeIdx || e.targetIdx === nodeIdx) {
|
||||
edgeSet.add(i);
|
||||
nodeSet.add(e.sourceIdx);
|
||||
nodeSet.add(e.targetIdx);
|
||||
}
|
||||
});
|
||||
return { nodeSet, edgeSet };
|
||||
}
|
||||
|
||||
test('topology retains duplicate edges and counts self-edges twice in degree but once in adjacency', () => {
|
||||
const edges = [edge(0, 1), edge(0, 1), edge(1, 0), edge(0, 0), edge(2, 2)];
|
||||
const topology = buildGraphTopology(4, edges);
|
||||
assert.deepEqual(topology.incidentEdges, [[0, 1, 2, 3], [0, 1, 2], [4], []]);
|
||||
assert.deepEqual(topology.nodeDegree, [5, 3, 2, 0]);
|
||||
assert.deepEqual(topology.connectedSet, new Set([0, 1, 2]));
|
||||
assert.deepEqual(getGraphNeighborhood(0, edges, topology.incidentEdges), {
|
||||
nodeSet: new Set([0, 1]),
|
||||
edgeSet: new Set([0, 1, 2, 3]),
|
||||
});
|
||||
});
|
||||
|
||||
test('changing active nodes produces only direct neighbors without changing prior sets', () => {
|
||||
const edges = [edge(0, 1), edge(2, 1), edge(2, 3), edge(3, 4)];
|
||||
const { incidentEdges } = buildGraphTopology(6, edges);
|
||||
const first = getGraphNeighborhood(0, edges, incidentEdges);
|
||||
const second = getGraphNeighborhood(2, edges, incidentEdges);
|
||||
assert.deepEqual(first, { nodeSet: new Set([0, 1]), edgeSet: new Set([0]) });
|
||||
assert.deepEqual(second, { nodeSet: new Set([2, 1, 3]), edgeSet: new Set([1, 2]) });
|
||||
assert.deepEqual(getGraphNeighborhood(5, edges, incidentEdges), {
|
||||
nodeSet: new Set([5]), edgeSet: new Set(),
|
||||
});
|
||||
assert.deepEqual(getGraphNeighborhood(-1, edges, incidentEdges), {
|
||||
nodeSet: new Set(), edgeSet: new Set(),
|
||||
});
|
||||
});
|
||||
|
||||
test('rebuilding topology uses the replacement edges for the same active node', () => {
|
||||
const beforeEdges = [edge(0, 1)];
|
||||
const afterEdges = [edge(2, 0), edge(0, 0)];
|
||||
const before = buildGraphTopology(3, beforeEdges);
|
||||
const after = buildGraphTopology(3, afterEdges);
|
||||
assert.deepEqual(getGraphNeighborhood(0, beforeEdges, before.incidentEdges), {
|
||||
nodeSet: new Set([0, 1]), edgeSet: new Set([0]),
|
||||
});
|
||||
assert.deepEqual(getGraphNeighborhood(0, afterEdges, after.incidentEdges), {
|
||||
nodeSet: new Set([0, 2]), edgeSet: new Set([0, 1]),
|
||||
});
|
||||
});
|
||||
|
||||
test('indexed neighborhoods match full scans for directed, duplicate and self edges', () => {
|
||||
const edges = Array.from({ length: 150 }, (_, i) => edge(i % 13, (i * 7 + 3) % 13));
|
||||
edges.push(edge(0, 0), edge(0, 1), edge(0, 1));
|
||||
const { incidentEdges } = buildGraphTopology(14, edges);
|
||||
for (let nodeIdx = -1; nodeIdx < 14; nodeIdx++) {
|
||||
assert.deepEqual(getGraphNeighborhood(nodeIdx, edges, incidentEdges), scannedNeighborhood(nodeIdx, edges));
|
||||
}
|
||||
});
|
||||
|
||||
test('construction reads each endpoint once and neighborhood work visits only incident edges', () => {
|
||||
let endpointReads = 0;
|
||||
const pairs = [[0, 1], [0, 0], [2, 0], ...Array.from({ length: 1000 }, () => [2, 3])];
|
||||
const edges = pairs.map(([source, target]) => ({
|
||||
get sourceIdx() { endpointReads++; return source; },
|
||||
get targetIdx() { endpointReads++; return target; },
|
||||
}));
|
||||
const { incidentEdges } = buildGraphTopology(5, edges);
|
||||
assert.equal(endpointReads, edges.length * 2);
|
||||
endpointReads = 0;
|
||||
assert.deepEqual(getGraphNeighborhood(0, edges, incidentEdges), {
|
||||
nodeSet: new Set([0, 1, 2]), edgeSet: new Set([0, 1, 2]),
|
||||
});
|
||||
assert.equal(endpointReads, 6);
|
||||
endpointReads = 0;
|
||||
getGraphNeighborhood(4, edges, incidentEdges);
|
||||
getGraphNeighborhood(-1, edges, incidentEdges);
|
||||
assert.equal(endpointReads, 0);
|
||||
});
|
||||
|
||||
test('an empty graph has no degree, adjacency or neighborhood entries', () => {
|
||||
const topology = buildGraphTopology(0, []);
|
||||
assert.deepEqual(topology, { incidentEdges: [], nodeDegree: [], connectedSet: new Set() });
|
||||
assert.deepEqual(getGraphNeighborhood(-1, [], topology.incidentEdges), {
|
||||
nodeSet: new Set(), edgeSet: new Set(),
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,40 @@
|
||||
interface GraphTopologyEdge {
|
||||
sourceIdx: number;
|
||||
targetIdx: number;
|
||||
}
|
||||
|
||||
export function buildGraphTopology(nodeCount: number, edges: readonly GraphTopologyEdge[]) {
|
||||
const incidentEdges: number[][] = Array.from({ length: nodeCount }, () => []);
|
||||
const nodeDegree = new Array<number>(nodeCount).fill(0);
|
||||
const connectedSet = new Set<number>();
|
||||
for (let i = 0; i < edges.length; i++) {
|
||||
const { sourceIdx, targetIdx } = edges[i];
|
||||
connectedSet.add(sourceIdx);
|
||||
connectedSet.add(targetIdx);
|
||||
nodeDegree[sourceIdx]++;
|
||||
nodeDegree[targetIdx]++;
|
||||
incidentEdges[sourceIdx].push(i);
|
||||
// A self-edge contributes twice to degree, but only once to the neighborhood.
|
||||
if (targetIdx !== sourceIdx) incidentEdges[targetIdx].push(i);
|
||||
}
|
||||
return { incidentEdges, nodeDegree, connectedSet };
|
||||
}
|
||||
|
||||
export function getGraphNeighborhood(
|
||||
nodeIdx: number,
|
||||
edges: readonly GraphTopologyEdge[],
|
||||
incidentEdges: readonly (readonly number[])[],
|
||||
) {
|
||||
const nodeSet = new Set<number>();
|
||||
const edgeSet = new Set<number>();
|
||||
const incident = incidentEdges[nodeIdx];
|
||||
if (!incident) return { nodeSet, edgeSet };
|
||||
nodeSet.add(nodeIdx);
|
||||
for (const i of incident) {
|
||||
const edge = edges[i];
|
||||
edgeSet.add(i);
|
||||
nodeSet.add(edge.sourceIdx);
|
||||
nodeSet.add(edge.targetIdx);
|
||||
}
|
||||
return { nodeSet, edgeSet };
|
||||
}
|
||||
@@ -0,0 +1,340 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { comparableBody, compareHistory, splitSnapshot } from './history-comparison.ts';
|
||||
|
||||
function rowsOf(comparison) {
|
||||
return comparison.chunks.flatMap((chunk) => chunk.rows);
|
||||
}
|
||||
|
||||
async function compare(current, snapshot) {
|
||||
const comparison = await compareHistory(current, snapshot);
|
||||
const rows = rowsOf(comparison);
|
||||
const normalize = (body) => body.replace(/\r\n/g, '\n');
|
||||
const restoreText = (excludedKind) => rows
|
||||
.filter((row) => row.kind !== excludedKind)
|
||||
.map((row) => row.text + (row.newline ? '\n' : ''))
|
||||
.join('');
|
||||
|
||||
assert.equal(restoreText('added'), normalize(current), 'all current content is retained');
|
||||
assert.equal(restoreText('removed'), normalize(snapshot), 'all snapshot content is retained');
|
||||
assert.equal(comparison.added, rows.filter((row) => row.kind === 'added').length);
|
||||
assert.equal(comparison.removed, rows.filter((row) => row.kind === 'removed').length);
|
||||
|
||||
let currentLine = 1;
|
||||
let snapshotLine = 1;
|
||||
for (const row of rows) {
|
||||
assert.equal(row.currentLine, row.kind === 'added' ? null : currentLine++);
|
||||
assert.equal(row.snapshotLine, row.kind === 'removed' ? null : snapshotLine++);
|
||||
assert.equal(typeof row.newline, 'boolean');
|
||||
assert.equal(row.text.includes('\n'), false);
|
||||
}
|
||||
for (let index = 0; index < comparison.chunks.length; index++) {
|
||||
const chunk = comparison.chunks[index];
|
||||
assert.ok(chunk.rows.length > 0, 'empty chunks are not displayed');
|
||||
assert.notEqual(chunk.kind, comparison.chunks[index - 1]?.kind, 'adjacent chunks are merged');
|
||||
if (chunk.kind === 'unchanged') {
|
||||
assert.ok(chunk.rows.every((row) => row.kind === 'same'));
|
||||
}
|
||||
}
|
||||
return comparison;
|
||||
}
|
||||
|
||||
function lines(count) {
|
||||
return Array.from({ length: count }, (_, index) => `line ${index + 1}`);
|
||||
}
|
||||
|
||||
function document(lines) {
|
||||
return lines.join('\n') + '\n';
|
||||
}
|
||||
|
||||
test('restoring a snapshot adds snapshot-only lines and removes current-only lines', async () => {
|
||||
const comparison = await compare('keep\nlive\n', 'keep\narchived\nextra\n');
|
||||
assert.equal(comparison.added, 2);
|
||||
assert.equal(comparison.removed, 1);
|
||||
assert.deepEqual(rowsOf(comparison).map((row) => [row.kind, row.text]), [
|
||||
['same', 'keep'],
|
||||
['removed', 'live'],
|
||||
['added', 'archived'],
|
||||
['added', 'extra'],
|
||||
]);
|
||||
});
|
||||
|
||||
test('insertion keeps both line-number columns aligned with their own documents', async () => {
|
||||
const comparison = await compare('first\nlast', 'first\ninserted\nlast');
|
||||
assert.deepEqual(rowsOf(comparison), [
|
||||
{ kind: 'same', text: 'first', currentLine: 1, snapshotLine: 1, newline: true },
|
||||
{ kind: 'added', text: 'inserted', currentLine: null, snapshotLine: 2, newline: true },
|
||||
{ kind: 'same', text: 'last', currentLine: 2, snapshotLine: 3, newline: false },
|
||||
]);
|
||||
});
|
||||
|
||||
test('deletion leaves snapshot line numbers unchanged by removed rows', async () => {
|
||||
const comparison = await compare('first\ndeleted\nlast', 'first\nlast');
|
||||
assert.deepEqual(rowsOf(comparison), [
|
||||
{ kind: 'same', text: 'first', currentLine: 1, snapshotLine: 1, newline: true },
|
||||
{ kind: 'removed', text: 'deleted', currentLine: 2, snapshotLine: null, newline: true },
|
||||
{ kind: 'same', text: 'last', currentLine: 3, snapshotLine: 2, newline: false },
|
||||
]);
|
||||
});
|
||||
|
||||
test('replacement presents the current line before its snapshot replacement', async () => {
|
||||
const comparison = await compare('first\nlive\nlast\n', 'first\narchived\nlast\n');
|
||||
assert.deepEqual(rowsOf(comparison), [
|
||||
{ kind: 'same', text: 'first', currentLine: 1, snapshotLine: 1, newline: true },
|
||||
{ kind: 'removed', text: 'live', currentLine: 2, snapshotLine: null, newline: true },
|
||||
{ kind: 'added', text: 'archived', currentLine: null, snapshotLine: 2, newline: true },
|
||||
{ kind: 'same', text: 'last', currentLine: 3, snapshotLine: 3, newline: true },
|
||||
]);
|
||||
});
|
||||
|
||||
test('empty bodies and blank lines remain distinct without phantom trailing rows', async () => {
|
||||
const cases = [
|
||||
['', '', 0, 0],
|
||||
['', '\n', 1, 0],
|
||||
['\n', '', 0, 1],
|
||||
['', '\n\n', 2, 0],
|
||||
['\n', '\n', 0, 0],
|
||||
['\n\n', '\n', 0, 1],
|
||||
['', 'text', 1, 0],
|
||||
['text', '', 0, 1],
|
||||
];
|
||||
for (const [current, snapshot, added, removed] of cases) {
|
||||
const comparison = await compare(current, snapshot);
|
||||
assert.equal(comparison.added, added);
|
||||
assert.equal(comparison.removed, removed);
|
||||
}
|
||||
assert.deepEqual((await compare('', '')).chunks, []);
|
||||
assert.deepEqual(rowsOf(await compare('', '\n')), [
|
||||
{ kind: 'added', text: '', currentLine: null, snapshotLine: 1, newline: true },
|
||||
]);
|
||||
});
|
||||
|
||||
test('adding a final newline is visible even when the line text is identical', async () => {
|
||||
const comparison = await compare('last', 'last\n');
|
||||
assert.equal(comparison.added, 1);
|
||||
assert.equal(comparison.removed, 1);
|
||||
assert.deepEqual(rowsOf(comparison), [
|
||||
{ kind: 'removed', text: 'last', currentLine: 1, snapshotLine: null, newline: false },
|
||||
{ kind: 'added', text: 'last', currentLine: null, snapshotLine: 1, newline: true },
|
||||
]);
|
||||
});
|
||||
|
||||
test('removing a final newline retains the visible missing-newline flag', async () => {
|
||||
const comparison = await compare('last\n', 'last');
|
||||
assert.deepEqual(rowsOf(comparison).map((row) => [row.kind, row.text, row.newline]), [
|
||||
['removed', 'last', true],
|
||||
['added', 'last', false],
|
||||
]);
|
||||
});
|
||||
|
||||
test('CRLF-only differences compare equal, including blank lines and the final newline', async () => {
|
||||
const comparison = await compare('first\r\n\r\nlast\r\n', 'first\n\nlast\n');
|
||||
assert.equal(comparison.added, 0);
|
||||
assert.equal(comparison.removed, 0);
|
||||
assert.deepEqual(rowsOf(comparison).map((row) => [row.text, row.newline]), [
|
||||
['first', true], ['', true], ['last', true],
|
||||
]);
|
||||
const withoutFinalNewline = await compare('last\r\n', 'last');
|
||||
assert.equal(withoutFinalNewline.added, 1);
|
||||
assert.equal(withoutFinalNewline.removed, 1);
|
||||
});
|
||||
|
||||
test('whitespace and standalone carriage returns are not ignored', async () => {
|
||||
const whitespace = await compare('same \n\t\nlast', 'same\n \nlast');
|
||||
assert.equal(whitespace.added, 2);
|
||||
assert.equal(whitespace.removed, 2);
|
||||
const carriageReturn = await compare('first\rlast', 'firstlast');
|
||||
assert.equal(carriageReturn.added, 1);
|
||||
assert.equal(carriageReturn.removed, 1);
|
||||
assert.equal(rowsOf(carriageReturn)[0].text, 'first\rlast');
|
||||
});
|
||||
|
||||
test('snapshot splitting retains raw BOM/CRLF metadata and untouched body bytes', () => {
|
||||
const metadata = '\uFEFF---\r\ntitle: Snapshot\r\ndescription: "inline --- stays here"\r\n---\r\n';
|
||||
const body = '# Body\r\n\r\n---\r\ntrailing spaces ';
|
||||
assert.deepEqual(splitSnapshot(metadata + body), { metadata, body });
|
||||
});
|
||||
|
||||
test('frontmatter closes only at a complete delimiter line, not inline YAML values', () => {
|
||||
const metadata = '---\ntitle: "before --- after"\nother: ---\n---\n';
|
||||
const body = 'body\n---\nremaining body\n';
|
||||
assert.deepEqual(splitSnapshot(metadata + body), { metadata, body });
|
||||
assert.deepEqual(splitSnapshot('---\n---'), { metadata: '---\n---', body: '' });
|
||||
assert.deepEqual(splitSnapshot('---\ntitle: archived\n---'), {
|
||||
metadata: '---\ntitle: archived\n---', body: '',
|
||||
});
|
||||
});
|
||||
|
||||
test('incomplete, nonleading and non-line delimiters remain entirely in the body', () => {
|
||||
const bodies = [
|
||||
'',
|
||||
'---',
|
||||
'---\ntitle: "inline --- is not a closing line"\nbody',
|
||||
'---\ntitle: archived\n--- suffix\nbody',
|
||||
'---\ntitle: archived\r---\nbody',
|
||||
'---\ntitle: archived\n---\r',
|
||||
'intro\n---\ntitle: archived\n---\nbody',
|
||||
' ---\ntitle: archived\n---\nbody',
|
||||
'\uFEFFbody\r\n',
|
||||
];
|
||||
for (const body of bodies) {
|
||||
assert.deepEqual(splitSnapshot(body), { body, metadata: '' });
|
||||
}
|
||||
});
|
||||
|
||||
test('metadata changes do not become body changes when consumers compare split bodies', async () => {
|
||||
const current = splitSnapshot('---\ntitle: Live\ntags: [live]\n---\nsame body\n');
|
||||
const snapshot = splitSnapshot('---\ntitle: Archived\ntags: [old]\n---\nsame body\n');
|
||||
const comparison = await compare(current.body, snapshot.body);
|
||||
assert.notEqual(current.metadata, snapshot.metadata);
|
||||
assert.equal(comparison.added, 0);
|
||||
assert.equal(comparison.removed, 0);
|
||||
});
|
||||
|
||||
test('long edge runs retain all hidden rows with exactly three visible context lines', async () => {
|
||||
const current = lines(25);
|
||||
const snapshot = [...current];
|
||||
snapshot[12] = 'archived line 13';
|
||||
const comparison = await compare(document(current), document(snapshot));
|
||||
assert.deepEqual(comparison.chunks.map((chunk) => [chunk.kind, chunk.rows.length]), [
|
||||
['unchanged', 9], ['lines', 8], ['unchanged', 9],
|
||||
]);
|
||||
assert.deepEqual(comparison.chunks[1].rows.map((row) => row.text), [
|
||||
'line 10', 'line 11', 'line 12', 'line 13', 'archived line 13',
|
||||
'line 14', 'line 15', 'line 16',
|
||||
]);
|
||||
assert.deepEqual(comparison.chunks[0].rows.map((row) => row.currentLine), [1, 2, 3, 4, 5, 6, 7, 8, 9]);
|
||||
assert.deepEqual(comparison.chunks[2].rows.map((row) => row.snapshotLine), [17, 18, 19, 20, 21, 22, 23, 24, 25]);
|
||||
});
|
||||
|
||||
test('long middle runs preserve three context rows on each side for expansion', async () => {
|
||||
const current = lines(16);
|
||||
const snapshot = [...current];
|
||||
snapshot[0] = 'archived first';
|
||||
snapshot[15] = 'archived last';
|
||||
const comparison = await compare(document(current), document(snapshot));
|
||||
assert.deepEqual(comparison.chunks.map((chunk) => [chunk.kind, chunk.rows.length]), [
|
||||
['lines', 5], ['unchanged', 8], ['lines', 5],
|
||||
]);
|
||||
assert.deepEqual(comparison.chunks[0].rows.filter((row) => row.kind === 'same').map((row) => row.text), [
|
||||
'line 2', 'line 3', 'line 4',
|
||||
]);
|
||||
assert.deepEqual(comparison.chunks[1].rows.map((row) => row.text), current.slice(4, 12));
|
||||
assert.deepEqual(comparison.chunks[2].rows.filter((row) => row.kind === 'same').map((row) => row.text), [
|
||||
'line 13', 'line 14', 'line 15',
|
||||
]);
|
||||
});
|
||||
|
||||
test('overlapping context is not duplicated and the seventh middle line can collapse', async () => {
|
||||
for (const unchangedCount of [6, 7]) {
|
||||
const current = ['live first', ...lines(unchangedCount), 'live last'];
|
||||
const snapshot = ['archived first', ...lines(unchangedCount), 'archived last'];
|
||||
const comparison = await compare(document(current), document(snapshot));
|
||||
const hidden = comparison.chunks.filter((chunk) => chunk.kind === 'unchanged');
|
||||
assert.equal(hidden.length, unchangedCount === 6 ? 0 : 1);
|
||||
if (hidden.length) assert.deepEqual(hidden[0].rows.map((row) => row.text), ['line 4']);
|
||||
assert.equal(rowsOf(comparison).filter((row) => row.kind === 'same').length, unchangedCount);
|
||||
}
|
||||
});
|
||||
|
||||
test('identical notes have zero additions/removals and retain long unchanged content', async () => {
|
||||
const short = await compare('same\nbody', 'same\nbody');
|
||||
assert.equal(short.added, 0);
|
||||
assert.equal(short.removed, 0);
|
||||
assert.deepEqual(short.chunks.map((chunk) => chunk.kind), ['lines']);
|
||||
|
||||
const body = document(lines(3000));
|
||||
const long = await compare(body, body);
|
||||
assert.equal(long.added, 0);
|
||||
assert.equal(long.removed, 0);
|
||||
assert.deepEqual(long.chunks.map((chunk) => [chunk.kind, chunk.rows.length]), [['unchanged', 3000]]);
|
||||
});
|
||||
|
||||
test('large notes preserve hidden content as well as an appended snapshot line', async () => {
|
||||
const current = document(lines(3000));
|
||||
const comparison = await compare(current, current + 'appended\n');
|
||||
assert.equal(comparison.added, 1);
|
||||
assert.equal(comparison.removed, 0);
|
||||
assert.deepEqual(comparison.chunks.map((chunk) => [chunk.kind, chunk.rows.length]), [
|
||||
['unchanged', 2997], ['lines', 4],
|
||||
]);
|
||||
});
|
||||
|
||||
test('comparable bodies ignore only leading and trailing blank lines', () => {
|
||||
assert.equal(comparableBody(''), '');
|
||||
assert.equal(comparableBody('\n\n'), '');
|
||||
assert.equal(comparableBody('body'), 'body\n');
|
||||
assert.equal(comparableBody('\n\n# T\nbody\n\n'), '# T\nbody\n');
|
||||
assert.equal(comparableBody('\r\n# T\r\nbody\r\n'), '# T\r\nbody\n');
|
||||
assert.equal(comparableBody('a\n\n\nb'), 'a\n\n\nb\n');
|
||||
assert.equal(comparableBody(comparableBody('x\n')), 'x\n');
|
||||
});
|
||||
|
||||
test('a stripped current body matches a snapshot that keeps its file whitespace', async () => {
|
||||
// The app hands the review the note body without edge newlines; the stored snapshot keeps them.
|
||||
const current = '# T\nbody';
|
||||
for (const raw of [
|
||||
'---\ntitle: T\n---\n# T\nbody\n',
|
||||
'---\ntitle: T\n---\n\n# T\nbody\n',
|
||||
'---\r\ntitle: T\r\n---\r\n\r\n# T\r\nbody\r\n',
|
||||
]) {
|
||||
const comparison = await compareHistory(comparableBody(current), comparableBody(splitSnapshot(raw).body));
|
||||
assert.equal(comparison.added, 0, JSON.stringify(raw));
|
||||
assert.equal(comparison.removed, 0, JSON.stringify(raw));
|
||||
}
|
||||
const changed = await compareHistory(
|
||||
comparableBody(current),
|
||||
comparableBody(splitSnapshot('---\ntitle: T\n---\n# T\nedited\n').body),
|
||||
);
|
||||
assert.deepEqual([changed.added, changed.removed], [1, 1]);
|
||||
assert.deepEqual(
|
||||
rowsOf(changed).filter((row) => row.kind !== 'same').map((row) => [row.kind, row.text]),
|
||||
[['removed', 'body'], ['added', 'edited']],
|
||||
);
|
||||
});
|
||||
|
||||
const numbered = (count, prefix) => Array.from({ length: count }, (_, index) => `${prefix} ${index}`).join('\n') + '\n';
|
||||
|
||||
test('a heavily rewritten note is compared quickly and still reports every change', async () => {
|
||||
const started = performance.now();
|
||||
const comparison = await compare(numbered(1000, 'old line'), numbered(1000, 'new text'));
|
||||
assert.ok(performance.now() - started < 1500, 'the comparison must not wait on timers per edit');
|
||||
assert.equal(comparison.added, 1000);
|
||||
assert.equal(comparison.removed, 1000);
|
||||
});
|
||||
|
||||
test('beyond the diff limit, shared start and end lines stay unchanged and the middle is replaced', async () => {
|
||||
const head = numbered(100, 'same start');
|
||||
const tail = numbered(100, 'same end');
|
||||
const current = head + numbered(2500, 'old middle') + tail;
|
||||
const snapshot = head + numbered(1800, 'new middle') + tail;
|
||||
const started = performance.now();
|
||||
const comparison = await compare(current, snapshot);
|
||||
assert.ok(performance.now() - started < 1500);
|
||||
assert.equal(comparison.removed, 2500);
|
||||
assert.equal(comparison.added, 1800);
|
||||
assert.equal(rowsOf(comparison).filter((row) => row.kind === 'same').length, 200);
|
||||
assert.equal(rowsOf(comparison)[0].text, 'same start 0');
|
||||
assert.equal(rowsOf(comparison).at(-1).text, 'same end 99');
|
||||
});
|
||||
|
||||
test('the coarse fallback handles CRLF, missing final newlines and empty sides', async () => {
|
||||
const big = numbered(2000, 'a').replace(/\n/g, '\r\n');
|
||||
const other = numbered(2000, 'b');
|
||||
const crlf = await compare(big, other);
|
||||
assert.equal(crlf.added + crlf.removed, 4000);
|
||||
const noFinalNewline = await compare(numbered(1500, 'a').slice(0, -1), numbered(1500, 'b').slice(0, -1));
|
||||
assert.equal(noFinalNewline.added, 1500);
|
||||
assert.equal(rowsOf(noFinalNewline).at(-1).newline, false);
|
||||
const empty = await compare('', numbered(2000, 'b'));
|
||||
assert.deepEqual([empty.added, empty.removed], [2000, 0]);
|
||||
const emptied = await compare(numbered(2000, 'b'), '');
|
||||
assert.deepEqual([emptied.added, emptied.removed], [0, 2000]);
|
||||
});
|
||||
|
||||
test('differences under the limit still use the minimal line diff', async () => {
|
||||
const current = numbered(5000, 'line');
|
||||
const snapshot = current.replace('line 10\n', 'edited 10\n').replace('line 4000\n', 'edited 4000\n');
|
||||
const comparison = await compare(current, snapshot);
|
||||
assert.deepEqual([comparison.added, comparison.removed], [2, 2]);
|
||||
});
|
||||
@@ -0,0 +1,127 @@
|
||||
import { diffLines, type Change } from 'diff';
|
||||
|
||||
export interface HistoryRow {
|
||||
kind: 'same' | 'added' | 'removed';
|
||||
text: string;
|
||||
currentLine: number | null;
|
||||
snapshotLine: number | null;
|
||||
/** Whether this line has a terminating LF; CRLF is normalized for comparison. */
|
||||
newline: boolean;
|
||||
}
|
||||
|
||||
export interface HistoryChunk {
|
||||
kind: 'lines' | 'unchanged';
|
||||
rows: HistoryRow[];
|
||||
}
|
||||
|
||||
export interface HistoryComparison {
|
||||
added: number;
|
||||
removed: number;
|
||||
chunks: HistoryChunk[];
|
||||
}
|
||||
|
||||
/** Separate only a complete leading frontmatter block, keeping both slices verbatim. */
|
||||
export function splitSnapshot(raw: string): { body: string; metadata: string } {
|
||||
const opening = /^(?:\uFEFF)?---\r?\n/.exec(raw);
|
||||
if (!opening) return { body: raw, metadata: '' };
|
||||
|
||||
const closingDelimiter = /\n---(?:\r?\n|$)/g;
|
||||
closingDelimiter.lastIndex = opening[0].length - 1;
|
||||
const closing = closingDelimiter.exec(raw);
|
||||
if (!closing) return { body: raw, metadata: '' };
|
||||
|
||||
const bodyStart = closing.index + closing[0].length;
|
||||
return { body: raw.slice(bodyStart), metadata: raw.slice(0, bodyStart) };
|
||||
}
|
||||
|
||||
/**
|
||||
* Make two note bodies comparable. The note body the app loads has its leading and trailing
|
||||
* blank lines removed, while a stored snapshot keeps the file's exact text, so differences in
|
||||
* those lines are not changes the editor can show or restore.
|
||||
*/
|
||||
export function comparableBody(body: string): string {
|
||||
const trimmed = body.replace(/^(?:\r?\n)+/, '').replace(/(?:\r?\n)+$/, '');
|
||||
return trimmed === '' ? '' : trimmed + '\n';
|
||||
}
|
||||
|
||||
/** Diff cost grows with the square of the edit distance; beyond this, a coarse diff is shown instead. */
|
||||
const MAX_EDIT_LENGTH = 1000;
|
||||
|
||||
/** Always-correct fallback: shared leading and trailing lines stay unchanged, the middle is replaced. */
|
||||
function coarseChanges(current: string, snapshot: string): Change[] {
|
||||
const lines = (text: string) => text.replace(/\r\n/g, '\n').match(/[^\n]*\n|[^\n]+$/g) ?? [];
|
||||
const before = lines(current);
|
||||
const after = lines(snapshot);
|
||||
let start = 0;
|
||||
while (start < before.length && start < after.length && before[start] === after[start]) start++;
|
||||
let end = 0;
|
||||
while (end < before.length - start && end < after.length - start
|
||||
&& before[before.length - 1 - end] === after[after.length - 1 - end]) end++;
|
||||
const part = (items: string[], kind: 'same' | 'added' | 'removed'): Change[] => items.length
|
||||
? [{ value: items.join(''), count: items.length, added: kind === 'added', removed: kind === 'removed' }]
|
||||
: [];
|
||||
return [
|
||||
...part(before.slice(0, start), 'same'),
|
||||
...part(before.slice(start, before.length - end), 'removed'),
|
||||
...part(after.slice(start, after.length - end), 'added'),
|
||||
...part(before.slice(before.length - end), 'same'),
|
||||
];
|
||||
}
|
||||
|
||||
/** Added/removed rows describe restoring the snapshot over the current editor body. */
|
||||
export async function compareHistory(
|
||||
currentBody: string,
|
||||
snapshotBody: string,
|
||||
): Promise<HistoryComparison> {
|
||||
// jsdiff's callback mode waits on a timer for every step, which takes seconds on large changes.
|
||||
const changes = diffLines(currentBody, snapshotBody, { stripTrailingCr: true, maxEditLength: MAX_EDIT_LENGTH })
|
||||
?? coarseChanges(currentBody, snapshotBody);
|
||||
|
||||
const chunks: HistoryChunk[] = [];
|
||||
let added = 0;
|
||||
let removed = 0;
|
||||
let currentLine = 1;
|
||||
let snapshotLine = 1;
|
||||
const contextLines = 3;
|
||||
|
||||
for (let changeIndex = 0; changeIndex < changes.length; changeIndex++) {
|
||||
const change = changes[changeIndex];
|
||||
const kind: HistoryRow['kind'] = change.added ? 'added' : change.removed ? 'removed' : 'same';
|
||||
const leadingContext = changeIndex > 0 ? contextLines : 0;
|
||||
const trailingContext = changeIndex < changes.length - 1 ? contextLines : 0;
|
||||
const collapse = kind === 'same' && change.count > (
|
||||
changes.length === 1 ? contextLines * 2 : leadingContext + trailingContext
|
||||
);
|
||||
|
||||
let offset = 0;
|
||||
let rowIndex = 0;
|
||||
while (offset < change.value.length) {
|
||||
const newlineIndex = change.value.indexOf('\n', offset);
|
||||
const newline = newlineIndex !== -1;
|
||||
const end = newline ? newlineIndex : change.value.length;
|
||||
const chunkKind: HistoryChunk['kind'] = collapse
|
||||
&& rowIndex >= leadingContext
|
||||
&& rowIndex < change.count - trailingContext
|
||||
? 'unchanged'
|
||||
: 'lines';
|
||||
let chunk = chunks[chunks.length - 1];
|
||||
if (!chunk || chunk.kind !== chunkKind) {
|
||||
chunk = { kind: chunkKind, rows: [] };
|
||||
chunks.push(chunk);
|
||||
}
|
||||
chunk.rows.push({
|
||||
kind,
|
||||
text: change.value.slice(offset, end),
|
||||
currentLine: kind === 'added' ? null : currentLine++,
|
||||
snapshotLine: kind === 'removed' ? null : snapshotLine++,
|
||||
newline,
|
||||
});
|
||||
if (kind === 'added') added++;
|
||||
if (kind === 'removed') removed++;
|
||||
offset = newline ? end + 1 : end;
|
||||
rowIndex++;
|
||||
}
|
||||
}
|
||||
|
||||
return { added, removed, chunks };
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
|
||||
const { htmlHasFormatting, looksLikeMarkdown } = await import(new URL('./markdown-paste.ts', import.meta.url));
|
||||
|
||||
test('Markdown block and inline syntax is recognized', () => {
|
||||
for (const text of [
|
||||
'# Title\n\nText', 'Intro\n\n- one\n- two', '1. first\n2. second', '> quoted', '```js\ncode\n```',
|
||||
'| a | b |\n| --- | --- |', 'Some **bold** text', 'see `code` here', '[label](https://x.com)', '',
|
||||
'[[Note]] link', 'an *emphasis* word', '- [ ] task', '---',
|
||||
]) assert.equal(looksLikeMarkdown(text), true, text);
|
||||
});
|
||||
|
||||
test('plain text stays plain', () => {
|
||||
for (const text of [
|
||||
'', 'Just a sentence.', 'Two\nlines of text', 'https://example.com/page', '2 * 3 * 4 = 24', 'price: $5 - $10',
|
||||
'snake_case_name and another_one', 'a # not a heading', '-1 degrees', 'C:\\Users\\me\\file.txt',
|
||||
]) assert.equal(looksLikeMarkdown(text), false, text);
|
||||
});
|
||||
|
||||
test('styled text from a code editor is not formatting', () => {
|
||||
assert.equal(htmlHasFormatting('<meta charset="utf-8"><div style="color: #ccc;font-family: monospace;white-space: pre;"><div><span style="color: #569cd6;"># Title</span></div></div>'), false);
|
||||
assert.equal(htmlHasFormatting('<p>Text with <strong>bold</strong></p>'), true);
|
||||
assert.equal(htmlHasFormatting('<ul><li>item</li></ul>'), true);
|
||||
assert.equal(htmlHasFormatting('<a href="x">x</a>'), true);
|
||||
});
|
||||
@@ -0,0 +1,21 @@
|
||||
/*
|
||||
* Pasting Markdown into the rich editor. Plain text that uses Markdown syntax is rendered the way a
|
||||
* note is; anything else keeps the normal paste. Clipboard HTML that is only styled text (a code
|
||||
* editor or terminal copies its colors as HTML) does not count as formatting.
|
||||
*/
|
||||
|
||||
const BLOCK_SYNTAX = /^(?: {0,3}#{1,6}[ \t]+\S| {0,3}>|[ \t]*(?:[-*+]|\d+[.)])[ \t]+\S| {0,3}(?:```|~~~)|[ \t]*\|.*\|[ \t]*$| {0,3}(?:-{3,}|\*{3,}|_{3,})[ \t]*$|:::img-grid\b)/m;
|
||||
const INLINE_SYNTAX = /\*\*[^*\n]+\*\*|__[^_\n]+__|~~[^~\n]+~~|==[^=\n]+==|`[^`\n]+`|!?\[[^\]\n]*\]\([^)\s]+(?:\s+"[^"\n]*")?\)|\[\[[^\]\n]+\]\]|(?:^|[\s(])\*[^*\s][^*\n]*\*(?=[\s).,;:!?]|$)/m;
|
||||
|
||||
/** Whether pasted plain text is written in Markdown rather than meant literally. */
|
||||
export function looksLikeMarkdown(text: string): boolean {
|
||||
if (!text.trim()) return false;
|
||||
// A lone address is a link paste, handled on its own.
|
||||
if (/^\s*[a-z][a-z0-9+.-]*:\/\/\S+\s*$/i.test(text)) return false;
|
||||
return BLOCK_SYNTAX.test(text) || INLINE_SYNTAX.test(text);
|
||||
}
|
||||
|
||||
/** Whether clipboard HTML carries structure of its own (headings, lists, links, emphasis...). */
|
||||
export function htmlHasFormatting(html: string): boolean {
|
||||
return /<(?:h[1-6]|ul|ol|li|table|blockquote|pre|code|a|img|strong|b|em|i|u|s|del|mark|hr)\b/i.test(html);
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { FileEvent, NoteEntry } from '../types';
|
||||
|
||||
const normalize = (path: string) => path.replace(/\\/g, '/');
|
||||
const normalize = (path: string) => path.includes('\\') ? path.replace(/\\/g, '/') : path;
|
||||
|
||||
/** A delayed watcher/sync batch must not update a different (even nested) vault. */
|
||||
export function isCurrentVaultEvent(event: FileEvent, vaultPath: string | null): boolean {
|
||||
@@ -27,7 +27,8 @@ function belongsToList(note: NoteEntry, key: string, quickAccess: string[]): boo
|
||||
/** 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));
|
||||
const notePath = normalize(note.path);
|
||||
const index = list.findIndex((entry) => normalize(entry.path) === notePath);
|
||||
if (!belongsToList(note, key, quickAccess)) {
|
||||
return index < 0 ? list : list.filter((_, i) => i !== index);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
|
||||
const { decodeBuiltinNotebookIcon, decodeNotebookIcon, encodeBuiltinNotebookIcon } = await import(
|
||||
new URL('./notebook-icons.ts', import.meta.url)
|
||||
);
|
||||
|
||||
test('encodes a builtin notebook icon with an optional color', () => {
|
||||
assert.equal(encodeBuiltinNotebookIcon('star'), 'builtin:star');
|
||||
assert.equal(encodeBuiltinNotebookIcon('star', null), 'builtin:star');
|
||||
assert.equal(encodeBuiltinNotebookIcon('star', '#E11D48'), 'builtin:star#e11d48');
|
||||
assert.equal(encodeBuiltinNotebookIcon('star', 'red'), 'builtin:star');
|
||||
});
|
||||
|
||||
test('decodes notebook icons with and without a color', () => {
|
||||
assert.deepEqual(decodeNotebookIcon('builtin:star'), { icon: 'star', color: null });
|
||||
assert.deepEqual(decodeNotebookIcon('builtin:star#e11d48'), { icon: 'star', color: '#e11d48' });
|
||||
assert.deepEqual(decodeNotebookIcon('builtin:star#nope'), { icon: 'star', color: null });
|
||||
});
|
||||
|
||||
test('colors the default notebook glyph without an icon', () => {
|
||||
assert.equal(encodeBuiltinNotebookIcon(null, '#E11D48'), 'builtin:#e11d48');
|
||||
assert.deepEqual(decodeNotebookIcon('builtin:#e11d48'), { icon: null, color: '#e11d48' });
|
||||
assert.equal(decodeNotebookIcon('builtin:'), null);
|
||||
assert.equal(decodeNotebookIcon('builtin:#nope'), null);
|
||||
});
|
||||
|
||||
test('ignores custom images and unknown builtin icons', () => {
|
||||
assert.equal(decodeNotebookIcon(null), null);
|
||||
assert.equal(decodeNotebookIcon('.helixnotes/attachments/icon#1.png'), null);
|
||||
assert.equal(decodeNotebookIcon('builtin:unknown#e11d48'), null);
|
||||
});
|
||||
|
||||
test('tag icons stay uncolored builtin ids', () => {
|
||||
assert.equal(decodeBuiltinNotebookIcon('builtin:star'), 'star');
|
||||
assert.equal(decodeBuiltinNotebookIcon('builtin:star#e11d48'), null);
|
||||
});
|
||||
|
||||
test('only the first icons are common', async () => {
|
||||
const { isCommonNotebookIcon } = await import(new URL('./notebook-icons.ts', import.meta.url));
|
||||
assert.equal(isCommonNotebookIcon(null), true);
|
||||
assert.equal(isCommonNotebookIcon('code'), true);
|
||||
assert.equal(isCommonNotebookIcon('flask'), false);
|
||||
assert.equal(isCommonNotebookIcon('pen'), false);
|
||||
});
|
||||
@@ -1,3 +1,5 @@
|
||||
import { isValidTagColor } from './tag-styles.ts';
|
||||
|
||||
export const NOTEBOOK_ICON_OPTIONS = [
|
||||
{ id: 'book', label: 'Book' },
|
||||
{ id: 'folder', label: 'Folder' },
|
||||
@@ -14,11 +16,47 @@ export const NOTEBOOK_ICON_OPTIONS = [
|
||||
{ id: 'archive', label: 'Archive' },
|
||||
{ id: 'globe', label: 'Globe' },
|
||||
{ id: 'plane', label: 'Travel' },
|
||||
{ id: 'palette', label: 'Creative' }
|
||||
{ id: 'palette', label: 'Creative' },
|
||||
{ id: 'music', label: 'Music' },
|
||||
{ id: 'camera', label: 'Photos' },
|
||||
{ id: 'film', label: 'Film' },
|
||||
{ id: 'gamepad', label: 'Games' },
|
||||
{ id: 'cart', label: 'Shopping' },
|
||||
{ id: 'money', label: 'Finance' },
|
||||
{ id: 'health', label: 'Health' },
|
||||
{ id: 'food', label: 'Food' },
|
||||
{ id: 'coffee', label: 'Coffee' },
|
||||
{ id: 'leaf', label: 'Nature' },
|
||||
{ id: 'users', label: 'People' },
|
||||
{ id: 'chat', label: 'Chat' },
|
||||
{ id: 'mail', label: 'Mail' },
|
||||
{ id: 'lock', label: 'Private' },
|
||||
{ id: 'wrench', label: 'Tools' },
|
||||
{ id: 'pen', label: 'Writing' },
|
||||
{ id: 'tag', label: 'Tag' },
|
||||
{ id: 'clock', label: 'Clock' },
|
||||
{ id: 'bell', label: 'Reminders' },
|
||||
{ id: 'pin', label: 'Location' },
|
||||
{ id: 'gift', label: 'Gifts' },
|
||||
{ id: 'trophy', label: 'Goals' },
|
||||
{ id: 'rocket', label: 'Projects' },
|
||||
{ id: 'flag', label: 'Flag' },
|
||||
{ id: 'shield', label: 'Security' },
|
||||
{ id: 'gear', label: 'Settings' },
|
||||
{ id: 'search', label: 'Search' },
|
||||
{ id: 'zap', label: 'Energy' }
|
||||
] as const;
|
||||
|
||||
export type NotebookIconId = (typeof NOTEBOOK_ICON_OPTIONS)[number]['id'];
|
||||
|
||||
/** The pickers show this many icons until "More icons" is pressed. */
|
||||
export const COMMON_NOTEBOOK_ICON_COUNT = 8;
|
||||
|
||||
export function isCommonNotebookIcon(icon: NotebookIconId | null | undefined): boolean {
|
||||
if (!icon) return true;
|
||||
return NOTEBOOK_ICON_OPTIONS.findIndex((option) => option.id === icon) < COMMON_NOTEBOOK_ICON_COUNT;
|
||||
}
|
||||
|
||||
const BUILTIN_PREFIX = 'builtin:';
|
||||
const BUILTIN_IDS: Record<NotebookIconId, true> = {
|
||||
book: true,
|
||||
@@ -36,15 +74,43 @@ const BUILTIN_IDS: Record<NotebookIconId, true> = {
|
||||
archive: true,
|
||||
globe: true,
|
||||
plane: true,
|
||||
palette: true
|
||||
palette: true,
|
||||
music: true,
|
||||
camera: true,
|
||||
film: true,
|
||||
gamepad: true,
|
||||
cart: true,
|
||||
money: true,
|
||||
health: true,
|
||||
food: true,
|
||||
coffee: true,
|
||||
leaf: true,
|
||||
users: true,
|
||||
chat: true,
|
||||
mail: true,
|
||||
lock: true,
|
||||
wrench: true,
|
||||
pen: true,
|
||||
tag: true,
|
||||
clock: true,
|
||||
bell: true,
|
||||
pin: true,
|
||||
gift: true,
|
||||
trophy: true,
|
||||
rocket: true,
|
||||
flag: true,
|
||||
shield: true,
|
||||
gear: true,
|
||||
search: true,
|
||||
zap: true
|
||||
};
|
||||
|
||||
export function normalizeNotebookIconKey(path: string): string {
|
||||
return path.replace(/\\/g, '/');
|
||||
}
|
||||
|
||||
export function encodeBuiltinNotebookIcon(icon: NotebookIconId): string {
|
||||
return `${BUILTIN_PREFIX}${icon}`;
|
||||
export function encodeBuiltinNotebookIcon(icon: NotebookIconId | null, color?: string | null): string {
|
||||
return `${BUILTIN_PREFIX}${icon ?? ''}${isValidTagColor(color) ? color.toLowerCase() : ''}`;
|
||||
}
|
||||
|
||||
export function decodeBuiltinNotebookIcon(value: string | null | undefined): NotebookIconId | null {
|
||||
@@ -52,3 +118,19 @@ export function decodeBuiltinNotebookIcon(value: string | null | undefined): Not
|
||||
const icon = value.slice(BUILTIN_PREFIX.length);
|
||||
return Object.hasOwn(BUILTIN_IDS, icon) ? icon as NotebookIconId : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Notebook icons keep their color in the stored value: `builtin:star#e11d48`.
|
||||
* `builtin:#e11d48` colors the default notebook glyph.
|
||||
*/
|
||||
export function decodeNotebookIcon(
|
||||
value: string | null | undefined
|
||||
): { icon: NotebookIconId | null; color: string | null } | null {
|
||||
if (!value?.startsWith(BUILTIN_PREFIX)) return null;
|
||||
const hash = value.indexOf('#');
|
||||
const icon = decodeBuiltinNotebookIcon(hash < 0 ? value : value.slice(0, hash));
|
||||
const color = hash < 0 ? null : value.slice(hash);
|
||||
const valid = isValidTagColor(color) ? color : null;
|
||||
if (!icon && (!valid || hash !== BUILTIN_PREFIX.length)) return null;
|
||||
return { icon, color: valid };
|
||||
}
|
||||
+33
-6
@@ -46,6 +46,29 @@ export function assetUrlToLocalPath(source: string): string | null {
|
||||
}
|
||||
}
|
||||
|
||||
/** The owning configured vault, never the active vault of an unrelated external note. */
|
||||
export function noteAssetRoot(notePath: string | null, activeVault: string | null, vaults: readonly string[] = []): string | null {
|
||||
if (!notePath || isPathInDirectory(notePath, activeVault)) return activeVault;
|
||||
return [...vaults].filter(root => isPathInDirectory(notePath, root)).sort((a, b) => b.length - a.length)[0] ?? null;
|
||||
}
|
||||
|
||||
/** Decode only the URI path, keeping query/fragment data out of filesystem paths. */
|
||||
export function resolveFileReference(source: string, notePath: string | null, vaultRoot: string | null): { path: string; suffix: string } {
|
||||
const boundary = source.search(/[?#]/);
|
||||
const encoded = boundary < 0 ? source : source.slice(0, boundary);
|
||||
let path: string;
|
||||
try { path = decodeURIComponent(encoded); } catch { path = encoded; }
|
||||
return { path: resolveVaultFilePath(path, notePath, vaultRoot), suffix: boundary < 0 ? '' : source.slice(boundary) };
|
||||
}
|
||||
|
||||
/** Percent-encode each path segment for a Markdown destination; a Windows drive prefix stays literal. */
|
||||
export function encodeMarkdownPath(path: string): string {
|
||||
const normalized = path.replace(/\\/g, '/');
|
||||
const drive = /^[A-Za-z]:(?=\/|$)/.exec(normalized)?.[0] ?? '';
|
||||
return drive + normalized.slice(drive.length).split('/').map(segment => encodeURIComponent(segment)
|
||||
.replace(/[!'()*]/g, character => `%${character.charCodeAt(0).toString(16).toUpperCase()}`)).join('/');
|
||||
}
|
||||
|
||||
export function resolveVaultFilePath(
|
||||
targetPath: string,
|
||||
notePath: string | null,
|
||||
@@ -55,8 +78,11 @@ export function resolveVaultFilePath(
|
||||
if (target.startsWith('/') || /^[A-Za-z]:\//.test(target)) return target;
|
||||
|
||||
const root = vaultRoot?.replace(/\\/g, '/').replace(/\/$/, '') ?? '';
|
||||
if (target.startsWith('.helixnotes/') && root) {
|
||||
return resolvePathFromFile(`${root}/.vault-root`, target);
|
||||
if (root) {
|
||||
// Older imported managed links may still contain notebook-depth prefixes.
|
||||
const managed = target.match(/^(?:\.{1,2}\/)*(\.helixnotes\/attachments\/.*)$/);
|
||||
if (managed) return resolvePathFromFile(`${root}/.vault-root`, managed[1]);
|
||||
if (target.startsWith('.helixnotes/')) return resolvePathFromFile(`${root}/.vault-root`, target);
|
||||
}
|
||||
if (notePath) return resolvePathFromFile(notePath, target);
|
||||
if (root) return resolvePathFromFile(`${root}/.vault-root`, target);
|
||||
@@ -79,14 +105,15 @@ export function assetSourceToMarkdown(
|
||||
const absolutePath = assetUrlToLocalPath(source);
|
||||
if (absolutePath === null) return source;
|
||||
|
||||
const url = new URL(source);
|
||||
const suffix = url.search + url.hash;
|
||||
const normalizedRoot = vaultRoot?.replace(/\\/g, '/').replace(/\/$/, '');
|
||||
if (!normalizedRoot || !absolutePath.startsWith(normalizedRoot + '/')) return absolutePath;
|
||||
if (!normalizedRoot || !isPathInDirectory(absolutePath, normalizedRoot)) return encodeMarkdownPath(absolutePath) + suffix;
|
||||
const vaultRelative = absolutePath.substring(normalizedRoot.length + 1);
|
||||
if (vaultRelative.startsWith('.helixnotes/')) return vaultRelative;
|
||||
if (!notePath) return vaultRelative;
|
||||
if (vaultRelative.startsWith('.helixnotes/') || !notePath) return encodeMarkdownPath(vaultRelative) + suffix;
|
||||
const normalizedNotePath = notePath.replace(/\\/g, '/');
|
||||
const noteDirectory = normalizedNotePath.substring(0, normalizedNotePath.lastIndexOf('/'));
|
||||
return relativePath(noteDirectory, absolutePath);
|
||||
return encodeMarkdownPath(relativePath(noteDirectory, absolutePath)) + suffix;
|
||||
}
|
||||
|
||||
export function resolvePathFromFile(filePath: string, targetPath: string): string {
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { matchesTaskDueFilter } from './task-filter.ts';
|
||||
import { formatLocalDate } from './time.ts';
|
||||
|
||||
const today = '2027-01-01';
|
||||
const dates = [null, '2026-12-31', today, '2027-01-02'];
|
||||
|
||||
test('Today includes only tasks due on the current local day', () => {
|
||||
assert.deepEqual(dates.filter(due => matchesTaskDueFilter(due, 'today', today)), [today]);
|
||||
});
|
||||
|
||||
test('Overdue excludes today, future dates, and undated tasks across a year boundary', () => {
|
||||
assert.deepEqual(dates.filter(due => matchesTaskDueFilter(due, 'overdue', today)), ['2026-12-31']);
|
||||
});
|
||||
|
||||
test('Overdue never includes a completed task, while Today and all still do', () => {
|
||||
assert.equal(matchesTaskDueFilter('2026-12-31', 'overdue', today, false), true);
|
||||
assert.equal(matchesTaskDueFilter('2026-12-31', 'overdue', today, true), false);
|
||||
assert.equal(matchesTaskDueFilter(today, 'today', today, true), true);
|
||||
assert.equal(matchesTaskDueFilter('2026-12-31', 'all', today, true), true);
|
||||
});
|
||||
|
||||
test('clearing the date filter restores dated and undated tasks', () => {
|
||||
assert.equal(matchesTaskDueFilter(null, 'all', today), true);
|
||||
assert.equal(matchesTaskDueFilter('2027-01-02', 'all', today), true);
|
||||
});
|
||||
|
||||
test('task date keys use the local calendar rather than a locale-specific display string', () => {
|
||||
assert.equal(formatLocalDate(new Date(2026, 11, 31, 23, 59)), '2026-12-31');
|
||||
assert.equal(formatLocalDate(new Date(2027, 0, 1, 0, 0)), '2027-01-01');
|
||||
});
|
||||
@@ -0,0 +1,8 @@
|
||||
export type TaskDueFilter = 'all' | 'today' | 'overdue';
|
||||
|
||||
/** Overdue means late and still open: a completed task is never overdue. */
|
||||
export function matchesTaskDueFilter(due: string | null, filter: TaskDueFilter, today: string, completed = false): boolean {
|
||||
if (filter === 'all') return true;
|
||||
if (!due) return false;
|
||||
return filter === 'today' ? due === today : !completed && due < today;
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { formatClockTime } from './time.ts';
|
||||
|
||||
const at = (hour, minute) => new Date(2026, 1, 15, hour, minute);
|
||||
|
||||
test('12-hour insertion distinguishes midnight, noon, and evening', () => {
|
||||
assert.equal(formatClockTime(at(0, 7), '12h'), '12:07 AM');
|
||||
assert.equal(formatClockTime(at(12, 0), '12h'), '12:00 PM');
|
||||
assert.equal(formatClockTime(at(23, 5), '12h'), '11:05 PM');
|
||||
});
|
||||
|
||||
test('24-hour insertion retains zero-padded clock values', () => {
|
||||
assert.equal(formatClockTime(at(0, 7), '24h'), '00:07');
|
||||
assert.equal(formatClockTime(at(23, 5), '24h'), '23:05');
|
||||
});
|
||||
|
||||
test('relative display mode inserts an absolute time rather than an aging label', () => {
|
||||
assert.equal(formatClockTime(at(17, 28), 'relative'), '17:28');
|
||||
});
|
||||
@@ -9,6 +9,22 @@ const fullDateFormatter = new Intl.DateTimeFormat(undefined, {
|
||||
const monthFormatter = new Intl.DateTimeFormat(undefined, { month: 'long' });
|
||||
const monthYearFormatter = new Intl.DateTimeFormat(undefined, { month: 'long', year: 'numeric' });
|
||||
|
||||
export function formatLocalDate(date: Date): string {
|
||||
const month = String(date.getMonth() + 1).padStart(2, '0');
|
||||
const day = String(date.getDate()).padStart(2, '0');
|
||||
return `${date.getFullYear()}-${month}-${day}`;
|
||||
}
|
||||
|
||||
export function formatClockTime(date: Date, timeFormat?: string): string {
|
||||
const hours = date.getHours();
|
||||
const minutes = String(date.getMinutes()).padStart(2, '0');
|
||||
if (timeFormat === '12h') {
|
||||
return `${hours % 12 || 12}:${minutes} ${hours < 12 ? 'AM' : 'PM'}`;
|
||||
}
|
||||
// Relative labels are for display, not text permanently inserted into a note.
|
||||
return `${String(hours).padStart(2, '0')}:${minutes}`;
|
||||
}
|
||||
|
||||
export function formatRelativeTime(dateStr: string): string {
|
||||
const date = new Date(dateStr);
|
||||
if (Number.isNaN(date.getTime())) return date.toString();
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
|
||||
const { countWords, markdownCountText } = await import(new URL('./word-count.ts', import.meta.url));
|
||||
|
||||
test('counts words, not punctuation or table borders', () => {
|
||||
assert.equal(countWords(''), 0);
|
||||
assert.equal(countWords(' one two\nthree '), 3);
|
||||
assert.equal(countWords('| a | b |'), 2);
|
||||
assert.equal(countWords('- > --- |'), 0);
|
||||
assert.equal(countWords("it's e-mail, 2026 café"), 4);
|
||||
});
|
||||
|
||||
test('a table counts its cell words in source mode', () => {
|
||||
const md = '| Name | Role |\n| --- | :---: |\n| Ada Lovelace | First programmer |\n';
|
||||
assert.equal(countWords(markdownCountText(md)), 6);
|
||||
});
|
||||
|
||||
test('Markdown syntax does not count as words', () => {
|
||||
const md = '---\ntitle: X\n---\n# Title here\n\n- [ ] task one\n- [x] done\n1. first\n - nested **bold** item\n> quoted text\n\n[[Note|shown name]] [link](https://x.com)  `code`\n';
|
||||
assert.equal(countWords(markdownCountText(md)), 15);
|
||||
});
|
||||
@@ -0,0 +1,23 @@
|
||||
/** Words are runs of non-space text with at least one letter or digit, so `|`, `-` or `>` don't count. */
|
||||
export function countWords(text: string): number {
|
||||
let count = 0;
|
||||
for (const token of text.split(/\s+/)) {
|
||||
if (/[\p{L}\p{N}]/u.test(token)) count++;
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
/** The readable text of a Markdown note, for counting words and characters in source mode. */
|
||||
export function markdownCountText(markdown: string): string {
|
||||
return markdown
|
||||
.replace(/^---\n[\s\S]*?\n---\n?/, '')
|
||||
// Table delimiter rows (`| --- | :---: |`) are layout, not words.
|
||||
.replace(/^[ \t]*\|?[ \t]*:?-{3,}:?[ \t]*(?:\|[ \t]*:?-{3,}:?[ \t]*)*\|?[ \t]*$/gm, '')
|
||||
.replace(/!\[[^\]]*\]\([^)]*\)/g, '')
|
||||
.replace(/\[([^\]]*)\]\([^)]*\)/g, '$1')
|
||||
.replace(/\[\[([^\]|]*\|)?([^\]]*)\]\]/g, '$2')
|
||||
.replace(/^[ \t]*#{1,6}[ \t]+/gm, '')
|
||||
.replace(/^[ \t]*(?:>[ \t]*)+/gm, '')
|
||||
.replace(/^[ \t]*(?:[-*+]|\d+[.)])[ \t]+(?:\[[ xX]\][ \t]+)?/gm, '')
|
||||
.replace(/[*_~`|]+/g, ' ');
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
import { darkThemes, isMobile, isAndroid } from '$lib/platform';
|
||||
import type { CustomTheme } from '$lib/types';
|
||||
import ResizeHandles from '$lib/components/ResizeHandles.svelte';
|
||||
import { resolveVaultFilePath } from '$lib/utils/paths';
|
||||
import { noteAssetRoot, resolveFileReference } from '$lib/utils/paths';
|
||||
|
||||
let { children } = $props();
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
}
|
||||
|
||||
function applyTheme(t: string, themes: CustomTheme[] = []) {
|
||||
const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula', 'blueberry', 'forest-green', 'gruvbox', 'midnight-tide', 'cherry-blossom', 'synthwave', 'ember', 'moonlit', 'light-coffee', 'dark-coffee', 'cotton-candy', 'crimson', 'cloud', 'peach', 'material-dark', 'material-light', 'monokai', 'rose-pine', 'everforest', 'horizon', 'cyberpunk', 'black', 'one-dark'];
|
||||
const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula', 'blueberry', 'forest-green', 'gruvbox', 'midnight-tide', 'cherry-blossom', 'synthwave', 'ember', 'moonlit', 'light-coffee', 'dark-coffee', 'cotton-candy', 'crimson', 'cloud', 'peach', 'material-dark', 'material-light', 'monokai', 'rose-pine', 'everforest', 'horizon', 'cyberpunk', 'black', 'one-dark', 'matrix', 'amber-crt', 'sepia', 'deep-ocean', 'sandstone', 'lavender', 'graphite', 'nebula', 'wine', 'jade'];
|
||||
const root = document.documentElement;
|
||||
root.classList.remove('dark');
|
||||
root.removeAttribute('data-theme');
|
||||
@@ -90,11 +90,9 @@
|
||||
openUrl(href).catch((err) => console.error('Failed to open URL:', err));
|
||||
} else if (!href.startsWith('#')) {
|
||||
const config = get(appConfig);
|
||||
const absPath = resolveVaultFilePath(
|
||||
decodeURIComponent(href),
|
||||
get(activeNotePath),
|
||||
config?.active_vault ?? null,
|
||||
);
|
||||
const note = get(activeNotePath);
|
||||
const root = noteAssetRoot(note, config?.active_vault ?? null, config?.vaults.map(vault => vault.path) ?? []);
|
||||
const absPath = resolveFileReference(href, note, root).path;
|
||||
// Internal .md note link - navigate within the app
|
||||
if (absPath.endsWith('.md')) {
|
||||
window.dispatchEvent(new CustomEvent('helixnotes-open-note', { detail: absPath }));
|
||||
|
||||
+9
-11
@@ -4,7 +4,7 @@
|
||||
import { getAppConfig, openVault, restoreExternalVault, setFontSize } from '$lib/api';
|
||||
import { darkThemes, isIOS, isMobile } from '$lib/platform';
|
||||
import { getWheelFontSizeAction } from '$lib/utils/editor-zoom';
|
||||
import { getCurrentWebview } from '@tauri-apps/api/webview';
|
||||
import { applyUiScale, defaultUiScale } from '$lib/ui-scale';
|
||||
import { listen } from '@tauri-apps/api/event';
|
||||
import { getCurrentWindow } from '@tauri-apps/api/window';
|
||||
import VaultPicker from '$lib/components/VaultPicker.svelte';
|
||||
@@ -119,7 +119,8 @@
|
||||
} else if (event.key === '0') {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
setEditorFontSize(defaultEditorFontSize);
|
||||
// Back to the size chosen in Appearance, not the built-in default.
|
||||
setEditorFontSize($appConfig?.preferred_font_size ?? defaultEditorFontSize);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -187,7 +188,7 @@
|
||||
? (prefersDark ? config.system_dark_theme || 'dark' : config.system_light_theme || 'light')
|
||||
: rawTheme;
|
||||
const root = document.documentElement;
|
||||
const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula', 'blueberry', 'forest-green', 'gruvbox', 'midnight-tide', 'cherry-blossom', 'synthwave', 'ember', 'moonlit', 'light-coffee', 'dark-coffee', 'cotton-candy', 'crimson', 'cloud', 'peach', 'material-dark', 'material-light', 'monokai', 'rose-pine', 'everforest', 'horizon', 'cyberpunk', 'black', 'one-dark'];
|
||||
const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula', 'blueberry', 'forest-green', 'gruvbox', 'midnight-tide', 'cherry-blossom', 'synthwave', 'ember', 'moonlit', 'light-coffee', 'dark-coffee', 'cotton-candy', 'crimson', 'cloud', 'peach', 'material-dark', 'material-light', 'monokai', 'rose-pine', 'everforest', 'horizon', 'cyberpunk', 'black', 'one-dark', 'matrix', 'amber-crt', 'sepia', 'deep-ocean', 'sandstone', 'lavender', 'graphite', 'nebula', 'wine', 'jade'];
|
||||
root.classList.remove('dark');
|
||||
root.removeAttribute('data-theme');
|
||||
if (namedThemes.includes(themeValue)) {
|
||||
@@ -215,6 +216,8 @@
|
||||
opensans: '"Open Sans", -apple-system, sans-serif',
|
||||
literata: '"Literata", Georgia, serif',
|
||||
mono: '"JetBrains Mono", "Fira Code", "Cascadia Code", monospace',
|
||||
ubuntu: '"Ubuntu", -apple-system, sans-serif',
|
||||
'ubuntu-mono': '"Ubuntu Mono", monospace',
|
||||
};
|
||||
const stack = fontStacks[config.font_family];
|
||||
if (stack) document.documentElement.style.setProperty('--editor-font-family', stack);
|
||||
@@ -256,14 +259,9 @@
|
||||
}
|
||||
}
|
||||
|
||||
// Apply saved interface scale to every desktop window; no-ops gracefully elsewhere.
|
||||
if (config.ui_scale && config.ui_scale !== 1) {
|
||||
try {
|
||||
await getCurrentWebview().setZoom(config.ui_scale);
|
||||
} catch (e) {
|
||||
console.error('Failed to apply interface scale:', e);
|
||||
}
|
||||
}
|
||||
// Apply saved interface scale (or the platform default) to desktop windows and Android.
|
||||
const uiScale = config.ui_scale ?? defaultUiScale;
|
||||
if (uiScale !== 1) await applyUiScale(uiScale);
|
||||
await revealStartupWindow();
|
||||
removeEditorZoomShortcuts = installEditorZoomShortcuts();
|
||||
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
-------------------------------
|
||||
UBUNTU FONT LICENCE Version 1.0
|
||||
-------------------------------
|
||||
|
||||
PREAMBLE
|
||||
This licence allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely. The fonts, including any derivative works, can be
|
||||
bundled, embedded, and redistributed provided the terms of this licence
|
||||
are met. The fonts and derivatives, however, cannot be released under
|
||||
any other licence. The requirement for fonts to remain under this
|
||||
licence does not require any document created using the fonts or their
|
||||
derivatives to be published under this licence, as long as the primary
|
||||
purpose of the document is not to be a vehicle for the distribution of
|
||||
the fonts.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this licence and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Original Version" refers to the collection of Font Software components
|
||||
as received under this licence.
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to
|
||||
a new environment.
|
||||
|
||||
"Copyright Holder(s)" refers to all individuals and companies who have a
|
||||
copyright ownership of the Font Software.
|
||||
|
||||
"Substantially Changed" refers to Modified Versions which can be easily
|
||||
identified as dissimilar to the Font Software by users of the Font
|
||||
Software comparing the Original Version with the Modified Version.
|
||||
|
||||
To "Propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification and with or without charging
|
||||
a redistribution fee), making available to the public, and in some
|
||||
countries other activities as well.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
This licence does not grant any rights under trademark law and all such
|
||||
rights are reserved.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of the Font Software, to propagate the Font Software, subject to
|
||||
the below conditions:
|
||||
|
||||
1) Each copy of the Font Software must contain the above copyright
|
||||
notice and this licence. These can be included either as stand-alone
|
||||
text files, human-readable headers or in the appropriate machine-
|
||||
readable metadata fields within text or binary files as long as those
|
||||
fields can be easily viewed by the user.
|
||||
|
||||
2) The font name complies with the following:
|
||||
(a) The Original Version must retain its name, unmodified.
|
||||
(b) Modified Versions which are Substantially Changed must be renamed to
|
||||
avoid use of the name of the Original Version or similar names entirely.
|
||||
(c) Modified Versions which are not Substantially Changed must be
|
||||
renamed to both (i) retain the name of the Original Version and (ii) add
|
||||
additional naming elements to distinguish the Modified Version from the
|
||||
Original Version. The name of such Modified Versions must be the name of
|
||||
the Original Version, with "derivative X" where X represents the name of
|
||||
the new work, appended to that name.
|
||||
|
||||
3) The name(s) of the Copyright Holder(s) and any contributor to the
|
||||
Font Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except (i) as required by this licence, (ii) to
|
||||
acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
|
||||
their explicit written permission.
|
||||
|
||||
4) The Font Software, modified or unmodified, in part or in whole, must
|
||||
be distributed entirely under this licence, and must not be distributed
|
||||
under any other licence. The requirement for fonts to remain under this
|
||||
licence does not affect any document created using the Font Software,
|
||||
except any version of the Font Software extracted from a document
|
||||
created using the Font Software may only be distributed under this
|
||||
licence.
|
||||
|
||||
TERMINATION
|
||||
This licence becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
||||
COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
|
||||
DEALINGS IN THE FONT SOFTWARE.
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,5 @@
|
||||
Copyright 2010,2011 Canonical Ltd.
|
||||
|
||||
This Font Software is licensed under the Ubuntu Font Licence, Version
|
||||
1.0. https://launchpad.net/ubuntu-font-licence
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
-------------------------------
|
||||
UBUNTU FONT LICENCE Version 1.0
|
||||
-------------------------------
|
||||
|
||||
PREAMBLE
|
||||
This licence allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely. The fonts, including any derivative works, can be
|
||||
bundled, embedded, and redistributed provided the terms of this licence
|
||||
are met. The fonts and derivatives, however, cannot be released under
|
||||
any other licence. The requirement for fonts to remain under this
|
||||
licence does not require any document created using the fonts or their
|
||||
derivatives to be published under this licence, as long as the primary
|
||||
purpose of the document is not to be a vehicle for the distribution of
|
||||
the fonts.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this licence and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Original Version" refers to the collection of Font Software components
|
||||
as received under this licence.
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to
|
||||
a new environment.
|
||||
|
||||
"Copyright Holder(s)" refers to all individuals and companies who have a
|
||||
copyright ownership of the Font Software.
|
||||
|
||||
"Substantially Changed" refers to Modified Versions which can be easily
|
||||
identified as dissimilar to the Font Software by users of the Font
|
||||
Software comparing the Original Version with the Modified Version.
|
||||
|
||||
To "Propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification and with or without charging
|
||||
a redistribution fee), making available to the public, and in some
|
||||
countries other activities as well.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
This licence does not grant any rights under trademark law and all such
|
||||
rights are reserved.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of the Font Software, to propagate the Font Software, subject to
|
||||
the below conditions:
|
||||
|
||||
1) Each copy of the Font Software must contain the above copyright
|
||||
notice and this licence. These can be included either as stand-alone
|
||||
text files, human-readable headers or in the appropriate machine-
|
||||
readable metadata fields within text or binary files as long as those
|
||||
fields can be easily viewed by the user.
|
||||
|
||||
2) The font name complies with the following:
|
||||
(a) The Original Version must retain its name, unmodified.
|
||||
(b) Modified Versions which are Substantially Changed must be renamed to
|
||||
avoid use of the name of the Original Version or similar names entirely.
|
||||
(c) Modified Versions which are not Substantially Changed must be
|
||||
renamed to both (i) retain the name of the Original Version and (ii) add
|
||||
additional naming elements to distinguish the Modified Version from the
|
||||
Original Version. The name of such Modified Versions must be the name of
|
||||
the Original Version, with "derivative X" where X represents the name of
|
||||
the new work, appended to that name.
|
||||
|
||||
3) The name(s) of the Copyright Holder(s) and any contributor to the
|
||||
Font Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except (i) as required by this licence, (ii) to
|
||||
acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
|
||||
their explicit written permission.
|
||||
|
||||
4) The Font Software, modified or unmodified, in part or in whole, must
|
||||
be distributed entirely under this licence, and must not be distributed
|
||||
under any other licence. The requirement for fonts to remain under this
|
||||
licence does not affect any document created using the Font Software,
|
||||
except any version of the Font Software extracted from a document
|
||||
created using the Font Software may only be distributed under this
|
||||
licence.
|
||||
|
||||
TERMINATION
|
||||
This licence becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
||||
COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
|
||||
DEALINGS IN THE FONT SOFTWARE.
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loaded 100 of 120 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user