* [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>
157 lines
4.9 KiB
TypeScript
157 lines
4.9 KiB
TypeScript
import type { EditorState, Range } from "@codemirror/state";
|
|
import { syntaxTree } from "@codemirror/language";
|
|
import { Decoration } from "@codemirror/view";
|
|
import {
|
|
decoratorStateField,
|
|
invisibleDecoration,
|
|
isCursorInRange,
|
|
} from "./util.ts";
|
|
import type { Client } from "../client.ts";
|
|
import { parse as parseLua } from "../../lib/space_lua/parse.ts";
|
|
import type {
|
|
LuaBlock,
|
|
LuaFunctionCallStatement,
|
|
} from "../../lib/space_lua/ast.ts";
|
|
import { evalExpression } from "../../lib/space_lua/eval.ts";
|
|
import {
|
|
LuaEnv,
|
|
LuaRuntimeError,
|
|
LuaStackFrame,
|
|
luaValueToJS,
|
|
singleResult,
|
|
} from "../../lib/space_lua/runtime.ts";
|
|
import {
|
|
encodeRef,
|
|
getNameFromPath,
|
|
} from "@silverbulletmd/silverbullet/lib/ref";
|
|
import { resolveASTReference } from "../space_lua.ts";
|
|
import { LuaWidget } from "./lua_widget.ts";
|
|
import YAML from "js-yaml";
|
|
import type { PageMeta } from "../../type/index.ts";
|
|
|
|
export function luaDirectivePlugin(client: Client) {
|
|
return decoratorStateField((state: EditorState) => {
|
|
const widgets: Range<Decoration>[] = [];
|
|
|
|
let shouldRender = true;
|
|
|
|
// Don't render Lua directives of federated pages (security)
|
|
if (
|
|
!client.clientSystem.scriptsLoaded
|
|
) {
|
|
return Decoration.none;
|
|
}
|
|
|
|
syntaxTree(state).iterate({
|
|
enter: (node) => {
|
|
// Disable rendering of Lua directives in #meta/template pages
|
|
// Either in frontmatter
|
|
if (node.name === "FrontMatterCode") {
|
|
const text = state.sliceDoc(node.from, node.to);
|
|
try {
|
|
const parsedFrontmatter = YAML.load(text);
|
|
let tags = parsedFrontmatter.tags || [];
|
|
if (typeof tags === "string") {
|
|
tags = tags.split(/\s+|,\s*/);
|
|
}
|
|
if (tags.find((tag: string) => tag.startsWith("meta/template"))) {
|
|
shouldRender = false;
|
|
return;
|
|
}
|
|
} catch {
|
|
// Ignore
|
|
}
|
|
}
|
|
// Or with a hash tag
|
|
if (node.name === "Hashtag") {
|
|
const text = state.sliceDoc(node.from, node.to);
|
|
if (text.startsWith("#meta/template")) {
|
|
shouldRender = false;
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (node.name !== "LuaDirective") {
|
|
return;
|
|
}
|
|
|
|
if (isCursorInRange(state, [node.from, node.to])) {
|
|
return;
|
|
}
|
|
|
|
const text = state.sliceDoc(node.from + 2, node.to - 1);
|
|
const currentPageMeta = client.ui.viewState.current?.meta as PageMeta;
|
|
widgets.push(
|
|
Decoration.widget({
|
|
widget: new LuaWidget(
|
|
client,
|
|
`lua:${text}:${currentPageMeta?.name}`,
|
|
text,
|
|
async (bodyText) => {
|
|
try {
|
|
const parsedLua = parseLua(`_(${bodyText})`) as LuaBlock;
|
|
const expr =
|
|
(parsedLua.statements[0] as LuaFunctionCallStatement).call
|
|
.args[0];
|
|
|
|
const tl = new LuaEnv();
|
|
tl.setLocal(
|
|
"currentPage",
|
|
currentPageMeta || (client.ui.viewState.current
|
|
? {
|
|
name: getNameFromPath(
|
|
client.ui.viewState.current.path,
|
|
),
|
|
}
|
|
: undefined),
|
|
);
|
|
const sf = LuaStackFrame.createWithGlobalEnv(
|
|
client.clientSystem.spaceLuaEnv.env,
|
|
expr.ctx,
|
|
);
|
|
const threadLocalizedEnv = new LuaEnv(
|
|
client.clientSystem.spaceLuaEnv.env,
|
|
);
|
|
threadLocalizedEnv.setLocal("_CTX", tl);
|
|
return luaValueToJS(
|
|
singleResult(
|
|
await evalExpression(
|
|
expr,
|
|
threadLocalizedEnv,
|
|
sf,
|
|
),
|
|
),
|
|
sf,
|
|
);
|
|
} catch (e: any) {
|
|
if (e instanceof LuaRuntimeError) {
|
|
if (e.sf?.astCtx) {
|
|
const source = resolveASTReference(e.sf.astCtx);
|
|
if (source) {
|
|
// We know the origin node of the error, let's reference it
|
|
return `**Lua error:** ${e.message} (Origin: [[${
|
|
encodeRef(source)
|
|
}]])`;
|
|
}
|
|
}
|
|
}
|
|
return `**Lua error:** ${e.message}`;
|
|
}
|
|
},
|
|
true,
|
|
true,
|
|
),
|
|
}).range(node.to),
|
|
);
|
|
widgets.push(invisibleDecoration.range(node.from, node.to));
|
|
},
|
|
});
|
|
|
|
if (!shouldRender) {
|
|
return Decoration.set([]);
|
|
}
|
|
|
|
return Decoration.set(widgets, true);
|
|
});
|
|
}
|