* [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>
276 lines
7.3 KiB
TypeScript
276 lines
7.3 KiB
TypeScript
import {
|
|
findNodeMatching,
|
|
findNodeOfType,
|
|
type ParseTree,
|
|
renderToText,
|
|
} from "@silverbulletmd/silverbullet/lib/tree";
|
|
|
|
/**
|
|
* Represents a path with an extension. This is a little cursed, but enforces
|
|
* that people check the path before setting it. For navigation logic the empty
|
|
* path will point to the index page. This could differ for e.g. for the
|
|
* wikilink logic where it points to the currentPage
|
|
*/
|
|
export type Path = `${string}.${string}` | "";
|
|
|
|
/**
|
|
* Represents a reference to a page or document, with optional position, anchor and header
|
|
*/
|
|
export type Ref = {
|
|
path: Path;
|
|
meta?: boolean;
|
|
|
|
details?:
|
|
| { type: "position"; pos: number }
|
|
| { type: "linecolumn"; line: number; column: number }
|
|
| { type: "header"; header: string };
|
|
};
|
|
|
|
/**
|
|
* Determines the file extension of a ref. It will only return the last
|
|
* extension, so `foo.tar.gz` resolves to `gz`
|
|
* @returns The file extension WITHOUT the dot
|
|
*/
|
|
export function getPathExtension(path: Path): string {
|
|
// If the ref links to the the file it's on (i.e. path === ""), it's safe to assume it's a link to a "md" page
|
|
return path !== "" ? path.split(".").pop()!.toLowerCase() : "md";
|
|
}
|
|
|
|
/**
|
|
* Renders a path into a "name". This means it removes the extension for `.md` path
|
|
*/
|
|
export function getNameFromPath(path: Path): string {
|
|
return encodeRef({ path });
|
|
}
|
|
|
|
/**
|
|
* Determines there a ref points to a markdown file
|
|
*/
|
|
export function isMarkdownPath(path: Path): boolean {
|
|
return getPathExtension(path) === "md";
|
|
}
|
|
|
|
/**
|
|
* Adds an `md` extension to any path without an extension or a path ending in
|
|
* `.conflicted`, except to the empty path
|
|
* @param path The path to normalize. Cannot contain any position or header
|
|
* addons
|
|
*/
|
|
function normalizePath(path: string): Path {
|
|
if (path.startsWith("/")) {
|
|
path = path.slice(1);
|
|
}
|
|
|
|
if (/.+\.[a-zA-Z0-9]+$/.test(path) || path === "") {
|
|
return path as Path;
|
|
}
|
|
|
|
return `${path}.md`;
|
|
}
|
|
|
|
/**
|
|
* Determines wether a name conforms to all the requirments.
|
|
*/
|
|
export function isValidName(name: string): boolean {
|
|
const ref = parseToRef(name);
|
|
|
|
// If the name, parses as a link and doesn't provide any other info we can be
|
|
// sure it was only parsed as a path and that the path then conforms to all
|
|
// the requirements
|
|
return !!ref && !ref.details && !ref.meta && name !== "" &&
|
|
encodeRef(ref) === name;
|
|
}
|
|
|
|
/**
|
|
* Determines wether a path conforms to all the requirments.
|
|
*/
|
|
export function isValidPath(path: string): path is Path {
|
|
const ref = parseToRef(path);
|
|
|
|
return !!ref && ref.path === path;
|
|
}
|
|
|
|
/**
|
|
* ONLY TOUCH THIS IF YOU REALLY KNOW WHAT YOU ARE DOING. THIS REGEX IS INTEGRAL
|
|
* TO THE INNER WORKINGS OF SILVERBULLET AND CHANGES COULD INTRODUCE MAJOR BUGS
|
|
*/
|
|
const refRegex =
|
|
/^(?<meta>\^)?(?<path>(?!.*\.[a-zA-Z0-9]+\.md$)(?!\/?(\.|\^))(?!.*(?:\/|^)\.{1,2}(?:\/|$)|.*\/{2})(?!.*(?:\]\]|\[\[))[^@#\|]*)(@(?<pos>\d+)|@[Ll](?<line>\d+)(?:[Cc](?<col>\d+))?|#\s*(?<header>.*))?$/;
|
|
|
|
/**
|
|
* Parses a reference string into a ref object.
|
|
* @returns A ref or if the parsing fails null
|
|
*/
|
|
export function parseToRef(stringRef: string): Ref | null {
|
|
const match = stringRef.match(refRegex);
|
|
if (!match || !match.groups) {
|
|
return null;
|
|
}
|
|
|
|
const groups = match.groups;
|
|
|
|
const ref: Ref = { path: normalizePath(groups.path) };
|
|
|
|
if (groups.meta) {
|
|
ref.meta = true;
|
|
}
|
|
|
|
if (groups.pos !== undefined) {
|
|
ref.details = {
|
|
type: "position",
|
|
pos: parseInt(groups.pos),
|
|
};
|
|
} else if (groups.line !== undefined) {
|
|
ref.details = {
|
|
type: "linecolumn",
|
|
line: parseInt(groups.line),
|
|
column: groups.col !== undefined ? parseInt(groups.col) : 1,
|
|
};
|
|
} else if (groups.header !== undefined) {
|
|
ref.details = {
|
|
type: "header",
|
|
header: groups.header,
|
|
};
|
|
}
|
|
|
|
return ref;
|
|
}
|
|
|
|
/**
|
|
* The inverse of {@link parseToRef}, encodes a ref object into a reference string.
|
|
* It tries to produce the shortest valid representation
|
|
*/
|
|
export function encodeRef(ref: Ref): string {
|
|
let stringRef: string = ref.path;
|
|
|
|
if (isMarkdownPath(ref.path)) {
|
|
stringRef = stringRef.slice(0, -3);
|
|
}
|
|
|
|
if (ref.details?.type === "linecolumn") {
|
|
stringRef += `@L${ref.details.line}`;
|
|
|
|
if (ref.details.column !== 1) {
|
|
stringRef += `C${ref.details.column}`;
|
|
}
|
|
} else if (ref.details?.type === "position") {
|
|
stringRef += `@${ref.details.pos}`;
|
|
} else if (ref.details?.type === "header") {
|
|
stringRef += `#${ref.details.header}`;
|
|
}
|
|
|
|
return stringRef;
|
|
}
|
|
|
|
/**
|
|
* Uses a parseTree and a ref pointing to a position inside it to determine the
|
|
* offset from the start inside it, using {@link getOffsetFromHeader} and
|
|
* {@link getOffsetFromLineColumn}
|
|
* @param text If provided the parseTree won't be rendered back to text
|
|
* @returns The offset in the file if it's able to determine it, otherwise -1
|
|
*/
|
|
export function getOffsetFromRef(
|
|
parseTree: ParseTree,
|
|
ref: Ref,
|
|
text?: string,
|
|
): number {
|
|
if (!ref.details) {
|
|
return -1;
|
|
}
|
|
|
|
switch (ref.details.type) {
|
|
case "position":
|
|
return ref.details.pos;
|
|
case "linecolumn":
|
|
return getOffsetFromLineColumn(
|
|
text ?? renderToText(parseTree),
|
|
ref.details.line,
|
|
ref.details.column,
|
|
);
|
|
case "header": {
|
|
return getOffsetFromHeader(parseTree, ref.details.header);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Find the header inside a {@link ParseTree} and returns the position the end
|
|
* of the header
|
|
* @param parseTree The parse tree. Can e.g. be generate using
|
|
* `markdown.parseMarkdown`
|
|
* @param header The header, spaces at the start or end are ignored
|
|
* @returns The position of the header inside the document, if it can't be found
|
|
* -1
|
|
*/
|
|
export function getOffsetFromHeader(
|
|
parseTree: ParseTree,
|
|
header: string,
|
|
): number {
|
|
const node = findNodeMatching(
|
|
parseTree,
|
|
(subTree) => {
|
|
if (!subTree.type || !subTree.type.startsWith("ATXHeading")) {
|
|
return false;
|
|
}
|
|
|
|
const mark = findNodeOfType(subTree, "HeaderMark");
|
|
if (!mark || !mark.from || !mark.to) {
|
|
return false;
|
|
}
|
|
|
|
return renderToText(subTree)
|
|
.slice(mark.to - mark.from)
|
|
.trimStart() === header.trim();
|
|
},
|
|
);
|
|
|
|
if (!node) {
|
|
return -1;
|
|
}
|
|
|
|
return node.to ?? -1;
|
|
}
|
|
|
|
/**
|
|
* Calculates the character offset from a line and column position. If the
|
|
* position is out of bounds, it does a best-effort job returning a position.
|
|
* @param text The text which is used to determine the offset. Only `\n` are
|
|
* considered line breaks.
|
|
* @param line The line number of the described position. Starts at 1
|
|
* @param column The column number of the described position. Starts at 0
|
|
*/
|
|
export function getOffsetFromLineColumn(
|
|
text: string,
|
|
line: number,
|
|
column: number,
|
|
): number {
|
|
const lines = text.split("\n");
|
|
|
|
const linePos = lines
|
|
.slice(0, Math.max(line - 1, 0))
|
|
.map((l) => l.length)
|
|
.reduce((totalLen, len) => totalLen + len, 0);
|
|
|
|
const columnPos = Math.max(
|
|
0,
|
|
Math.min(lines[line - 1]?.length ?? 0, column - 1),
|
|
);
|
|
|
|
return linePos + columnPos;
|
|
}
|
|
|
|
/**
|
|
* Encodes a page name for use in a URI. Basically does
|
|
* {@link encodeURIComponent}, but puts slashes back in place.
|
|
*/
|
|
export function encodePageURI(page: string): string {
|
|
return encodeURIComponent(page).replace(/%2F/g, "/");
|
|
}
|
|
|
|
/**
|
|
* Decodes a page name from a URI.
|
|
*/
|
|
export function decodePageURI(page: string): string {
|
|
return decodeURIComponent(page);
|
|
}
|