chore: re-order for perf

cordiverse · Nov 4, 2024 · 63c6513 · 63c6513
1 parent 9464c72
commit 63c6513
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/core/src/model.ts b/packages/core/src/model.ts
@@ -349,10 +349,12 @@ export class Model<S = any> {
     const result = {}
     for (const key in obj) {
       const type = Type.getInner(model, key)
-      if (!type || isNullable(obj[key]) || isEvalExpr(obj[key])) {
+      if (!type || isNullable(obj[key])) {
         result[key] = obj[key]
       } else if (type.type !== 'json') {
         result[key] = this.resolveValue(type, obj[key])
+      } else if (isEvalExpr(obj[key])) {
+        result[key] = obj[key]
       } else if (type.inner && Type.isArray(type) && Array.isArray(obj[key])) {
         result[key] = obj[key].map(x => this.resolveModel(x, Type.getInner(type)))
       } else if (type.inner) {