fix #230

packages/utils/bbcode/__test__/html.test.ts

@@ -1,5 +1,6 @@
 import { STICKER_DOMAIN_URL } from '../constants';
-import { renderNodes, renderNode, render } from '../html';
+import { renderNodes, renderNode, render, renderWithParser } from '../html';
+import { Parser } from '../parser';
 import type { VNode } from '../types';
 
 describe('html render vnode', () => {
@@ -239,4 +240,27 @@ describe('html render bbcode string', () => {
       '<div class="codeHighlight"><pre>ss[b]加粗\n换行了[/b](bgm38) [/fafa [code]</pre></div>',
     );
   });
+
+  test('render code by custom converter, nested', () => {
+    const input = '[b][url]http://qq.com[/url][/b]';
+    expect(
+      render(input, {
+        url: (node) => {
+          return '[url]convert map[/url]';
+        },
+      }),
+    ).toBe('<strong>[url]convert map[/url]</strong>');
+  });
+  test('render code with Parser, nested', () => {
+    const input = '[b]加粗[size=16]16px[img]http://chii.in/img/ico/bgm88-31.gif[/img][/size][/b]';
+    expect(
+      renderWithParser(new Parser(input, [], ['img']), {
+        url: (node) => {
+          return '[url]convert map[/url]';
+        },
+      }),
+    ).toBe(
+      '<strong>加粗<span style="font-size:16px;line-height:16px">16px[img]http://chii.in/img/ico/bgm88-31.gif[/img]</span></strong>',
+    );
+  });
 });

packages/utils/bbcode/__test__/parser.test.ts

@@ -89,6 +89,15 @@ describe('bbcode parser', () => {
     ];
     expect(getNodes(input)).toEqual(expect.arrayContaining(tests));
   });
+  test('ignore img bbcode', () => {
+    const input = `存放于其他网络服务器的图片：
+[img]http://chii.in/img/ico/bgm88-31.gif[/img]`;
+    const tests: CodeNodeTypes[] = [
+      '存放于其他网络服务器的图片：\n',
+      '[img]http://chii.in/img/ico/bgm88-31.gif[/img]',
+    ];
+    expect(new Parser(input, [], ['img']).parse()).toEqual(expect.arrayContaining(tests));
+  });
   test('simple bbcode', () => {
     const input = `我是[mask]马赛克文字[/mask]
 [s]删除线文字[/s]
@@ -320,6 +329,33 @@ describe('bbcode parser', () => {
       ]),
     );
   });
+  test('merge tags with ignore case', () => {
+    const fn = (): boolean => true;
+    const tags = mergeTags(
+      [
+        'i',
+        'b',
+        {
+          name: 's',
+          schema: {
+            s: fn,
+          },
+        },
+      ],
+      [
+        {
+          name: 'i',
+          schema: {
+            i: fn,
+          },
+        },
+        's',
+        'mybbcode',
+      ],
+      ['i', 's'],
+    );
+    expect(tags).toEqual(expect.arrayContaining(['b', 'mybbcode']));
+  });
   test('subject bbcode', () => {
     const tests: Array<[string, CodeNodeTypes[]]> = [
       [

packages/utils/bbcode/convert.ts

@@ -151,6 +151,12 @@ function toVNode(
   return vnode;
 }
 
+let UserConverterFnMap: Record<string, ConverterFn> = {};
+
+export function setUserConverter(map: Record<string, ConverterFn>): void {
+  UserConverterFnMap = map;
+}
+
 const CONVERTER_FN_MAP: Record<string, ConverterFn> = {
   b: (node) => toVNode(node, 'strong'),
   i: (node) => toVNode(node, 'em'),
@@ -233,14 +239,11 @@ const CONVERTER_FN_MAP: Record<string, ConverterFn> = {
   user: convertUser,
 };
 
-export function convert(
-  node: CodeNodeTypes,
-  converterMap: Record<string, ConverterFn> = {},
-): NodeTypes {
+export function convert(node: CodeNodeTypes): NodeTypes {
   if (typeof node === 'string') {
     return node;
   }
-  let converterFn = converterMap[node.type];
+  let converterFn = UserConverterFnMap[node.type];
   if (!converterFn) {
     converterFn = CONVERTER_FN_MAP[node.type];
   }

packages/utils/bbcode/html.ts

@@ -1,5 +1,5 @@
 import { UnreadableCodeError } from '../index';
-import { convert } from './convert';
+import { convert, setUserConverter } from './convert';
 import { Parser } from './parser';
 import type { CodeNodeTypes, ConverterFn, NodeTypes, VNode } from './types';
 
@@ -84,10 +84,20 @@ export function renderNodes(nodes: NodeTypes[], parentNode?: VNode): string {
 }
 
 export function render(rawStr: string, converterMap: Record<string, ConverterFn> = {}): string {
+  return renderWithParser(new Parser(rawStr), converterMap);
+}
+
+export function renderWithParser(
+  parser: Parser,
+  converterMap: Record<string, ConverterFn> = {},
+): string {
   let result = '';
-  const nodes: CodeNodeTypes[] = new Parser(rawStr).parse();
+  const nodes: CodeNodeTypes[] = parser.parse();
+  setUserConverter(converterMap);
   nodes.forEach((node) => {
-    result += renderNode(convert(node, converterMap));
+    result += renderNode(convert(node));
   });
+  // 重置为默认值 @TODO 改成类避免使用全局变量
+  setUserConverter({});
   return result;
 }

packages/utils/bbcode/index.ts

@@ -1,4 +1,4 @@
-export { render } from './html';
+export { render, renderWithParser } from './html';
 export * from './parser';
 export { convert } from './convert';
 export * from './types';

packages/utils/bbcode/parser.ts

@@ -123,15 +123,23 @@ const DEFAULT_TAGS: ITag[] = [
 ];
 
 // 合并 tag 配置。新的覆盖旧的
-export function mergeTags(tagList: ITag[], toMergeTags: ITag[]): ITag[] {
-  const results: ITag[] = [...toMergeTags];
-  tagList.forEach((tag) => {
+export function mergeTags(
+  tagList: ITag[],
+  toMergeTags: ITag[],
+  ignoreTagNames: string[] = [],
+): ITag[] {
+  let results: ITag[] = [...toMergeTags];
+  const getTagName = (tag: ITag) => {
     let name = '';
     if (typeof tag === 'string') {
       name = tag;
     } else {
       name = tag.name;
     }
+    return name;
+  };
+  tagList.forEach((tag) => {
+    const name = getTagName(tag);
     const idx = results.findIndex((t) => {
       if (typeof t === 'string') {
         return t === name;
@@ -142,6 +150,9 @@ export function mergeTags(tagList: ITag[], toMergeTags: ITag[]): ITag[] {
       results.push(tag);
     }
   });
+  results = results.filter((tag) => {
+    return !ignoreTagNames.includes(getTagName(tag));
+  });
   return results;
 }
 
@@ -153,13 +164,13 @@ export class Parser {
   private readonly tagStack: string[];
   private readonly validTags: ITag[];
 
-  constructor(input: string, tags: ITag[] = []) {
+  constructor(input: string, tags: ITag[] = [], ignoreTagNames: string[] = []) {
     this.input = input;
     this.pos = 0;
     this.ctxStack = [];
     this.tagStack = [];
     // 解析器支持的 tag; sticker 用来表示 Bangumi 的表情，不是 bbcode
-    this.validTags = mergeTags(DEFAULT_TAGS, tags);
+    this.validTags = mergeTags(DEFAULT_TAGS, tags, ignoreTagNames);
   }
 
   parse(): CodeNodeTypes[] {