* [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>
93 lines
2.5 KiB
TypeScript
93 lines
2.5 KiB
TypeScript
import {
|
|
collectNodesMatching,
|
|
collectNodesOfType,
|
|
renderToText,
|
|
} from "@silverbulletmd/silverbullet/lib/tree";
|
|
import type { IndexTreeEvent } from "../../type/event.ts";
|
|
import { indexObjects, queryLuaObjects } from "./api.ts";
|
|
import { getNameFromPath, parseToRef } from "../../plug-api/lib/ref.ts";
|
|
import { extractAttributes } from "@silverbulletmd/silverbullet/lib/attribute";
|
|
import { extractHashtag } from "../../plug-api/lib/tags.ts";
|
|
import { lua } from "@silverbulletmd/silverbullet/syscalls";
|
|
import type { ObjectValue } from "../../type/index.ts";
|
|
import type { CompleteEvent } from "@silverbulletmd/silverbullet/type/client";
|
|
|
|
type HeaderObject = ObjectValue<
|
|
{
|
|
name: string;
|
|
page: string;
|
|
level: number;
|
|
pos: number;
|
|
} & Record<string, any>
|
|
>;
|
|
|
|
export async function indexHeaders({ name: pageName, tree }: IndexTreeEvent) {
|
|
const headers: ObjectValue<HeaderObject>[] = [];
|
|
|
|
for (
|
|
const n of collectNodesMatching(
|
|
tree,
|
|
(t) => !!t.type?.startsWith("ATXHeading"),
|
|
)
|
|
) {
|
|
const level = +n.type!.substring("ATXHeading".length);
|
|
const tags = new Set<string>();
|
|
|
|
collectNodesOfType(n, "Hashtag").forEach((h) => {
|
|
// Push tag to the list, removing the initial #
|
|
tags.add(extractHashtag(h.children![0].text!));
|
|
h.children = [];
|
|
});
|
|
|
|
// Extract attributes and remove from tree
|
|
const extractedAttributes = await extractAttributes(n);
|
|
const name = n.children!.slice(1).map(renderToText).join("").trim();
|
|
|
|
headers.push({
|
|
ref: `${pageName}@${n.from}`,
|
|
tag: "header",
|
|
tags: [...tags],
|
|
level,
|
|
name,
|
|
page: pageName,
|
|
pos: n.from!,
|
|
...extractedAttributes,
|
|
});
|
|
}
|
|
|
|
// console.log("Found", headers, "headers(s)");
|
|
await indexObjects(pageName, headers);
|
|
}
|
|
|
|
export async function headerComplete(completeEvent: CompleteEvent) {
|
|
const match = /(?:\[\[|\[.*?\]\()(?<path>[^\[]*)$/.exec(
|
|
completeEvent.linePrefix,
|
|
);
|
|
if (!match || !match.groups?.path) {
|
|
return;
|
|
}
|
|
|
|
const ref = parseToRef(match.groups.path);
|
|
if (!ref || ref.details?.type !== "header") {
|
|
return;
|
|
}
|
|
|
|
const headers = await queryLuaObjects<HeaderObject>(
|
|
"header",
|
|
{
|
|
objectVariable: "_",
|
|
where: await lua.parseExpression(`_.page == name`),
|
|
},
|
|
{ name: getNameFromPath(ref.path) || completeEvent.pageName },
|
|
5,
|
|
);
|
|
|
|
return {
|
|
from: completeEvent.pos - match.groups.path.length,
|
|
options: headers.map((header) => ({
|
|
label: `${getNameFromPath(ref.path)}#${header.name}`,
|
|
type: "header",
|
|
})),
|
|
};
|
|
}
|