* [Major] Introduce a new `Ref` and `Path` type
This introduces a new `Ref` and `Path` type, which try to be as lightweight and rigorous as possible. More description in the PR
* [Minor] Updated Syntax
* [Minor] Updated Type
* [Minor] Renamed file
* [Minor] Updated type
* [Minor] Updated Syntax
* [Major] Rename css classes for wiki links
Previously all the parts of a wiki link were tagged with `sb-wiki-link-page`. This didn't make a whole lot of sense. Also the tag `sb-wiki-link` was could never render, because of the way `HighlightStyle` works. Now every part of a wiki link will be tagged with `sb-wiki-link` (i.e. the link, the alias, the dimensions). Invalid and missing links will be styled separately in a later commit.
* [Minor] Adjust to new API
* [Minor] Small changes
* [Minor] Function and file renames
* [Major] Syscall adjusments
Change behavior of `getCurrentPath` to actually return what's now considered a `Path`. `getCurrentPage(Meta)` now also correctly returns for documents. We could consider a rename to get rid of the `page` association
* [Major] Rework `Client`
Mostly minor adjustments for the new API. Some major changes in `navigateWithinPage` and some unecessary checks removed now
* [Major] Errors on navigate
This now throws an error when the user tries to navigate to a link that is invalid
* [Major] Minor adjustments and remove some old bulk
This does the typicall adjustments to the new API. A thing to consider is that invalid links aren't indexed. Also removed old code about template and query stuff. And reused a regex instead of copy pasting it.
* [Minor] Cleanup editor ui
* [Minor] Adjust to new API
* [Minor] Adjust to new API and reduce ugly regex
* [Minor] New API
* [Minor] Rework link cm plugin
* [Major] Rework wiki links
A lot of code cleanup, reworked for new APIs and also introduces "invalid links"
* [Minor] Part of the editor ui rework
* [Major] Adjust to new API
This also removes the `looksLikePathWithExtension` check. I don't think it was necessary.
* [Minor] PArt of editor ui rewrite
* [Minor] Adjust to new API
* [Major] Adjust renderer to new API
Invalid links now link to `#`
* [Major] Rewrite navigator
This still needs major rework, currently in a "got it working" state
* [Minor] Adjust file name
* [Minor] Mistake during rebase
* [Minor] Navigate to end of header
* [Minor] Remove `tweakEditorDOM` and use proper CM extensions
* [Major] Heavily clean up the navigation code
* [Minor] Make `PageNavigator` closable again
* [Minor] Small fixes to reduce errors bubbling up
* [Minor] Show error message if navigate fails
* [Major] Remove legacy `navigate({ kind = ` syntax
This removes the old navigation syntax. It's still supported but the user will be warned then using it. I also added some validation to editor.navigate for user provided refs.
* [Minor] Make notifications errors
* [Minor] Don't fail if header isn't found
* [Minor] Typo
* [Major] Remove cleanPageRef
* [Minor] Small bug
* [Minor] Align behavior between render and editor
* [Major] Remove `PageRef`. Pretty sure it's obsolete
* [Major] Remove pos from header as it's an invalid ref
* [Minor] Align with original behavior
* [Minor] Get tests working again
* [Minor] check that indexPage is valid
* [Major] Rewrite `resolve.ts` file
* [Minor] More tests, more fixes
* [Minor] Don't just append .md this is weird
* [Minor] More edge cases
* [Minor] Version bumping hono somehow fixes the `/` case
* [Minor] Smaller TODOs
* [Major] We can be a littler looser on the restrictions
* [Major] Change header indexing, to index with pos
* [Minor] More fixes for headers
* [Minor] Rename for clarity
* [Minor] Change more regexes to named groups
* [Major] Inline content rewrite
* [Minor] Fix TODO
* [Minor] Bump index version
* [Major] New Space Primitive to check paths
* [Minor] Fix #1214
* [Minor] Fix #1169
* [Minor] Remove TODO
This check is probably not needed anymore. Unsure. May look into it later
* [Minor] small bug
* [Minor] Not a good rebase without me needing to fix it afterwards
* [Minor] Improve fallback for file upload
* [Minor] Some fixes on the for resolving
* [Minor] Removed doubled test case
* [Minor] Resolve #860
* [Minor] Turn flash notification into an error
* [Minor] Change handling of `.` paths
* [Minor] Show empty URL for index page
* [Minor] Push correct ref to history
* [Major] Capture mini editor events in capture phase
This fixes the issue were when pressing arrowup or arrowdown changed the cursor position inside the editor
* [Major] Add prefix to `FilterList`
This now fixes issues were if you had a prefixed page you con't properly search for it, because the search considered the prefix as part of the name
* [Minor] A little rigor for empty headers
* [Major] Fix #1404
* [Minor] `parseInt` returns `NaN` handle that
* [Minor] Use `fileName`
* [Minor] Fix comment
* [Minor] Fixes
* [Major] disallow `foo.png.md` and `/../`, etc. cases
* [Major] Change name of conflicted pages
* [Minor] Remove unecessary check
* [Minor] Remove some split code
* [Minor] Allow deletion of invalid files
* [Minor] Bug in the regex
* [Minor] Give some possibility of fixing incorrect names
* [Minor] Tiny bug with header completion
* [Major] Docs
* [Minor] Ignore errors for navigation inside of a page
This could be a problem when SB e.g. cached a scrollTop for a page, which, because e.g. the file is now deleted, doesn't exist anymore and thus CM throws an error, when trying to navigate
* Update conflicted copy regex in Maintenance.md
---------
Co-authored-by: Zef Hemel <zef@zef.me>
248 lines
7.3 KiB
TypeScript
248 lines
7.3 KiB
TypeScript
import { syntaxTree } from "@codemirror/language";
|
|
import { EditorView, ViewPlugin, type ViewUpdate } from "@codemirror/view";
|
|
import type { Client } from "../client.ts";
|
|
|
|
// We use turndown to convert HTML to Markdown
|
|
import TurndownService from "turndown";
|
|
|
|
// With tables and task notation as well
|
|
import { tables, taskListItems } from "turndown-plugin-gfm";
|
|
import { lezerToParseTree } from "../markdown_parser/parse_tree.ts";
|
|
import {
|
|
addParentPointers,
|
|
findParentMatching,
|
|
nodeAtPos,
|
|
} from "@silverbulletmd/silverbullet/lib/tree";
|
|
import { maximumDocumentSize } from "../constants.ts";
|
|
import { safeRun } from "../../lib/async.ts";
|
|
import { resolveMarkdownLink } from "@silverbulletmd/silverbullet/lib/resolve";
|
|
import { localDateString } from "../../lib/dates.ts";
|
|
import type { UploadFile } from "@silverbulletmd/silverbullet/type/client";
|
|
import { isValidName, isValidPath } from "@silverbulletmd/silverbullet/lib/ref";
|
|
|
|
const turndownService = new TurndownService({
|
|
hr: "---",
|
|
codeBlockStyle: "fenced",
|
|
headingStyle: "atx",
|
|
emDelimiter: "*",
|
|
bulletListMarker: "*", // Duh!
|
|
strongDelimiter: "**",
|
|
linkStyle: "inlined",
|
|
});
|
|
turndownService.use(taskListItems);
|
|
turndownService.use(tables);
|
|
|
|
function striptHtmlComments(s: string): string {
|
|
return s.replace(/<!--[\s\S]*?-->/g, "");
|
|
}
|
|
|
|
const urlRegexp =
|
|
/^https?:\/\/[-a-zA-Z0-9@:%._\+~#=]{1,256}([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/;
|
|
|
|
// Known iOS Safari paste issue (unrelated to this implementation): https://voxpelli.com/2015/03/ios-safari-url-copy-paste-bug/
|
|
export const pasteLinkExtension = ViewPlugin.fromClass(
|
|
class {
|
|
update(update: ViewUpdate): void {
|
|
update.transactions.forEach((tr) => {
|
|
if (tr.isUserEvent("input.paste")) {
|
|
const pastedText: string[] = [];
|
|
let from = 0;
|
|
let to = 0;
|
|
tr.changes.iterChanges((fromA, _toA, _fromB, toB, inserted) => {
|
|
pastedText.push(inserted.sliceString(0));
|
|
from = fromA;
|
|
to = toB;
|
|
});
|
|
const pastedString = pastedText.join("");
|
|
if (pastedString.match(urlRegexp)) {
|
|
const selection = update.startState.selection.main;
|
|
if (!selection.empty) {
|
|
setTimeout(() => {
|
|
update.view.dispatch({
|
|
changes: [
|
|
{
|
|
from: from,
|
|
to: to,
|
|
insert: `[${
|
|
update.startState.sliceDoc(
|
|
selection.from,
|
|
selection.to,
|
|
)
|
|
}](${pastedString})`,
|
|
},
|
|
],
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
});
|
|
}
|
|
},
|
|
);
|
|
|
|
export function documentExtension(editor: Client) {
|
|
let shiftDown = false;
|
|
return EditorView.domEventHandlers({
|
|
dragover: (event) => {
|
|
event.preventDefault();
|
|
},
|
|
keydown: (event) => {
|
|
if (event.key === "Shift") {
|
|
shiftDown = true;
|
|
}
|
|
return false;
|
|
},
|
|
keyup: (event) => {
|
|
if (event.key === "Shift") {
|
|
shiftDown = false;
|
|
}
|
|
return false;
|
|
},
|
|
drop: (event: DragEvent) => {
|
|
// TODO: This doesn't take into account the target cursor position,
|
|
// it just drops the document wherever the cursor was last.
|
|
if (event.dataTransfer) {
|
|
const payload = [...event.dataTransfer.files];
|
|
if (!payload.length) {
|
|
return;
|
|
}
|
|
safeRun(async () => {
|
|
await processFileTransfer(payload);
|
|
});
|
|
}
|
|
},
|
|
paste: (event: ClipboardEvent) => {
|
|
const payload = [...event.clipboardData!.items];
|
|
const richText = event.clipboardData?.getData("text/html");
|
|
|
|
// Only do rich text paste if shift is NOT down
|
|
if (richText && !shiftDown) {
|
|
// Are we in a fencede code block?
|
|
const editorText = editor.editorView.state.sliceDoc();
|
|
const tree = lezerToParseTree(
|
|
editorText,
|
|
syntaxTree(editor.editorView.state).topNode,
|
|
);
|
|
addParentPointers(tree);
|
|
const currentNode = nodeAtPos(
|
|
tree,
|
|
editor.editorView.state.selection.main.from,
|
|
);
|
|
if (currentNode) {
|
|
const fencedParentNode = findParentMatching(
|
|
currentNode,
|
|
(t) => ["FrontMatter", "FencedCode"].includes(t.type!),
|
|
);
|
|
if (
|
|
fencedParentNode ||
|
|
["FrontMatter", "FencedCode"].includes(currentNode.type!)
|
|
) {
|
|
console.log("Inside of fenced code block, not pasting rich text");
|
|
return false;
|
|
}
|
|
}
|
|
|
|
const markdown = striptHtmlComments(turndownService.turndown(richText))
|
|
.trim();
|
|
const view = editor.editorView;
|
|
const selection = view.state.selection.main;
|
|
view.dispatch({
|
|
changes: [
|
|
{
|
|
from: selection.from,
|
|
to: selection.to,
|
|
insert: markdown,
|
|
},
|
|
],
|
|
selection: {
|
|
anchor: selection.from + markdown.length,
|
|
},
|
|
scrollIntoView: true,
|
|
});
|
|
return true;
|
|
}
|
|
if (!payload.length || payload.length === 0) {
|
|
return false;
|
|
}
|
|
safeRun(async () => {
|
|
await processItemTransfer(payload);
|
|
});
|
|
},
|
|
});
|
|
|
|
async function processFileTransfer(payload: File[]) {
|
|
const data = await payload[0].arrayBuffer();
|
|
// data.byteLength > maximumDocumentSize;
|
|
const fileData: UploadFile = {
|
|
name: payload[0].name,
|
|
contentType: payload[0].type,
|
|
content: new Uint8Array(data),
|
|
};
|
|
await saveFile(fileData);
|
|
}
|
|
|
|
async function processItemTransfer(payload: DataTransferItem[]) {
|
|
const file = payload.find((item) => item.kind === "file");
|
|
if (!file) {
|
|
return false;
|
|
}
|
|
const fileType = file.type;
|
|
const ext = fileType.split("/")[1];
|
|
const fileName = localDateString(new Date())
|
|
.split(".")[0]
|
|
.replace("T", "_")
|
|
.replaceAll(":", "-");
|
|
const data = await file!.getAsFile()?.arrayBuffer();
|
|
if (!data) {
|
|
return false;
|
|
}
|
|
const fileData: UploadFile = {
|
|
name: `${fileName}.${ext}`,
|
|
contentType: fileType,
|
|
content: new Uint8Array(data),
|
|
};
|
|
await saveFile(fileData);
|
|
}
|
|
|
|
async function saveFile(file: UploadFile) {
|
|
const maxSize = maximumDocumentSize;
|
|
if (file.content.length > maxSize * 1024 * 1024) {
|
|
editor.flashNotification(
|
|
`Document is too large, maximum is ${maxSize}MiB`,
|
|
"error",
|
|
);
|
|
return;
|
|
}
|
|
|
|
const finalFilePath = await editor.prompt(
|
|
"File name for pasted document",
|
|
resolveMarkdownLink(
|
|
client.currentPath(),
|
|
isValidPath(file.name)
|
|
? file.name
|
|
: `file.${
|
|
file.name.indexOf(".") !== -1 ? file.name.split(".").pop() : "txt"
|
|
}`,
|
|
),
|
|
);
|
|
if (!finalFilePath || !isValidName(finalFilePath)) {
|
|
return;
|
|
}
|
|
|
|
await editor.space.writeDocument(finalFilePath, file.content);
|
|
let documentMarkdown = `[[${finalFilePath}]]`;
|
|
if (file.contentType.startsWith("image/")) {
|
|
documentMarkdown = "!" + documentMarkdown;
|
|
}
|
|
editor.editorView.dispatch({
|
|
changes: [
|
|
{
|
|
insert: documentMarkdown,
|
|
from: editor.editorView.state.selection.main.from,
|
|
},
|
|
],
|
|
});
|
|
}
|
|
}
|