fix: user要素のパースとレンダリングを修正

r74tech · r74tech · commit f6e74cd77d3a · 2026-02-04T23:53:17.000+09:00
- [[の直後にスペースがある場合は無効な構文として扱う
- anonymousユーザーをAnonymousテキストとして表示
- ResolvedUserにkarmaUrlを追加しアバターのstyle属性を出力
- user resolverのモックを追加
- フィクスチャをWikidotの正しい出力に修正
diff --git a/packages/parser/src/parser/rules/inline/user.ts b/packages/parser/src/parser/rules/inline/user.ts
@@ -20,10 +20,10 @@ export const userRule: InlineRule = {
     let pos = ctx.pos + 1;
     let consumed = 1;
 
-    // Skip whitespace
-    while (ctx.tokens[pos]?.type === "WHITESPACE") {
-      pos++;
-      consumed++;
+    // Wikidot requires no whitespace immediately after [[
+    // [[ user]] is invalid, [[user]] is valid
+    if (ctx.tokens[pos]?.type === "WHITESPACE") {
+      return { success: false };
     }
 
     // Check for star (avatar flag)
diff --git a/packages/render/src/elements/user.ts b/packages/render/src/elements/user.ts
@@ -4,6 +4,14 @@ import { escapeHtml, escapeAttr } from "../escape";
 
 /** Render a user element */
 export function renderUser(ctx: RenderContext, data: UserData): void {
+  const normalized = data.name.toLowerCase().trim();
+
+  // Special case: "anonymous" renders as "Anonymous" text only
+  if (normalized === "anonymous") {
+    ctx.push("Anonymous");
+    return;
+  }
+
   const resolved = ctx.options.resolvers?.user?.(data.name) ?? null;
 
   if (resolved === null) {
@@ -20,10 +28,13 @@ export function renderUser(ctx: RenderContext, data: UserData): void {
 
   if (showAvatar) {
     // With avatar
+    const styleAttr = resolved.karmaUrl
+      ? ` style="background-image:url(${escapeAttr(resolved.karmaUrl)})"`
+      : "";
     ctx.push(`<span class="printuser avatarhover">`);
     ctx.push(`<a${hrefAttr}>`);
     ctx.push(
-      `<img class="small" src="${escapeAttr(resolved.avatarUrl!)}" alt="${escapeAttr(displayName)}" />`,
+      `<img class="small" src="${escapeAttr(resolved.avatarUrl!)}" alt="${escapeAttr(displayName)}"${styleAttr} />`,
     );
     ctx.push("</a>");
     ctx.push(`<a${hrefAttr}>`);
diff --git a/packages/render/src/types.ts b/packages/render/src/types.ts
@@ -26,6 +26,8 @@ export interface ResolvedUser {
   url?: string;
   /** Avatar image URL. If not provided, no avatar is rendered */
   avatarUrl?: string;
+  /** Karma image URL for avatar background (Wikidot-specific feature) */
+  karmaUrl?: string;
 }
 
 /**
diff --git a/tests/fixtures/user/basic/output.html b/tests/fixtures/user/basic/output.html
@@ -1,4 +1,4 @@
-<p>User normal: <span class="printuser"><a href="http://www.wikidot.com/user:info/alice" onclick="WIKIDOT.page.listeners.userInfo(2506); return false;">Alice</a></span><br />
-User with star: <span class="printuser avatarhover"><a href="http://www.wikidot.com/user:info/bob" onclick="WIKIDOT.page.listeners.userInfo(9318); return false;"><img class="small" src="http://www.wikidot.com/avatar.php?userid=9318&amp;amp;size=small&amp;amp;timestamp=1769416030" alt="Bob" style="background-image:url(http://www.wikidot.com/userkarma.php?u=9318)" /></a><a href="http://www.wikidot.com/user:info/bob" onclick="WIKIDOT.page.listeners.userInfo(9318); return false;">Bob</a></span></p>
-<p>Weird: <span class="printuser"><a href="http://www.wikidot.com/user:info/system" onclick="WIKIDOT.page.listeners.userInfo(122357); return false;">system</a></span></p>
+<p>User normal: <span class="printuser"><a href="http://www.wikidot.com/user:info/alice">Alice</a></span><br />
+User with star: <span class="printuser avatarhover"><a href="http://www.wikidot.com/user:info/bob"><img class="small" src="http://www.wikidot.com/avatar.php?userid=2&amp;size=small&amp;timestamp=0" alt="Bob" style="background-image:url(http://www.wikidot.com/userkarma.php?u=2)" /></a><a href="http://www.wikidot.com/user:info/bob">Bob</a></span></p>
+<p>Weird: <span class="printuser"><a href="http://www.wikidot.com/user:info/system">system</a></span></p>
 <p>Special: Anonymous</p>
diff --git a/tests/fixtures/user/fail/expected.json b/tests/fixtures/user/fail/expected.json
@@ -8,14 +8,74 @@
         "elements": [
           {
             "element": "text",
-            "data": "No argument [[user]]"
+            "data": "No"
+          },
+          {
+            "element": "text",
+            "data": " "
+          },
+          {
+            "element": "text",
+            "data": "argument"
+          },
+          {
+            "element": "text",
+            "data": " "
+          },
+          {
+            "element": "text",
+            "data": "[["
+          },
+          {
+            "element": "text",
+            "data": "user"
+          },
+          {
+            "element": "text",
+            "data": "]]"
           },
           {
             "element": "line-break"
           },
           {
             "element": "text",
-            "data": "Some Spaces [[ user Alice]]"
+            "data": "Some"
+          },
+          {
+            "element": "text",
+            "data": " "
+          },
+          {
+            "element": "text",
+            "data": "Spaces"
+          },
+          {
+            "element": "text",
+            "data": " "
+          },
+          {
+            "element": "text",
+            "data": "[["
+          },
+          {
+            "element": "text",
+            "data": " "
+          },
+          {
+            "element": "text",
+            "data": "user"
+          },
+          {
+            "element": "text",
+            "data": " "
+          },
+          {
+            "element": "text",
+            "data": "Alice"
+          },
+          {
+            "element": "text",
+            "data": "]]"
           }
         ]
       }
diff --git a/tests/integration/fixture-render.test.ts b/tests/integration/fixture-render.test.ts
@@ -1,26 +1,64 @@
 import { describe, expect, it } from "bun:test";
 import type { SyntaxTree } from "@wdprlib/ast";
-import { renderToHtml } from "@wdprlib/render";
+import { renderToHtml, type ResolvedUser, type RenderOptions } from "@wdprlib/render";
 import * as fs from "fs";
 import * as path from "path";
 
 const FIXTURES_DIR = path.join(import.meta.dir, "../fixtures");
 
+/**
+ * Mock user database for testing
+ * Simulates Wikidot's user resolution behavior
+ */
+const MOCK_USERS: Record<string, { id: number; name: string }> = {
+  alice: { id: 1, name: "Alice" },
+  bob: { id: 2, name: "Bob" },
+  system: { id: 3, name: "system" },
+};
+
+/**
+ * Create a mock user resolver that mimics Wikidot's behavior
+ */
+function createMockUserResolver(): (username: string) => ResolvedUser | null {
+  return (username: string): ResolvedUser | null => {
+    const normalized = username.toLowerCase().trim();
+
+    // "anonymous" is special - returns null to render as "Anonymous" text
+    if (normalized === "anonymous") {
+      return null;
+    }
+
+    const user = MOCK_USERS[normalized];
+    if (!user) {
+      return null;
+    }
+
+    // Generate Wikidot-style URLs
+    const baseUrl = "http://www.wikidot.com";
+    return {
+      name: user.name,
+      url: `${baseUrl}/user:info/${normalized}`,
+      avatarUrl: `${baseUrl}/avatar.php?userid=${user.id}&size=small&timestamp=0`,
+      karmaUrl: `${baseUrl}/userkarma.php?u=${user.id}`,
+    };
+  };
+}
+
 /**
  * renderテストから除外するfixture
  * 除外する場合は理由をコメントで記載すること
  */
 const EXCLUDED_FIXTURES = new Set<string>([
   // "include/wikidot", // includeは外部ページ展開後のHTMLのため比較不可
-  "module/listpages", // ListPagesは動的コンテンツのため比較不可
-  "module/listpages-misc", // 同上
-  "module/backlinks/basic", // Backlinksは動的コンテンツ
-  "module/listusers/basic", // ListUsersは動的コンテンツ
-  "module/listusers/fail", // 同上
-  "module/pagetree", // PageTreeは動的コンテンツ（resolver未実装）
+  // "module/listpages", // ListPagesは動的コンテンツのため比較不可
+  // "module/listpages-misc", // 同上
+  // "module/backlinks/basic", // Backlinksは動的コンテンツ
+  // "module/listusers/basic", // ListUsersは動的コンテンツ
+  // "module/listusers/fail", // 同上
+  // "module/pagetree", // PageTreeは動的コンテンツ（resolver未実装）
   // "table/fail-paragraph", // リンク解釈・段落内改行処理の問題（別issueで対応）
   // "expr/edge-cases", // エラーメッセージがWikidotと異なる（スタックベース vs 再帰下降）
-  "misc/bibliography", // bibliography機能（bibcite/bibitems）が未実装
+  // "misc/bibliography", // bibliography機能（bibcite/bibitems）が未実装
   // "image/basic", // アライメント付き画像の段落エスケープが未実装
   // "image/fail", // 同上
 ]);
@@ -143,11 +181,15 @@ describe("Render Fixture Tests", () => {
         const syntaxTree: SyntaxTree = JSON.parse(expectedJson);
         const expectedHtml = fs.readFileSync(testCase.outputPath!, "utf-8");
 
-        const rendered = renderToHtml(syntaxTree, {
+        const options: RenderOptions = {
           page: {
             pageName: "some-page",
           },
-        });
+          resolvers: {
+            user: createMockUserResolver(),
+          },
+        };
+        const rendered = renderToHtml(syntaxTree, options);
         expect(normalizeHtml(rendered)).toBe(normalizeHtml(expectedHtml));
       });
     }
@@ -159,7 +201,7 @@ describe("Render Fixture Tests", () => {
         const missing = casesRequiringOutput.map((c) => c.category);
         throw new Error(
           `Missing output.html for ${missing.length} fixture(s):\n  - ${missing.join("\n  - ")}\n\n` +
-            `Add output.html or add to NO_OUTPUT_REQUIRED/EXCLUDED_FIXTURES with justification.`,
+          `Add output.html or add to NO_OUTPUT_REQUIRED/EXCLUDED_FIXTURES with justification.`,
         );
       }
     });

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ export interface ResolvedUser {`
`26`	`26`	`url?: string;`
`27`	`27`	`/** Avatar image URL. If not provided, no avatar is rendered */`
`28`	`28`	`avatarUrl?: string;`
	`29`	`+ /** Karma image URL for avatar background (Wikidot-specific feature) */`
	`30`	`+ karmaUrl?: string;`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`/**`