fix(template): remove regex usage of lookbehind assertions (#1689)

* fix(template): remove regex usage of lookbehind assertions * feat(template): key with space supported
antvis · Oct 8, 2020 · 92133d0 · 92133d0
1 parent baa20f4
commit 92133d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/__tests__/unit/utils/template-spec.ts b/__tests__/unit/utils/template-spec.ts
@@ -4,9 +4,11 @@ describe('template', () => {
   it('template', () => {
     const data = { name: 'item1', value: 1, percentage: 0.23 };
     expect(template('{name}: {value}', data)).toBe('item1: 1');
+    expect(template('{ name }: { value }', data)).toBe('item1: 1');
     expect(template('{name}\n{value}', data)).toBe('item1\n1');
     expect(template('{name {value}', data)).toBe('{name 1');
     expect(template('{name} value}', data)).toBe('item1 value}');
+    expect(template('{name} {name}2 value}', data)).toBe('item1 item12 value}');
     expect(template('{name}: {value}({percentage})', data)).toBe('item1: 1(0.23)');
     // 没有 match 的 data 原路返回
     expect(template('{name}: {value}({percentage1})', data)).toBe('item1: 1({percentage1})');

diff --git a/src/utils/template.ts b/src/utils/template.ts
@@ -1,9 +1,15 @@
+import { reduce } from '@antv/util';
 /**
- * 模板分割符, 默认 { }
+ * 简单的模板引擎，使用方式如下（空格自动忽略）：
+ * template('hello, {name}', { name: 'AntV' }); // hello, AntV
  * @param string
  * @param options
  */
 export function template(source: string, data: object): string {
-  // `(?<=y)x` 匹配'x'仅当'x'前面是'y'.这种叫做后行断言; `x(?=y)` 匹配'x'仅仅当'x'后面跟着'y'.这种叫做先行断言。
-  return source.replace(/{((?<={)[^{}]+(?=}))}/g, (match, key) => data[key.trim()] || match);
+  return reduce(
+    // @ts-ignore
+    data,
+    (r: string, v: string, k: string) => r.replace(new RegExp(`{\\s*${k}\\s*}`, 'g'), v),
+    source
+  );
 }