@restura/core 1.8.0 → 1.9.0

package/dist/index.js

@@ -2325,6 +2325,19 @@ var initializers = `
         });
         return column + ' IN (' + literals.join(', ') + ')';
     }
+
+    // Format column with optional cast
+    function formatColumn(col) {
+        if (!col.cast) {
+            return col.sql;
+        }
+        // Wrap JSON field extractions in parentheses when casting
+        // because :: has higher precedence than ->>
+        if (col.isJsonField) {
+            return '(' + col.sql + ')::' + col.cast;
+        }
+        return col.sql + '::' + col.cast;
+    }
 `;
 var entryGrammar = `
 {
@@ -2443,10 +2456,10 @@ SimpleExpr
     / negate:"!"? _ "(" _ col:Column _ "," _ op:NullOperator _ ")" _
         { return (negate ? 'NOT ' : '') + '(' + op(col) + ')'; }
     / negate:"!"? _ "(" _ col:Column _ "," _ val:CastedValue _ ")" _
-        { return (negate ? 'NOT ' : '') + '(' + col + ' = ' + formatValueWithCast(val.value, val.cast) + ')'; }
+        { return (negate ? 'NOT ' : '') + '(' + formatColumn(col) + ' = ' + formatValueWithCast(val.value, val.cast) + ')'; }
 
 Column
-    = first:ColPart rest:("." ColPart)* {
+    = first:ColPart rest:("." ColPart)* cast:TypeCast? {
         const partsArray = [first];
         if (rest && rest.length > 0) {
             partsArray.push(...rest.map(item => item[1]));
@@ -2456,38 +2469,44 @@ Column
             throw new SyntaxError('Column path cannot have more than 3 parts (table.column.jsonField)');
         }
         
+        var sql;
+        var isJsonField = false;
         if (partsArray.length === 1) {
-            return quoteSqlIdentity(partsArray[0]);
-        }
-        const tableName = quoteSqlIdentity(partsArray[0]);
-        
-        if (partsArray.length === 2) {
-            return tableName + '.' + quoteSqlIdentity(partsArray[1]);
+            sql = quoteSqlIdentity(partsArray[0]);
+        } else {
+            const tableName = quoteSqlIdentity(partsArray[0]);
+            
+            if (partsArray.length === 2) {
+                sql = tableName + '.' + quoteSqlIdentity(partsArray[1]);
+            } else {
+                const jsonColumn = quoteSqlIdentity(partsArray[1]);
+                const lastPart = partsArray[partsArray.length - 1];
+                const escapedLast = lastPart.replace(/'/g, "''");
+                sql = tableName + '.' + jsonColumn + "->>'" + escapedLast + "'";
+                isJsonField = true;
+            }
         }
         
-        const jsonColumn = quoteSqlIdentity(partsArray[1]);
-        const lastPart = partsArray[partsArray.length - 1];
-        const escapedLast = lastPart.replace(/'/g, "''");
-        return tableName + '.' + jsonColumn + "->>'" + escapedLast + "'";
+        return { sql: sql, cast: cast, isJsonField: isJsonField };
     }
 
 ColPart
     = chars:[a-zA-Z0-9_]+ { return chars.join(''); }
 
 NullOperator
-    = "notnull"i { return function(col) { return col + ' IS NOT NULL'; }; }
-    / "null"i { return function(col) { return col + ' IS NULL'; }; }
+    = "notnull"i { return function(col) { return formatColumn(col) + ' IS NOT NULL'; }; }
+    / "null"i { return function(col) { return formatColumn(col) + ' IS NULL'; }; }
 
 OperatorWithValue
-    = "in"i _ "," _ val:CastedValueWithPipes { return function(col) { return buildInClauseWithCast(col, val.value, val.cast); }; }
-    / "ne"i _ "," _ val:CastedValue { return function(col) { return col + ' <> ' + formatValueWithCast(val.value, val.cast); }; }
-    / "gte"i _ "," _ val:CastedValue { return function(col) { return col + ' >= ' + formatValueWithCast(val.value, val.cast); }; }
-    / "gt"i _ "," _ val:CastedValue { return function(col) { return col + ' > ' + formatValueWithCast(val.value, val.cast); }; }
-    / "lte"i _ "," _ val:CastedValue { return function(col) { return col + ' <= ' + formatValueWithCast(val.value, val.cast); }; }
-    / "lt"i _ "," _ val:CastedValue { return function(col) { return col + ' < ' + formatValueWithCast(val.value, val.cast); }; }
-    / "has"i _ "," _ val:CastedValue { return function(col) { var formatted = format.literal('%' + unescapeValue(val.value) + '%'); return col + ' ILIKE ' + (val.cast ? formatted + '::' + val.cast : formatted); }; }
-    / "sw"i _ "," _ val:CastedValue { return function(col) { var formatted = format.literal(unescapeValue(val.value) + '%'); return col + ' ILIKE ' + (val.cast ? formatted + '::' + val.cast : formatted); }; }
-    / "ew"i _ "," _ val:CastedValue { return function(col) { var formatted = format.literal('%' + unescapeValue(val.value)); return col + ' ILIKE ' + (val.cast ? formatted + '::' + val.cast : formatted); }; }
+    = "in"i _ "," _ val:CastedValueWithPipes { return function(col) { return buildInClauseWithCast(formatColumn(col), val.value, val.cast); }; }
+    / "ne"i _ "," _ val:CastedValue { return function(col) { return formatColumn(col) + ' <> ' + formatValueWithCast(val.value, val.cast); }; }
+    / "gte"i _ "," _ val:CastedValue { return function(col) { return formatColumn(col) + ' >= ' + formatValueWithCast(val.value, val.cast); }; }
+    / "gt"i _ "," _ val:CastedValue { return function(col) { return formatColumn(col) + ' > ' + formatValueWithCast(val.value, val.cast); }; }
+    / "lte"i _ "," _ val:CastedValue { return function(col) { return formatColumn(col) + ' <= ' + formatValueWithCast(val.value, val.cast); }; }
+    / "lt"i _ "," _ val:CastedValue { return function(col) { return formatColumn(col) + ' < ' + formatValueWithCast(val.value, val.cast); }; }
+    / "has"i _ "," _ val:CastedValue { return function(col) { var formatted = format.literal('%' + unescapeValue(val.value) + '%'); return formatColumn(col) + ' ILIKE ' + (val.cast ? formatted + '::' + val.cast : formatted); }; }
+    / "sw"i _ "," _ val:CastedValue { return function(col) { var formatted = format.literal(unescapeValue(val.value) + '%'); return formatColumn(col) + ' ILIKE ' + (val.cast ? formatted + '::' + val.cast : formatted); }; }
+    / "ew"i _ "," _ val:CastedValue { return function(col) { var formatted = format.literal('%' + unescapeValue(val.value)); return formatColumn(col) + ' ILIKE ' + (val.cast ? formatted + '::' + val.cast : formatted); }; }
 
 CastedValue
     = val:Value cast:TypeCast? { return { value: val, cast: cast }; }