fix(utils): use empty string for reference error in interpolation

koishijs · Jun 21, 2021 · 0426a86 · 0426a86
1 parent 90d9dc8
commit 0426a86
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/packages/koishi-utils/src/string.ts b/packages/koishi-utils/src/string.ts
@@ -31,12 +31,17 @@ export function capitalize(source: string) {
 
 // eslint-disable-next-line no-new-func
 export const interpolate = new Function('template', 'context', `
-with (context) {
   return template.replace(/\\{\\{[\\s\\S]+?\\}\\}/g, (sub) => {
     const expr = sub.substring(2, sub.length - 2)
-    return eval(expr)
+    try {
+      with (context) {
+        return eval(expr)
+      }
+    } catch {
+      return ''
+    }
   })
-}`) as ((template: string, context: object) => string)
+`) as ((template: string, context: object) => string)
 
 export function escapeRegExp(source: string) {
   return source

diff --git a/packages/koishi-utils/tests/string.spec.ts b/packages/koishi-utils/tests/string.spec.ts
@@ -31,6 +31,7 @@ describe('String Manipulations', () => {
 
   it('interpolate', () => {
     expect(interpolate('foo{{ bar }}foo', { bar: 'baz' })).to.equal('foobazfoo')
+    expect(interpolate('foo{{ bar }}foo', {})).to.equal('foofoo')
   })
 
   it('escape regexp', () => {