* [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>
297 lines
8.2 KiB
TypeScript
297 lines
8.2 KiB
TypeScript
import type { EditorState, Range } from "@codemirror/state";
|
|
import { syntaxTree } from "@codemirror/language";
|
|
import { Decoration } from "@codemirror/view";
|
|
import {
|
|
decoratorStateField,
|
|
invisibleDecoration,
|
|
isCursorInRange,
|
|
shouldRenderWidgets,
|
|
} from "./util.ts";
|
|
import type { Client } from "../client.ts";
|
|
import {
|
|
isLocalURL,
|
|
resolveMarkdownLink,
|
|
} from "@silverbulletmd/silverbullet/lib/resolve";
|
|
import {
|
|
getNameFromPath,
|
|
getPathExtension,
|
|
isMarkdownPath,
|
|
parseToRef,
|
|
type Ref,
|
|
} from "@silverbulletmd/silverbullet/lib/ref";
|
|
import { LuaWidget } from "./lua_widget.ts";
|
|
import { mdLinkRegex, wikiLinkRegex } from "../markdown_parser/constants.ts";
|
|
import { mime } from "mimetypes";
|
|
import { extractTransclusion } from "../markdown.ts";
|
|
|
|
type ContentDimensions = {
|
|
width?: number;
|
|
height?: number;
|
|
};
|
|
|
|
async function inlineHtmlFromURL(
|
|
client: Client,
|
|
url: string,
|
|
alias: string,
|
|
dimensions: ContentDimensions | undefined,
|
|
allowExternal: boolean = true,
|
|
): Promise<HTMLElement | string> {
|
|
let mimeType: string | null | undefined;
|
|
if (!isLocalURL(url) && allowExternal) {
|
|
const response = await fetch(url, { method: "HEAD" });
|
|
if (!response.ok) {
|
|
return `Failed to fetch resource, server responded with status code: ${response.status}`;
|
|
}
|
|
|
|
mimeType = response.headers.get("Content-Type");
|
|
} else {
|
|
const ref = parseToRef(url);
|
|
if (!ref) {
|
|
return `Failed to parse url`;
|
|
}
|
|
|
|
mimeType = mime.getType(getPathExtension(ref.path));
|
|
}
|
|
|
|
if (!mimeType) {
|
|
return `Failed to determine mime type`;
|
|
}
|
|
|
|
const setDimension = (element: HTMLElement, event: string) => {
|
|
const cachedContentHeight = client.getCachedWidgetHeight(
|
|
`content:${url}`,
|
|
);
|
|
|
|
element.addEventListener(event, () => {
|
|
if (element.clientHeight !== cachedContentHeight) {
|
|
client.setCachedWidgetHeight(
|
|
`content:${url}`,
|
|
element.clientHeight,
|
|
);
|
|
}
|
|
});
|
|
|
|
element.style.maxWidth = "100%";
|
|
|
|
if (dimensions) {
|
|
if (dimensions.height) {
|
|
element.style.height = `${dimensions.height}px`;
|
|
}
|
|
if (dimensions.width) {
|
|
element.style.width = `${dimensions.width}px`;
|
|
}
|
|
} else if (cachedContentHeight > 0) {
|
|
element.style.height = cachedContentHeight.toString();
|
|
}
|
|
};
|
|
|
|
// If the URL is a local, encode the : so that it's not interpreted as a protocol
|
|
const sanitizedURL = isLocalURL(url) ? url.replace(":", "%3A") : url;
|
|
|
|
let result: HTMLElement | string;
|
|
if (mimeType.startsWith("image/")) {
|
|
const img = document.createElement("img");
|
|
img.src = sanitizedURL;
|
|
img.alt = alias;
|
|
setDimension(img, "load");
|
|
result = img;
|
|
} else if (mimeType.startsWith("video/")) {
|
|
const video = document.createElement("video");
|
|
video.src = sanitizedURL;
|
|
video.title = alias;
|
|
video.controls = true;
|
|
video.autoplay = false;
|
|
setDimension(video, "loadeddata");
|
|
result = video;
|
|
} else if (mimeType.startsWith("audio/")) {
|
|
const audio = document.createElement("audio");
|
|
audio.src = sanitizedURL;
|
|
audio.title = alias;
|
|
audio.controls = true;
|
|
audio.autoplay = false;
|
|
setDimension(audio, "loadeddata");
|
|
result = audio;
|
|
} else if (mimeType === "application/pdf") {
|
|
const embed = document.createElement("object");
|
|
embed.type = mimeType;
|
|
embed.data = sanitizedURL;
|
|
embed.style.width = "100%";
|
|
embed.style.height = "20em";
|
|
setDimension(embed, "load");
|
|
result = embed;
|
|
} else if (mimeType === "text/markdown") {
|
|
let details: Ref["details"], markdown: string;
|
|
|
|
if (!isLocalURL(url) && allowExternal) {
|
|
const response = await fetch(url);
|
|
if (!response.ok) {
|
|
// This shouldn't really happen, but let's check anyways
|
|
return `Couldn't transclude markdown from external source. Server responded with: ${response.status}`;
|
|
}
|
|
|
|
markdown = await response.text();
|
|
|
|
const parsedURL = new URL(url);
|
|
if (parsedURL.hash) {
|
|
details = {
|
|
type: "header",
|
|
header: parsedURL.hash,
|
|
};
|
|
}
|
|
} else {
|
|
const ref = parseToRef(url);
|
|
|
|
if (!ref || !isMarkdownPath(ref.path)) {
|
|
// We can be fairly sure this can't happen, but just be sure
|
|
return `Couldn't transclude markdown, invalid path`;
|
|
}
|
|
|
|
details = ref.details;
|
|
|
|
// Do a pre-check, because `readPage` is quiete heavy
|
|
if (!client.clientSystem.allKnownFiles.has(ref.path)) {
|
|
return `Couldn't transclude markdown, page doesn't exist`;
|
|
}
|
|
|
|
// Don't try catch, we just checked the existence
|
|
({ text: markdown } = await client.space.readPage(
|
|
getNameFromPath(ref.path),
|
|
));
|
|
}
|
|
|
|
const transclusion = extractTransclusion(markdown, details);
|
|
if (!transclusion) {
|
|
return `Couldn't extract translcusion from markdown, try removing any headers '\\#' or positions '@' from your link`;
|
|
}
|
|
|
|
result = transclusion;
|
|
} else {
|
|
result = `Server responded with unsupported mimeType: ${mimeType}`;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
// Parse an alias, possibly containing dimensions into an object
|
|
// Formats supported: "alias", "alias|100", "alias|100x200", "100", "100x200"
|
|
function parseAlias(
|
|
text: string,
|
|
): { alias: string; dim?: ContentDimensions } {
|
|
let alias: string;
|
|
let dim: ContentDimensions | undefined;
|
|
if (text.includes("|")) {
|
|
const [aliasPart, dimPart] = text.split("|");
|
|
alias = aliasPart;
|
|
const [width, height] = dimPart.split("x");
|
|
dim = {};
|
|
if (width) {
|
|
dim.width = parseInt(width);
|
|
}
|
|
if (height) {
|
|
dim.height = parseInt(height);
|
|
}
|
|
} else if (/^[x\d]/.test(text)) {
|
|
const [width, height] = text.split("x");
|
|
dim = {};
|
|
if (width) {
|
|
dim.width = parseInt(width);
|
|
}
|
|
if (height) {
|
|
dim.height = parseInt(height);
|
|
}
|
|
alias = "";
|
|
} else {
|
|
alias = text;
|
|
}
|
|
|
|
return { alias, dim };
|
|
}
|
|
|
|
export function inlineContentPlugin(client: Client) {
|
|
return decoratorStateField((state: EditorState) => {
|
|
const widgets: Range<Decoration>[] = [];
|
|
if (!shouldRenderWidgets(client)) {
|
|
console.info("Not rendering widgets");
|
|
return Decoration.set([]);
|
|
}
|
|
|
|
syntaxTree(state).iterate({
|
|
enter: ({ type, from, to }) => {
|
|
if (type.name !== "Image") {
|
|
return;
|
|
}
|
|
|
|
const text = state.sliceDoc(from, to);
|
|
|
|
let url, alias = undefined;
|
|
let isWikilink = false;
|
|
|
|
mdLinkRegex.lastIndex = 0;
|
|
wikiLinkRegex.lastIndex = 0;
|
|
let match: RegExpMatchArray | null = null;
|
|
if ((match = mdLinkRegex.exec(text)) && match.groups) {
|
|
({ url, title: alias } = match.groups);
|
|
|
|
if (isLocalURL(url)) {
|
|
url = resolveMarkdownLink(
|
|
client.currentName(),
|
|
decodeURI(url),
|
|
);
|
|
}
|
|
} else if ((match = wikiLinkRegex.exec(text)) && match.groups) {
|
|
({ stringRef: url, alias } = match.groups);
|
|
isWikilink = true;
|
|
} else {
|
|
// We found no match
|
|
return;
|
|
}
|
|
|
|
let dimension: ContentDimensions | undefined;
|
|
if (alias) {
|
|
({ alias, dim: dimension } = parseAlias(alias));
|
|
} else {
|
|
alias = "";
|
|
}
|
|
|
|
if (!isCursorInRange(state, [from, to])) {
|
|
widgets.push(invisibleDecoration.range(from, to));
|
|
}
|
|
|
|
widgets.push(
|
|
Decoration.widget({
|
|
widget: new LuaWidget(
|
|
client,
|
|
`widget:${client.currentPath()}:${text}`,
|
|
text,
|
|
async () => {
|
|
const result = await inlineHtmlFromURL(
|
|
client,
|
|
url,
|
|
alias,
|
|
dimension,
|
|
!isWikilink,
|
|
);
|
|
const content = typeof result === "string"
|
|
? { markdown: result }
|
|
: { html: result };
|
|
|
|
return {
|
|
_isWidget: true,
|
|
display: "block",
|
|
cssClasses: ["sb-inline-content"],
|
|
...content,
|
|
};
|
|
},
|
|
true,
|
|
true,
|
|
),
|
|
block: true,
|
|
}).range(to + 1),
|
|
);
|
|
},
|
|
});
|
|
|
|
return Decoration.set(widgets, true);
|
|
});
|
|
}
|