validate $jsonArray dialect

themost-framework · Feb 8, 2025 · 1c5e8d1 · 1c5e8d1
1 parent c26985b
commit 1c5e8d1
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/src/SqliteFormatter.js b/src/SqliteFormatter.js
@@ -388,21 +388,6 @@ class SqliteFormatter extends SqlFormatter {
             // escape expr as field and waiting for parsing results as json array
             return this.escape(expr);
         }
-        if (Object.prototype.hasOwnProperty.call(expr, '$name')) {
-            return this.escape(expr);
-        }
-        if (Object.prototype.hasOwnProperty.call(expr, '$value')) {
-            if (Array.isArray(expr.$value)) {
-                return this.escape(JSON.stringify(expr.$value));
-            }
-            return this.escape(expr);
-        }
-        if (Object.prototype.hasOwnProperty.call(expr, '$literal')) {
-            if (Array.isArray(expr.$literal)) {
-                return this.escape(JSON.stringify(expr.$literal));
-            }
-            return this.escape(expr);
-        }
         // trear expr as select expression
         if (expr.$select) {
             // get select fields
@@ -423,6 +408,23 @@ class SqliteFormatter extends SqlFormatter {
             ];
             return `(${this.format(expr)})`;
         }
+        // treat expression as query field
+        if (Object.prototype.hasOwnProperty.call(expr, '$name')) {
+            return this.escape(expr);
+        }
+        // treat expression as value
+        if (Object.prototype.hasOwnProperty.call(expr, '$value')) {
+            if (Array.isArray(expr.$value)) {
+                return this.escape(JSON.stringify(expr.$value));
+            }
+            return this.escape(expr);
+        }
+        if (Object.prototype.hasOwnProperty.call(expr, '$literal')) {
+            if (Array.isArray(expr.$literal)) {
+                return this.escape(JSON.stringify(expr.$literal));
+            }
+            return this.escape(expr);
+        }
         throw new Error('Invalid json array expression. Expected a valid select expression');
     }
 }