Skip to content

Commit 92133d0

Browse files
authored
fix(template): remove regex usage of lookbehind assertions (#1689)
* fix(template): remove regex usage of lookbehind assertions * feat(template): key with space supported
1 parent baa20f4 commit 92133d0

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

__tests__/unit/utils/template-spec.ts

+2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ describe('template', () => {
44
it('template', () => {
55
const data = { name: 'item1', value: 1, percentage: 0.23 };
66
expect(template('{name}: {value}', data)).toBe('item1: 1');
7+
expect(template('{ name }: { value }', data)).toBe('item1: 1');
78
expect(template('{name}\n{value}', data)).toBe('item1\n1');
89
expect(template('{name {value}', data)).toBe('{name 1');
910
expect(template('{name} value}', data)).toBe('item1 value}');
11+
expect(template('{name} {name}2 value}', data)).toBe('item1 item12 value}');
1012
expect(template('{name}: {value}({percentage})', data)).toBe('item1: 1(0.23)');
1113
// 没有 match 的 data 原路返回
1214
expect(template('{name}: {value}({percentage1})', data)).toBe('item1: 1({percentage1})');

src/utils/template.ts

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
import { reduce } from '@antv/util';
12
/**
2-
* 模板分割符, 默认 { }
3+
* 简单的模板引擎,使用方式如下(空格自动忽略):
4+
* template('hello, {name}', { name: 'AntV' }); // hello, AntV
35
* @param string
46
* @param options
57
*/
68
export function template(source: string, data: object): string {
7-
// `(?<=y)x` 匹配'x'仅当'x'前面是'y'.这种叫做后行断言; `x(?=y)` 匹配'x'仅仅当'x'后面跟着'y'.这种叫做先行断言。
8-
return source.replace(/{((?<={)[^{}]+(?=}))}/g, (match, key) => data[key.trim()] || match);
9+
return reduce(
10+
// @ts-ignore
11+
data,
12+
(r: string, v: string, k: string) => r.replace(new RegExp(`{\\s*${k}\\s*}`, 'g'), v),
13+
source
14+
);
915
}

0 commit comments

Comments
 (0)