refactor(json-schema): use with statement for compiler

alibaba · Aug 12, 2021 · f913b35 · f913b35
1 parent c54a2df
commit f913b35
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/packages/json-schema/src/compiler.ts b/packages/json-schema/src/compiler.ts
@@ -6,15 +6,17 @@ const ExpRE = /^\s*\{\{([\s\S]*)\}\}\s*$/
 const actionsSymbol = Symbol.for('__REVA_ACTIONS')
 const ENVS = {
   silent: false,
-  compile(expression: string, scope: any) {
-    const vars = Object.keys(scope || {})
-    const params = vars.map((key) => scope[key])
+  compile(expression: string, scope = {}) {
     if (ENVS.silent) {
       try {
-        return new Function(...vars, `return (${expression});`)(...params)
+        return new Function('$root', `with($root) { return (${expression}); }`)(
+          scope
+        )
       } catch {}
     } else {
-      return new Function(...vars, `return (${expression});`)(...params)
+      return new Function('$root', `with($root) { return (${expression}); }`)(
+        scope
+      )
     }
   },
 }