minor: parseMetaの実装、options属性をmeta属性に変更 (#5)

LumaKernel · web-flow · commit e210202574fe · 2025-05-03T21:12:43.000+09:00
* wip

* fmt

* wip

* done

* lint fix

* re-render example

* lint-fix
diff --git a/examples/render/input/katex-0.mdx b/examples/render/input/katex-0.mdx
@@ -11,7 +11,7 @@ return x;
 <KatexDef _="foo" />
 <KatexDef _={"bar"} />
 
-```math!def
+```math def
 \def\idmat{I}
 \gdef\Tr#1{\operatorname{Tr}\left[{#1}\right]}
 ```
@@ -29,6 +29,6 @@ return x;
 
 <KatexReset />
 
-```math {1,2,3} {1-2} lang=js
+```math
 \Tr \idmat = 1
 ```
diff --git a/examples/render/input/math-corner.mdx b/examples/render/input/math-corner.mdx
@@ -0,0 +1,6 @@
+
+
+
+
+
+$ab\}c$
diff --git a/examples/render/input/save-0.mdx b/examples/render/input/save-0.mdx
@@ -18,15 +18,15 @@ A=B
 
 ---
 
-```math!save
+```math $
   A=B
 ```
 
 定義は[$]となる。
 
 ---
 
-```math!save $foo inline
+```math $foo inline
   A=B
 ```
 
diff --git a/examples/render/output/ex1.mdx.js b/examples/render/output/ex1.mdx.js
@@ -129,14 +129,18 @@ function _createMdxContent(props) {
             globalContext: JSON.parse('""'),
             defContext: globalThis[_rehypeKatexContext0],
             content: "a+b",
-            options: "math inline",
+            meta: JSON.parse(
+              '{"category":"show","mode":"inline","subCategory":"normal"}',
+            ),
           }),
           " は ",
           _jsx(LumaKatex, {
             globalContext: JSON.parse('""'),
             defContext: globalThis[_rehypeKatexContext0],
             content: "b+a",
-            options: "math inline",
+            meta: JSON.parse(
+              '{"category":"show","mode":"inline","subCategory":"normal"}',
+            ),
           }),
           " と等しい。",
         ],
@@ -147,7 +151,9 @@ function _createMdxContent(props) {
         defContext: globalThis[_rehypeKatexContext0],
         content:
           "\\begin{aligned} a + b &= b + a \\\\ a \\times b &= b \\times a \\end{aligned}",
-        options: true,
+        meta: JSON.parse(
+          '{"category":"show","mode":"display","subCategory":"normal"}',
+        ),
       }),
       (() => {
         delete globalThis[_rehypeKatexContext0];
diff --git a/examples/render/output/katex-0.mdx.js b/examples/render/output/katex-0.mdx.js
@@ -7,7 +7,7 @@ function _createMdxContent(props) {
   if (!LumaMdxLayout) _missingMdxReference("LumaMdxLayout", true);
   return _jsxs(LumaMdxLayout, {
     file: JSON.parse(
-      '{"data":{},"history":[],"messages":[],"value":"import { someDef } from \\"./someDef.txt\\";\\n\\n{\\n(() => {\\nlet x = 4;\\nreturn x;\\n})()\\n}\\n\\n<KatexDef _={someDef} />\\n<KatexDef _=\\"foo\\" />\\n<KatexDef _={\\"bar\\"} />\\n\\n```math!def\\n\\\\def\\\\idmat{I}\\n\\\\gdef\\\\Tr#1{\\\\operatorname{Tr}\\\\left[{#1}\\\\right]}\\n```\\n\\n```math\\n\\\\Tr \\\\idmat = 1\\n```\\n\\n```math trans\\n1 + 1\\n= S(O) + S(O)\\n= S(O + S(O))\\n= S(S(O))\\n```\\n\\n<KatexReset />\\n\\n```math {1,2,3} {1-2} lang=js\\n\\\\Tr \\\\idmat = 1\\n```\\n"}',
+      '{"data":{},"history":[],"messages":[],"value":"import { someDef } from \\"./someDef.txt\\";\\n\\n{\\n(() => {\\nlet x = 4;\\nreturn x;\\n})()\\n}\\n\\n<KatexDef _={someDef} />\\n<KatexDef _=\\"foo\\" />\\n<KatexDef _={\\"bar\\"} />\\n\\n```math def\\n\\\\def\\\\idmat{I}\\n\\\\gdef\\\\Tr#1{\\\\operatorname{Tr}\\\\left[{#1}\\\\right]}\\n```\\n\\n```math\\n\\\\Tr \\\\idmat = 1\\n```\\n\\n```math trans\\n1 + 1\\n= S(O) + S(O)\\n= S(O + S(O))\\n= S(S(O))\\n```\\n\\n<KatexReset />\\n\\n```math\\n\\\\Tr \\\\idmat = 1\\n```\\n"}',
     ),
     meta: JSON.parse("null"),
     toc: JSON.parse("[]"),
@@ -34,14 +34,18 @@ function _createMdxContent(props) {
         globalContext: JSON.parse('""'),
         defContext: globalThis[_rehypeKatexContext0],
         content: "\\Tr \\idmat = 1",
-        options: true,
+        meta: JSON.parse(
+          '{"category":"show","mode":"display","subCategory":"normal"}',
+        ),
       }),
       "\n",
       _jsx(LumaKatex, {
         globalContext: JSON.parse('""'),
         defContext: globalThis[_rehypeKatexContext0],
         content: "1 + 1 = S(O) + S(O) = S(O + S(O)) = S(S(O))",
-        options: "trans",
+        meta: JSON.parse(
+          '{"category":"show","mode":"display","subCategory":"normal"}',
+        ),
       }),
       "\n",
       void (globalThis[_rehypeKatexContext0] = ""),
@@ -50,7 +54,9 @@ function _createMdxContent(props) {
         globalContext: JSON.parse('""'),
         defContext: globalThis[_rehypeKatexContext0],
         content: "\\Tr \\idmat = 1",
-        options: "{1,2,3} {1-2} lang=js",
+        meta: JSON.parse(
+          '{"category":"show","mode":"display","subCategory":"normal"}',
+        ),
       }),
       (() => {
         delete globalThis[_rehypeKatexContext0];
diff --git a/examples/render/output/math-corner.mdx.js b/examples/render/output/math-corner.mdx.js
@@ -0,0 +1,56 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const _rehypeKatexContext0 = Symbol();
+function _createMdxContent(props) {
+  const _components = {
+      p: "p",
+      ...props.components,
+    },
+    { LumaKatex, LumaMdxLayout } = _components;
+  if (!LumaKatex) _missingMdxReference("LumaKatex", true);
+  if (!LumaMdxLayout) _missingMdxReference("LumaMdxLayout", true);
+  return _jsxs(LumaMdxLayout, {
+    file: JSON.parse(
+      '{"data":{},"history":[],"messages":[],"value":"\\n\\n\\n\\n\\n$ab\\\\}c$\\n"}',
+    ),
+    meta: JSON.parse("null"),
+    toc: JSON.parse("[]"),
+    headers: [],
+    children: [
+      void (globalThis[_rehypeKatexContext0] = ""),
+      "\n",
+      _jsx(_components.p, {
+        children: _jsx(LumaKatex, {
+          globalContext: JSON.parse('""'),
+          defContext: globalThis[_rehypeKatexContext0],
+          content: "ab\\}c",
+          meta: JSON.parse(
+            '{"category":"show","mode":"inline","subCategory":"normal"}',
+          ),
+        }),
+      }),
+      (() => {
+        delete globalThis[_rehypeKatexContext0];
+      })(),
+    ],
+  });
+}
+export default function MDXContent(props = {}) {
+  const { wrapper: MDXLayout } = props.components || {};
+  return MDXLayout
+    ? _jsx(MDXLayout, {
+        ...props,
+        children: _jsx(_createMdxContent, {
+          ...props,
+        }),
+      })
+    : _createMdxContent(props);
+}
+function _missingMdxReference(id, component) {
+  throw new Error(
+    "Expected " +
+      (component ? "component" : "object") +
+      " `" +
+      id +
+      "` to be defined: you likely forgot to import, pass, or provide it.",
+  );
+}
diff --git a/examples/render/output/save-0.mdx.js b/examples/render/output/save-0.mdx.js
@@ -13,7 +13,7 @@ function _createMdxContent(props) {
   if (!Term) _missingMdxReference("Term", true);
   return _jsxs(LumaMdxLayout, {
     file: JSON.parse(
-      '{"data":{},"history":[],"messages":[],"value":"<Save>\\n```math inline\\nA=B\\n```\\n</Save>\\n\\n定義は[$]となる。\\n\\n---\\n\\n<Save $bar>\\n```math inline\\nA=B\\n```\\n</Save>\\n\\n定義は[$bar]となる。\\n\\n---\\n\\n```math!save\\n  A=B\\n```\\n\\n定義は[$]となる。\\n\\n---\\n\\n```math!save $foo inline\\n  A=B\\n```\\n\\n定義は[$foo]となる。\\n"}',
+      '{"data":{},"history":[],"messages":[],"value":"<Save>\\n```math inline\\nA=B\\n```\\n</Save>\\n\\n定義は[$]となる。\\n\\n---\\n\\n<Save $bar>\\n```math inline\\nA=B\\n```\\n</Save>\\n\\n定義は[$bar]となる。\\n\\n---\\n\\n```math $\\n  A=B\\n```\\n\\n定義は[$]となる。\\n\\n---\\n\\n```math $foo inline\\n  A=B\\n```\\n\\n定義は[$foo]となる。\\n"}',
     ),
     meta: JSON.parse("null"),
     toc: JSON.parse("[]"),
@@ -37,7 +37,9 @@ function _createMdxContent(props) {
               globalContext: JSON.parse('""'),
               defContext: globalThis[_rehypeKatexContext0],
               content: "A=B",
-              options: "inline",
+              meta: JSON.parse(
+                '{"category":"show","mode":"inline","subCategory":"normal"}',
+              ),
             }),
           }),
           "となる。",
@@ -62,7 +64,9 @@ function _createMdxContent(props) {
               globalContext: JSON.parse('""'),
               defContext: globalThis[_rehypeKatexContext0],
               content: "A=B",
-              options: "inline",
+              meta: JSON.parse(
+                '{"category":"show","mode":"inline","subCategory":"normal"}',
+              ),
             }),
           }),
           "となる。",
@@ -87,7 +91,9 @@ function _createMdxContent(props) {
               globalContext: JSON.parse('""'),
               defContext: globalThis[_rehypeKatexContext0],
               content: "A=B",
-              options: true,
+              meta: JSON.parse(
+                '{"category":"save","saveName":"","saved":{"category":"show","mode":"display","subCategory":"normal"}}',
+              ),
             }),
           }),
           "となる。",
@@ -112,7 +118,9 @@ function _createMdxContent(props) {
               globalContext: JSON.parse('""'),
               defContext: globalThis[_rehypeKatexContext0],
               content: "A=B",
-              options: "$foo inline",
+              meta: JSON.parse(
+                '{"category":"save","saveName":"foo","saved":{"category":"show","mode":"inline","subCategory":"normal"}}',
+              ),
             }),
           }),
           "となる。",
diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
     "./rehype-code-meta": "./dist/rehype-code-meta.js",
     "./rehype-replace-text": "./dist/rehype-replace-text.js",
     "./rehype-counter": "./dist/rehype-counter.js",
+    "./katex-ex/parse-meta": "./dist/katex-ex/parse-meta.js",
     "./types": "./dist/types.js"
   },
   "scripts": {
diff --git a/src/katex-ex/__tests__/parse-meta.spec.ts b/src/katex-ex/__tests__/parse-meta.spec.ts
@@ -0,0 +1,68 @@
+import { parseMeta } from "../parse-meta.js";
+import { describe, expect, it } from "vitest";
+
+describe("parseMeta", () => {
+  it("show", () => {
+    expect(parseMeta("")).toStrictEqual({
+      category: "show",
+      mode: "display",
+      subCategory: "normal",
+    });
+    expect(parseMeta("inline")).toStrictEqual({
+      category: "show",
+      mode: "inline",
+      subCategory: "normal",
+    });
+    expect(parseMeta("inline-block")).toStrictEqual({
+      category: "show",
+      mode: "inline-block",
+      subCategory: "normal",
+    });
+    expect(parseMeta("trans1")).toStrictEqual({
+      category: "show",
+      mode: "display",
+      subCategory: "transform1",
+    });
+    expect(parseMeta("display trans2")).toStrictEqual({
+      category: "show",
+      mode: "display",
+      subCategory: "transform2",
+    });
+  });
+
+  it("def", () => {
+    expect(parseMeta("def")).toStrictEqual({
+      category: "def",
+    });
+  });
+
+  it("def", () => {
+    expect(parseMeta("$foo")).toStrictEqual({
+      category: "save",
+      saveName: "foo",
+      saved: {
+        category: "show",
+        mode: "display",
+        subCategory: "normal",
+      },
+    });
+    expect(parseMeta("$foo trans1")).toStrictEqual({
+      category: "save",
+      saveName: "foo",
+      saved: {
+        category: "show",
+        mode: "display",
+        subCategory: "transform1",
+      },
+    });
+    expect(parseMeta("inline $")).toStrictEqual({
+      category: "save",
+      saveName: "",
+      saved: {
+        category: "show",
+        mode: "inline",
+        subCategory: "normal",
+      },
+    });
+  });
+});
diff --git a/src/katex-ex/parse-meta.ts b/src/katex-ex/parse-meta.ts
@@ -0,0 +1,57 @@
+export type KatexShowMode = "inline" | "inline-block" | "display";
+
+export type KatexLumaMetaDef = {
+  readonly category: "def";
+};
+export type KatexLumaMetaSave = {
+  readonly category: "save";
+  readonly saveName: string;
+  readonly saved: KatexLumaMetaShow;
+};
+export type KatexLumaMetaShow = {
+  readonly category: "show";
+  readonly mode: KatexShowMode;
+  readonly subCategory: "normal" | "transform1" | "transform2";
+};
+export type KatexLumaMeta =
+  | KatexLumaMetaDef
+  | KatexLumaMetaSave
+  | KatexLumaMetaShow;
+
+export const parseMeta = (meta: string): KatexLumaMeta => {
+  const parts = meta.trim().split(/\s+/);
+
+  let mode: KatexShowMode = "display";
+  let subCategory: "normal" | "transform1" | "transform2" = "normal";
+  let saveName: string | null = null;
+
+  for (const part of parts) {
+    if (part === "inline" || part === "inline-block" || part === "display") {
+      mode = part;
+    } else if (part === "trans1" || part === "transform1") {
+      subCategory = "transform1";
+    } else if (part === "trans2" || part === "transform2") {
+      subCategory = "transform2";
+    } else if (part === "def") {
+      return { category: "def" };
+    } else if (part.startsWith("$")) {
+      saveName = part.slice(1);
+    }
+  }
+
+  const showMeta: KatexLumaMetaShow = {
+    category: "show",
+    mode,
+    subCategory,
+  };
+
+  if (saveName !== null) {
+    return {
+      category: "save",
+      saveName,
+      saved: showMeta,
+    };
+  }
+
+  return showMeta;
+};
diff --git a/src/rehype-katex.ts b/src/rehype-katex.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
++
++
++
++
++
 +$ab\}c$