neil/silverbullet
1
0
Fork 0
Code Activity

A whole lot of enhancements

Browse Source
This commit is contained in:
Zef Hemel
2022-04-04 15:25:07 +02:00
parent 16577c8ea2
commit a7cd3ea7e0
26 changed files with 322 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugs/core/item.ts
+3 -3
View File
@@ -3,7 +3,7 @@ import {whiteOutQueries} from "./materialized_queries";
import {batchSet} from "plugos-silverbullet-syscall/index";
import {parseMarkdown} from "plugos-silverbullet-syscall/markdown";
import {collectNodesMatching, MarkdownTree, render} from "../lib/tree";
import {collectNodesMatching, MarkdownTree, renderMarkdown,} from "../lib/tree";
type Item = {
item: string;
@@ -27,12 +27,12 @@ export async function indexItems({ name, text }: IndexEvent) {
let nested: string | undefined;
for (let child of n.children!.slice(1)) {
if (child.type === "OrderedList" || child.type === "BulletList") {
nested = render(child);
nested = renderMarkdown(child);
break;
}
textNodes.push(child);
}
let item = textNodes.map(render).join("").trim();
let item = textNodes.map(renderMarkdown).join("").trim();
let value: Item = {
item,
};
plugs/core/markdown.ts
-23
View File
@@ -1,23 +0,0 @@
import mdParser from "../../webapp/parser";
import { getText } from "plugos-silverbullet-syscall/editor";
export async function renderMD() {
let text = await getText();
let tree = mdParser.parser.parse(text);
let slicesToRemove: [number, number][] = [];
tree.iterate({
enter(type, from, to): false | void {
switch (type.name) {
case "Comment":
slicesToRemove.push([from, to]);
return false;
}
},
});
// console.log("output peices", JSON.stringify(tree));
slicesToRemove.reverse().forEach(([from, to]) => {
text = text.slice(0, from) + text.slice(to);
});
console.log("Clean md", text);
}
plugs/core/materialized_queries.ts
+30 -3
View File
@@ -1,11 +1,11 @@
import {flashNotification, getCurrentPage, reloadPage, save,} from "plugos-silverbullet-syscall/editor";
import {readPage, writePage} from "plugos-silverbullet-syscall/space";
import {listPages, readPage, writePage,} from "plugos-silverbullet-syscall/space";
import {invokeFunctionOnServer} from "plugos-silverbullet-syscall/system";
import {scanPrefixGlobal} from "plugos-silverbullet-syscall";
export const queryRegex =
/(<!--\s*#query\s+(?<table>\w+)\s*(filter\s+["'“”‘’](?<filter>[^"'“”‘’]+)["'“”‘’])?\s*(group by\s+(?<groupBy>\w+))?\s*-->)(.+?)(<!--\s*#end\s*-->)/gs;
/(<!--\s*#query\s+(?<table>\w+)\s*(filter\s+["'“”‘’](?<filter>[^"'“”‘’]+)["'“”‘’])?\s*\s*(order by\s+(?<orderBy>\w+)(?<orderDesc>\s+desc)?)?(group by\s+(?<groupBy>\w+))?\s*(limit\s+(?<limit>\d+))?\s*-->)(.+?)(<!--\s*#end\s*-->)/gs;
export function whiteOutQueries(text: string): string {
return text.replaceAll(queryRegex, (match) =>
@@ -40,11 +40,38 @@ export async function updateMaterializedQueriesCommand() {
export async function updateMaterializedQueriesOnPage(pageName: string) {
let { text } = await readPage(pageName);
text = await replaceAsync(text, queryRegex, async (match, ...args) => {
let { table, filter, groupBy } = args[args.length - 1];
let { table, filter, groupBy, limit, orderBy, orderDesc } =
args[args.length - 1];
const startQuery = args[0];
const endQuery = args[args.length - 4];
let results = [];
switch (table) {
case "page":
let pages = await listPages();
if (orderBy) {
pages = pages.sort((a: any, b: any) => {
console.log(a, orderBy, a[orderBy]);
if (a[orderBy] === b[orderBy]) {
return 0;
}
if (a[orderBy] < b[orderBy]) {
return !!orderDesc ? 1 : -1;
} else {
return !!orderDesc ? -1 : 1;
}
});
}
let matchCount = 0;
for (let pageMeta of pages) {
if (!filter || (filter && pageMeta.name.includes(filter))) {
matchCount++;
results.push(`* [[${pageMeta.name}]]`);
if (limit && matchCount === +limit) {
break;
}
}
}
return `${startQuery}\n${results.join("\n")}\n${endQuery}`;
case "task":
for (let {
key,
plugs/core/navigate.ts
+3 -4
View File
@@ -3,8 +3,7 @@ import {updateMaterializedQueriesCommand} from "./materialized_queries";
import {getCursor, getText, navigate as navigateTo, openUrl,} from "plugos-silverbullet-syscall/editor";
import {taskToggleAtPos} from "../tasks/task";
import {parseMarkdown} from "plugos-silverbullet-syscall/markdown";
import {nodeAtPos} from "../lib/tree";
import type {MarkdownTree} from "../../common/tree";
import {MarkdownTree, nodeAtPos} from "../lib/tree";
const materializedQueryPrefix = /<!--\s*#query\s+/;
@@ -34,14 +33,14 @@ async function actionClickOrActionEnter(mdTree: MarkdownTree | null) {
await openUrl(mdTree.children![4].children![0].text!);
break;
case "TaskMarker":
await taskToggleAtPos(mdTree.from + 1);
await taskToggleAtPos(mdTree.from! + 1);
break;
}
}
export async function linkNavigate() {
let mdTree = await parseMarkdown(await getText());
let newNode = await nodeAtPos(mdTree, await getCursor());
let newNode = nodeAtPos(mdTree, await getCursor());
await actionClickOrActionEnter(newNode);
}
plugs/emoji/emoji.ts
+2 -2
View File
@@ -1,11 +1,11 @@
// @ts-ignore
import emojis from "./emoji.json";
import { matchBefore } from "plugos-silverbullet-syscall/editor";
import {matchBefore} from "plugos-silverbullet-syscall/editor";
const emojiMatcher = /\(([^\)]+)\)\s+(.+)$/;
export async function emojiCompleter() {
let prefix = await matchBefore(":[\\w\\s]*");
let prefix = await matchBefore(":[\\w]+");
if (!prefix) {
return null;
}
plugs/lib/tree.test.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import {expect, test} from "@jest/globals";
import {parse} from "../../common/tree";
import {addParentPointers, collectNodesMatching, findParentMatching, nodeAtPos, render,} from "./tree";
import {addParentPointers, collectNodesMatching, findParentMatching, nodeAtPos, renderMarkdown,} from "./tree";
const mdTest1 = `
# Heading
@@ -45,7 +45,7 @@ test("Run a Node sandbox", async () => {
expect(allTodos.length).toBe(2);
// Render back into markdown should be equivalent
expect(render(mdTree)).toBe(mdTest1);
expect(renderMarkdown(mdTree)).toBe(mdTest1);
let mdTree2 = parse(mdTest2);
console.log(JSON.stringify(mdTree2, null, 2));
plugs/lib/tree.ts
+29 -5
View File
@@ -1,7 +1,7 @@
export type MarkdownTree = {
type?: string; // undefined === text node
from: number;
to: number;
from?: number;
to?: number;
text?: string;
children?: MarkdownTree[];
parent?: MarkdownTree;
@@ -57,6 +57,30 @@ export function collectNodesMatching(
return results;
}
export function replaceNodesMatching(
mdTree: MarkdownTree,
substituteFn: (mdTree: MarkdownTree) => MarkdownTree | null | undefined
) {
let subst = substituteFn(mdTree);
if (subst !== undefined) {
if (!mdTree.parent) {
throw Error("Need parent pointers for this");
}
let parentChildren = mdTree.parent.children!;
let pos = parentChildren.indexOf(mdTree);
if (subst) {
parentChildren.splice(pos, 1, subst);
} else {
// null = delete
parentChildren.splice(pos, 1);
}
} else if (mdTree.children) {
for (let child of mdTree.children) {
replaceNodesMatching(child, substituteFn);
}
}
}
export function findNodeMatching(
mdTree: MarkdownTree,
matchFn: (mdTree: MarkdownTree) => boolean
@@ -69,7 +93,7 @@ export function nodeAtPos(
mdTree: MarkdownTree,
pos: number
): MarkdownTree | null {
if (pos < mdTree.from || pos > mdTree.to) {
if (pos < mdTree.from! || pos > mdTree.to!) {
return null;
}
if (!mdTree.children) {
@@ -89,13 +113,13 @@ export function nodeAtPos(
}
// Turn MarkdownTree back into regular markdown text
export function render(mdTree: MarkdownTree): string {
export function renderMarkdown(mdTree: MarkdownTree): string {
let pieces: string[] = [];
if (mdTree.text !== undefined) {
return mdTree.text;
}
for (let child of mdTree.children!) {
pieces.push(render(child));
pieces.push(renderMarkdown(child));
}
return pieces.join("");
}
plugs/markdown/markdown.plug.yaml
+10 -4
View File
@@ -1,6 +1,12 @@
functions:
mdTest:
path: "./markdown.ts:renderMarkdown"
env: client
toggle:
path: "./markdown.ts:togglePreview"
command:
name: "Markdown: Render"
name: "Toggle Markdown Preview"
preview:
path: "./markdown.ts:updateMarkdownPreview"
env: client
events:
- plug:load
- editor:updated
- editor:pageSwitched
plugs/markdown/markdown.ts
+43 -3
View File
@@ -1,5 +1,8 @@
import MarkdownIt from "markdown-it";
import { getText, showRhs } from "plugos-silverbullet-syscall/editor";
import {getText, hideRhs, showRhs} from "plugos-silverbullet-syscall/editor";
import * as clientStore from "plugos-silverbullet-syscall/clientStore";
import {parseMarkdown} from "plugos-silverbullet-syscall/markdown";
import {addParentPointers, renderMarkdown, replaceNodesMatching,} from "../lib/tree";
var taskLists = require("markdown-it-task-lists");
@@ -9,8 +12,45 @@ const md = new MarkdownIt({
typographer: true,
}).use(taskLists);
export async function renderMarkdown() {
export async function togglePreview() {
let currentValue = !!(await clientStore.get("enableMarkdownPreview"));
await clientStore.set("enableMarkdownPreview", !currentValue);
if (!currentValue) {
updateMarkdownPreview();
} else {
hideMarkdownPreview();
}
}
function encodePageUrl(name: string): string {
return name.replaceAll(" ", "_");
}
export async function updateMarkdownPreview() {
if (!(await clientStore.get("enableMarkdownPreview"))) {
return;
}
let text = await getText();
let html = md.render(text);
let mdTree = await parseMarkdown(text);
// console.log("The tree", mdTree);
addParentPointers(mdTree);
replaceNodesMatching(mdTree, (n) => {
if (n.type === "WikiLink") {
const page = n.children![1].children![0].text!;
return {
// HACK
text: `[${page}](/${encodePageUrl(page)})`,
};
}
// Simply get rid of these
if (n.type === "CommentBlock" || n.type === "Comment") {
return null;
}
});
let html = md.render(renderMarkdown(mdTree));
await showRhs(`<html><body>${html}</body></html>`);
}
async function hideMarkdownPreview() {
await hideRhs();
}
plugs/tasks/task.ts
+9 -6
View File
@@ -5,8 +5,8 @@ import {whiteOutQueries} from "../core/materialized_queries";
import {batchSet} from "plugos-silverbullet-syscall/index";
import {readPage, writePage} from "plugos-silverbullet-syscall/space";
import {parseMarkdown} from "plugos-silverbullet-syscall/markdown";
import {dispatch, getText,} from "plugos-silverbullet-syscall/editor";
import {addParentPointers, collectNodesMatching, nodeAtPos, render,} from "../lib/tree";
import {dispatch, getText} from "plugos-silverbullet-syscall/editor";
import {addParentPointers, collectNodesMatching, nodeAtPos, renderMarkdown,} from "../lib/tree";
type Task = {
task: string;
@@ -22,7 +22,7 @@ export async function indexTasks({ name, text }: IndexEvent) {
let mdTree = await parseMarkdown(text);
addParentPointers(mdTree);
collectNodesMatching(mdTree, (n) => n.type === "Task").forEach((n) => {
let task = n.children!.slice(1).map(render).join("").trim();
let task = n.children!.slice(1).map(renderMarkdown).join("").trim();
let complete = n.children![0].children![0].text! !== "[ ]";
let value: Task = {
@@ -32,7 +32,7 @@ export async function indexTasks({ name, text }: IndexEvent) {
let taskIndex = n.parent!.children!.indexOf(n);
let nestedItems = n.parent!.children!.slice(taskIndex + 1);
if (nestedItems.length > 0) {
value.nested = nestedItems.map(render).join("").trim();
value.nested = nestedItems.map(renderMarkdown).join("").trim();
}
tasks.push({
key: `task:${n.from}`,
@@ -93,8 +93,11 @@ export async function taskToggleAtPos(pos: number) {
return;
}
taskMarkerNode.children![0].text = changeTo;
console.log("This will be the new marker", render(taskMarkerNode));
text = render(referenceMdTree);
console.log(
"This will be the new marker",
renderMarkdown(taskMarkerNode)
);
text = renderMarkdown(referenceMdTree);
console.log("Updated reference paged text", text);
await writePage(page, text);
}