@cobapen/markdown 0.5.2 → 0.6.0

package/lib/index.d.ts

@@ -1,10 +1,15 @@
 import markdownIt, { Options as MarkdownOptions } from "markdown-it";
+import { ReplaceHandler } from "./link/replacelink.js";
 import { Options as MathOptions } from "./math/mathjax.js";
 export interface Config {
     showCodeTitleByDefault: boolean;
+    linkRewrite?: ReplaceHandler;
     markdown: Partial<MarkdownOptions>;
     math: Partial<MathOptions>;
 }
+export interface RenderOptions {
+    file: string;
+}
 export type Options = Partial<Config>;
 export declare class CMarkdown {
     private readonly _config;
@@ -12,6 +17,7 @@ export declare class CMarkdown {
     private readonly _md;
     constructor(option?: Options);
     setup(md: markdownIt): void;
-    render(text: string): string;
+    render(text: string, opt?: Partial<RenderOptions>): string;
+    waitMathInit(): Promise<void>;
     mathcss(): string;
 }

package/lib/index.js

@@ -47,17 +47,22 @@ export class CMarkdown {
             .use(cjk_break)
             .use(footnote)
             .use(deflist)
-            .use(replacelink)
+            .use(replacelink, {
+            replace: this._config.linkRewrite,
+        })
             .use(advTable)
             .use(mdmath(this._mj))
             .use(toc, {
             includeLevel: [2, 3],
         });
     }
-    render(text) {
-        const env = { ...this._config };
+    render(text, opt) {
+        const env = { ...opt };
         return this._md.render(text, env);
     }
+    async waitMathInit() {
+        return this._mj.waitInit();
+    }
     mathcss() {
         return this._mj.stylesheet();
     }

package/lib/link/replacelink.d.ts

@@ -1,8 +1,9 @@
 import type { PluginWithOptions } from "markdown-it";
 import type Token from "markdown-it/lib/token.mjs";
-type ReplaceHandler = (link: string, env: any, token: Token) => string;
-interface Options {
+export type ReplaceHandler = (link: string, env: any, token: Token) => string;
+export interface Options {
     replace: ReplaceHandler;
 }
+export declare function defaultHandler(link: string, _env: any, _token: Token): string;
 export declare const replacelink: PluginWithOptions<Options>;
 export default replacelink;

package/lib/link/replacelink.js

@@ -1,4 +1,4 @@
-function defaultHandler(link, _env, _token) {
+export function defaultHandler(link, _env, _token) {
     if (!link.startsWith("http") && link.endsWith(".md")) {
         return link.replace(/\.md$/, ".html");
     }
@@ -13,6 +13,18 @@ function replaceAttr(token, attrName, handler, env) {
         }
     });
 }
+function replaceHtmlAttr(token, handler, env) {
+    const regex = /(href|src)\s*=\s*["']([^"']+)["']/g;
+    let content = token.content;
+    let match = regex.exec(content);
+    while (match !== null) {
+        const before = match[2];
+        const replaced = handler(before, env, token);
+        content = content.replace(before, replaced);
+        match = regex.exec(content);
+    }
+    token.content = content;
+}
 function getHandler(option) {
     const replaceFn = option?.replace || defaultHandler;
     function handler(state) {
@@ -25,8 +37,14 @@ function getHandler(option) {
                     else if (childToken.type == "image") {
                         replaceAttr(childToken, "src", replaceFn, state.env);
                     }
+                    else if (childToken.type == "html_inline") {
+                        replaceHtmlAttr(childToken, replaceFn, state.env);
+                    }
                 });
             }
+            else if (token.type === "html_block") {
+                replaceHtmlAttr(token, replaceFn, state.env);
+            }
         });
     }
     ;

package/lib/math/mathjax.d.ts

@@ -59,12 +59,15 @@ type FontName = typeof fontNames[number];
 interface AnyObject {
     [x: string]: any;
 }
-export interface Options {
+export interface Options extends DeepPartial<EngineOptions> {
     loader?: DeepPartial<LoaderOptions>;
     tex?: DeepPartial<TexInputOptions>;
     output?: DeepPartial<OutputOptions>;
     chtml?: DeepPartial<CHTMLOptions>;
 }
+interface EngineOptions {
+    noAsyncLoad: boolean;
+}
 interface LoaderOptions {
     load: string[];
     paths: {
@@ -133,13 +136,16 @@ export interface ConvertOptions {
     width: number;
 }
 export declare class MathjaxEngine {
+    private _initStatus;
     option: Options;
     adaptor: LiteAdaptor;
     tex: TeX<N, T, D>;
     chtml: CHTML<N, T, D>;
     html: MathDocument<N, T, D>;
     constructor(option?: Partial<Options>);
-    convert(tex: string, override?: Partial<ConvertOptions>): string;
+    private asyncInit;
+    waitInit(): Promise<void>;
+    convert(tex: string, option?: Partial<ConvertOptions>): string;
     stylesheet(): string;
 }
 export {};

package/lib/math/mathjax.js

@@ -57,6 +57,7 @@ const fontNames = [
     "mathjax-newcm",
     "mathjax-stix2"
 ];
+const defaultFontName = fontNames[0];
 function isFontName(name) {
     return fontNames.includes(name);
 }
@@ -76,13 +77,14 @@ const packageList = [
 ].concat(texExtensions);
 const MATHJAX_DEFAULT_FONT_URL = (name) => `https://cdn.jsdelivr.net/npm/@mathjax/${name}-font@4/chtml/woff2`;
 const defaultMathOption = {
+    noAsyncLoad: true,
     tex: {
         packages: packageList,
     },
     output: {
         scale: 1.21,
         exFactor: 5,
-        font: "mathjax-newcm",
+        font: defaultFontName,
     },
     chtml: {
         adaptiveCSS: true,
@@ -95,6 +97,7 @@ const defaultConvertOption = {
     width: 80 * 16,
 };
 export class MathjaxEngine {
+    _initStatus = null;
     option;
     adaptor;
     tex;
@@ -109,6 +112,9 @@ export class MathjaxEngine {
             ...this.option.output,
             ...this.option.chtml,
         });
+        if (this.option.noAsyncLoad !== true) {
+            this._initStatus = this.asyncInit(chtml);
+        }
         const html = mathjax.document("", {
             InputJax: tex,
             OutputJax: chtml,
@@ -130,14 +136,19 @@ export class MathjaxEngine {
             adaptor.append(math.typesetRoot, text);
         }
     }
-    convert(tex, override) {
-        const node = this.html.convert(tex, {
-            display: !(override?.inline ?? defaultConvertOption.inline),
-            em: override?.em ?? defaultConvertOption.em,
-            ex: override?.ex ?? defaultConvertOption.ex,
-            containerWidth: override?.width ?? defaultConvertOption.width,
-            scale: 1.0,
-        });
+    async asyncInit(chtml) {
+        await import("@mathjax/src/js/util/asyncLoad/esm.js");
+        await chtml.font.loadDynamicFiles();
+    }
+    ;
+    async waitInit() {
+        if (this._initStatus) {
+            await this._initStatus;
+            this._initStatus = null;
+        }
+    }
+    convert(tex, option) {
+        const node = this.html.convert(tex, convOption(option));
         if (node instanceof LiteElement) {
             return this.adaptor.outerHTML(node);
         }
@@ -159,7 +170,7 @@ function initOption(opt) {
     if (option.output?.font !== undefined && typeof option.output.font === "string") {
         let name = option.output.font.trim();
         if (name === "default") {
-            name = "mathjax-newcm";
+            name = defaultFontName;
         }
         if (isFontName(name)) {
             if (option.output.fontData === undefined) {
@@ -171,5 +182,20 @@ function initOption(opt) {
             }
         }
     }
+    if (option.chtml?.adaptiveCSS !== true) {
+        if (option.noAsyncLoad) {
+            console.warn("[MathjaxEngine] adaptiveCSS is disabled, so noAsyncLoad is forced to false.");
+        }
+        option.noAsyncLoad = false;
+    }
     return option;
 }
+function convOption(option) {
+    return {
+        display: !(option?.inline ?? defaultConvertOption.inline),
+        em: option?.em ?? defaultConvertOption.em,
+        ex: option?.ex ?? defaultConvertOption.ex,
+        containerWidth: option?.width ?? defaultConvertOption.width,
+        scale: 1.0,
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobapen/markdown",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "A markdown converter for cobapen website",
   "keywords": [
     "markdown"