From fd47279bd96abf0f5367076d15ee025470a3701d Mon Sep 17 00:00:00 2001
From: shahrul <shahrul@homeez.com>
Date: Sun, 1 Oct 2023 21:28:14 +0800
Subject: [PATCH] small fix

---
 libs/executeQuery.js | 3 +--
 package.json         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/executeQuery.js b/libs/executeQuery.js
index 361f5b6..a6f4a73 100644
--- a/libs/executeQuery.js
+++ b/libs/executeQuery.js
@@ -71,8 +71,8 @@ const executeQuery = async (query, currentQuery, opts, mergeQuery = {}) => {
     if (alias) {
       key = `${key}/${alias}`
     }
+    currentQuery = await resolvePromises(currentQuery)
     if (value instanceof Object) {
-      currentQuery = await resolvePromises(currentQuery)
       result = await executeQuery(value, currentQuery, { methods, config }, mergeQuery)
       if (currentQuery) {
         if (!(currentQuery instanceof Array) && currentQuery && Object.entries(value) !== result) {
@@ -88,7 +88,6 @@ const executeQuery = async (query, currentQuery, opts, mergeQuery = {}) => {
       }
       buildEntries.push([key, result])
     } else {
-      currentQuery = await resolvePromises(currentQuery)
       // resolved scalar/non-scalar value, and consequently same types
       buildEntries.push([key, typeof currentQuery === typeof value ? currentQuery : value === '*' ? currentQuery : value])
     }
diff --git a/package.json b/package.json
index 031df85..09a2cd3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@syarul/requrse",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Lightweight driven query language",
   "main": "libs/executor.js",
   "scripts": {