for clj and cljs

Author: shmuelko

src/practitest_firecracker/query_dsl.cljc

@@ -83,17 +83,16 @@
     'trim               (if (= 1 (count args))
                           (string/trim (first args))
                           (return-error "Syntax error: 'trim' must have only one argument" query))
-    (throw
-      (ex-info (str "Syntax error: unsupported function: " op)
-               {:query query}))))
+    (return-error #?(:clj (format "Syntax error: unsupported function '%s'" op)
+                     :cljs (str "Syntax error: unsupported function: " op)) query)))
 
-(defn eval-query-clj [entity-hash query]
+(defn eval-query-clj [entity query]
   (if (map? query)
     (let [{:keys [op args]} query
-          args              (map (partial eval-query-clj entity-hash) args)]
+          args              (map (partial eval-query-clj entity) args)]
       (parse-methods op args query))
     #?(:cljs (cond
-               (= '?field query)                     entity-hash
+               (= '?field query)                     entity
                (string/starts-with? (str query) "?") (throw
                                                        (ex-info (str "Syntax error: unsupported variable " query)
                                                                 {:query query}))
@@ -102,9 +101,9 @@
        :clj (let [key (keyword (string/join (drop 1 (str query))))]
               (cond
                 (or (= :test-suite-name key)
-                    (= :test-case-name key))          (:name entity-hash)
+                    (= :test-case-name key))          (:name entity)
                 (and (not (= entity-hash nil))
-                     (contains? entity-hash key))          (key entity-hash)
+                     (contains? entity-hash key))          (key entity)
                 (string/starts-with? (str query) "?") (str "")
                 :else                                 (str query))))))
 
@@ -114,7 +113,7 @@
           args              (map (partial eval-query entity-hash) args)]
       (parse-methods op args query))
     #?(:cljs (cond
-               (= '?field query)                     entity-hash
+               (= '?field query)                     val
                (string/starts-with? (str query) "?") (throw
                                                        (ex-info (str "Syntax error: unsupported variable " query)
                                                                 {:query query}))