Merge branches 'main' and 'main' of https://github.com/wsxiaolin/plweb2

Author: wsxiaolin

README-zh.md

@@ -30,7 +30,6 @@
 
 ## **注意事项**
 - 如果添加新页面，请记得在 `src/router/index.ts` 中添加路由。
-- **富文本渲染将来会被 wasm 版本替换**，不要向当前版本添加新功能。
 - 不要直接使用 localStorage 或 sessionStorage，应使用 @storage/index，并在其中注册键值。
 - 不要直接使用 fetch，应使用 @services/api/。
 - *不要直接通过路径导入静态文件*，应使用 @services/utils 中的 `getPath` 函数。

src/services/pltxt2htm/advancedParser.ts

@@ -4,28 +4,33 @@ import hljs from "highlight.js";
 import dompurify from "dompurify";
 // import renderMathInElement from "katex/contrib/auto-render/auto-render.js";
 
-async function advancedParser(text: string, host: string): Promise<string> {
+async function advancedParser(text: string, host: string, project: string, visitor: string,
+    author : string, coauthors: string): Promise<string> {
   const wasmInstance = await getWasmInstance();
   const instanceAny: any = wasmInstance;
   if (!instanceAny.__advanced_parser_fn) {
     instanceAny.__advanced_parser_fn = wasmInstance.cwrap(
       "fixedadv_parser",
       "number",
-      ["string", "string"],
+      ["string", "string", "string", "string", "string", "string"]
     );
   }
   let deallocate = await getDeallocator();
   let char8_t_const_ptr = (
-    instanceAny.__advanced_parser_fn as (t: string, h: string) => number
-  )(text, host);
+    instanceAny.__advanced_parser_fn as (_1: string, _2: string, _3: string, _4: string, _5: string, _6: string) => number
+  )(text, host,
+    project, visitor, author, coauthors
+  );
   let result = wasmInstance.UTF8ToString(char8_t_const_ptr);
   deallocate(char8_t_const_ptr);
   return result;
 }
 
-async function parse(source: string) {
+async function parse(source: string, project: string, visitor_name: string, visitor_id: string, author_name: string, author_id: string, coauthors: string[]) {
   console.log(source);
-  const rawHtml = await advancedParser(source, import.meta.env.VITE_ROOT_URL);
+  // TODO i18n support for 'None'
+  const rawHtml = await advancedParser(source, import.meta.env.VITE_ROOT_URL, project, `<span class='RUser' data-user='${visitor_id}'>${dompurify.sanitize(visitor_name)}</span>`,
+     `<span class='RUser' data-user='${author_id}'>${dompurify.sanitize(author_name)}</span>`, coauthors.length ? coauthors.join(",") : "None");
   console.log(rawHtml);
   if (!rawHtml) return "";
   const tempDiv = document.createElement("div");

src/services/pltxt2htm/deallocator.ts

@@ -4,7 +4,7 @@ export async function getDeallocator(): Promise<(ptr: number) => void> {
   const wasmInstance = await getWasmInstance();
   const instanceAny: any = wasmInstance;
   if (!instanceAny.__deallocate_fn) {
-    instanceAny.__deallocate_fn = wasmInstance.cwrap("deallocate", null, [
+    instanceAny.__deallocate_fn = wasmInstance.cwrap("free", null, [
       "number",
     ]);
   }