@restura/core 1.7.0 → 1.9.0

package/dist/index.d.ts

@@ -40,6 +40,10 @@ declare const loggerConfigSchema: z.ZodObject<{
 }, z.core.$strip>;
 type LoggerConfigSchema = z.infer<typeof loggerConfigSchema>;
 
+/**
+ * @deprecated This is used for passing around until we finally get to the sending externally
+ * // TODO: Remove once backwards compatibility is no longer needed
+ */
 interface RsErrorInternalData<T extends Record<string, unknown> = Record<string, unknown>> {
     err: ErrorCode;
     msg: string;
@@ -70,13 +74,13 @@ declare enum HtmlStatusCodes {
     NETWORK_CONNECT_TIMEOUT = 599
 }
 type ErrorCode = 'BAD_REQUEST' | 'UNAUTHORIZED' | 'PAYMENT_REQUIRED' | 'FORBIDDEN' | 'NOT_FOUND' | 'METHOD_NOT_ALLOWED' | 'REQUEST_TIMEOUT' | 'CONFLICT' | 'GONE' | 'PAYLOAD_TOO_LARGE' | 'UNSUPPORTED_MEDIA_TYPE' | 'UPGRADE_REQUIRED' | 'UNPROCESSABLE_ENTITY' | 'TOO_MANY_REQUESTS' | 'SERVER_ERROR' | 'NOT_IMPLEMENTED' | 'BAD_GATEWAY' | 'SERVICE_UNAVAILABLE' | 'GATEWAY_TIMEOUT' | 'NETWORK_CONNECT_TIMEOUT' | 'UNKNOWN_ERROR' | 'RATE_LIMIT_EXCEEDED' | 'INVALID_TOKEN' | 'INCORRECT_EMAIL_OR_PASSWORD' | 'DUPLICATE' | 'CONNECTION_ERROR' | 'SCHEMA_ERROR' | 'DATABASE_ERROR';
-declare class RsError<T extends Record<string, unknown> = Record<string, unknown>> {
+declare class RsError<T extends Record<string, unknown> = Record<string, unknown>> extends Error {
     err: ErrorCode;
     msg: string;
     options?: T;
     status?: number;
-    stack: string;
     constructor(errCode: ErrorCode, message?: string, options?: T);
+    toJSON(): Record<string, unknown>;
     static htmlStatus(code: ErrorCode): number;
     static isRsError(error: unknown): error is RsError;
 }
@@ -1193,10 +1197,16 @@ declare function questionMarksToOrderedParams(query: string): string;
 /**
  * Creates a query to insert an object into a table.
  * @param table Table name to insert the object into
- * @param obj  Data to insert into the table
- * @returns the query to insert the object into the table
+ * @param obj Data to insert into the table
+ * @param options.customSelect Optional custom SELECT clause that wraps the INSERT in a CTE.
+ *        When provided, the INSERT is wrapped in `WITH inserted AS (INSERT ... RETURNING *)`,
+ *        and your customSelect should reference the `inserted` alias.
+ *        Example: `{ customSelect: 'SELECT i.*, u.email FROM inserted i JOIN "user" u ON i."userId" = u.id' }`
+ * @returns The query to insert the object into the table
  */
-declare function insertObjectQuery(table: string, obj: DynamicObject): string;
+declare function insertObjectQuery(table: string, obj: DynamicObject, options?: {
+    customSelect?: string;
+}): string;
 /**
  * Creates a query to update an object in a table.
  * @param table Table name to update the object in

package/dist/index.js

@@ -14,6 +14,94 @@ import { config } from "@restura/internal";
 import pino from "pino";
 import pinoPretty from "pino-pretty";
 
+// src/restura/RsError.ts
+var HtmlStatusCodes = /* @__PURE__ */ ((HtmlStatusCodes2) => {
+  HtmlStatusCodes2[HtmlStatusCodes2["BAD_REQUEST"] = 400] = "BAD_REQUEST";
+  HtmlStatusCodes2[HtmlStatusCodes2["UNAUTHORIZED"] = 401] = "UNAUTHORIZED";
+  HtmlStatusCodes2[HtmlStatusCodes2["PAYMENT_REQUIRED"] = 402] = "PAYMENT_REQUIRED";
+  HtmlStatusCodes2[HtmlStatusCodes2["FORBIDDEN"] = 403] = "FORBIDDEN";
+  HtmlStatusCodes2[HtmlStatusCodes2["NOT_FOUND"] = 404] = "NOT_FOUND";
+  HtmlStatusCodes2[HtmlStatusCodes2["METHOD_NOT_ALLOWED"] = 405] = "METHOD_NOT_ALLOWED";
+  HtmlStatusCodes2[HtmlStatusCodes2["REQUEST_TIMEOUT"] = 408] = "REQUEST_TIMEOUT";
+  HtmlStatusCodes2[HtmlStatusCodes2["CONFLICT"] = 409] = "CONFLICT";
+  HtmlStatusCodes2[HtmlStatusCodes2["GONE"] = 410] = "GONE";
+  HtmlStatusCodes2[HtmlStatusCodes2["PAYLOAD_TOO_LARGE"] = 413] = "PAYLOAD_TOO_LARGE";
+  HtmlStatusCodes2[HtmlStatusCodes2["UNSUPPORTED_MEDIA_TYPE"] = 415] = "UNSUPPORTED_MEDIA_TYPE";
+  HtmlStatusCodes2[HtmlStatusCodes2["UPGRADE_REQUIRED"] = 426] = "UPGRADE_REQUIRED";
+  HtmlStatusCodes2[HtmlStatusCodes2["UNPROCESSABLE_ENTITY"] = 422] = "UNPROCESSABLE_ENTITY";
+  HtmlStatusCodes2[HtmlStatusCodes2["TOO_MANY_REQUESTS"] = 429] = "TOO_MANY_REQUESTS";
+  HtmlStatusCodes2[HtmlStatusCodes2["SERVER_ERROR"] = 500] = "SERVER_ERROR";
+  HtmlStatusCodes2[HtmlStatusCodes2["NOT_IMPLEMENTED"] = 501] = "NOT_IMPLEMENTED";
+  HtmlStatusCodes2[HtmlStatusCodes2["BAD_GATEWAY"] = 502] = "BAD_GATEWAY";
+  HtmlStatusCodes2[HtmlStatusCodes2["SERVICE_UNAVAILABLE"] = 503] = "SERVICE_UNAVAILABLE";
+  HtmlStatusCodes2[HtmlStatusCodes2["GATEWAY_TIMEOUT"] = 504] = "GATEWAY_TIMEOUT";
+  HtmlStatusCodes2[HtmlStatusCodes2["NETWORK_CONNECT_TIMEOUT"] = 599] = "NETWORK_CONNECT_TIMEOUT";
+  return HtmlStatusCodes2;
+})(HtmlStatusCodes || {});
+var RsError = class _RsError extends Error {
+  err;
+  msg;
+  options;
+  status;
+  constructor(errCode, message, options) {
+    super(message);
+    this.name = "RsError";
+    this.err = errCode;
+    this.msg = message || "";
+    this.status = _RsError.htmlStatus(errCode);
+    this.options = options;
+  }
+  toJSON() {
+    return {
+      type: this.name,
+      err: this.err,
+      message: this.message,
+      msg: this.msg,
+      status: this.status ?? 500,
+      stack: this.stack ?? "",
+      options: this.options
+    };
+  }
+  static htmlStatus(code) {
+    return htmlStatusMap[code];
+  }
+  static isRsError(error) {
+    return error instanceof _RsError;
+  }
+};
+var htmlStatusMap = {
+  // 1:1 mappings to HTTP status codes
+  BAD_REQUEST: 400 /* BAD_REQUEST */,
+  UNAUTHORIZED: 401 /* UNAUTHORIZED */,
+  PAYMENT_REQUIRED: 402 /* PAYMENT_REQUIRED */,
+  FORBIDDEN: 403 /* FORBIDDEN */,
+  NOT_FOUND: 404 /* NOT_FOUND */,
+  METHOD_NOT_ALLOWED: 405 /* METHOD_NOT_ALLOWED */,
+  REQUEST_TIMEOUT: 408 /* REQUEST_TIMEOUT */,
+  CONFLICT: 409 /* CONFLICT */,
+  GONE: 410 /* GONE */,
+  PAYLOAD_TOO_LARGE: 413 /* PAYLOAD_TOO_LARGE */,
+  UNSUPPORTED_MEDIA_TYPE: 415 /* UNSUPPORTED_MEDIA_TYPE */,
+  UPGRADE_REQUIRED: 426 /* UPGRADE_REQUIRED */,
+  UNPROCESSABLE_ENTITY: 422 /* UNPROCESSABLE_ENTITY */,
+  TOO_MANY_REQUESTS: 429 /* TOO_MANY_REQUESTS */,
+  SERVER_ERROR: 500 /* SERVER_ERROR */,
+  NOT_IMPLEMENTED: 501 /* NOT_IMPLEMENTED */,
+  BAD_GATEWAY: 502 /* BAD_GATEWAY */,
+  SERVICE_UNAVAILABLE: 503 /* SERVICE_UNAVAILABLE */,
+  GATEWAY_TIMEOUT: 504 /* GATEWAY_TIMEOUT */,
+  NETWORK_CONNECT_TIMEOUT: 599 /* NETWORK_CONNECT_TIMEOUT */,
+  // Specific business errors mapped to appropriate HTTP codes
+  UNKNOWN_ERROR: 500 /* SERVER_ERROR */,
+  RATE_LIMIT_EXCEEDED: 429 /* TOO_MANY_REQUESTS */,
+  INVALID_TOKEN: 401 /* UNAUTHORIZED */,
+  INCORRECT_EMAIL_OR_PASSWORD: 401 /* UNAUTHORIZED */,
+  DUPLICATE: 409 /* CONFLICT */,
+  CONNECTION_ERROR: 504 /* GATEWAY_TIMEOUT */,
+  SCHEMA_ERROR: 500 /* SERVER_ERROR */,
+  DATABASE_ERROR: 500 /* SERVER_ERROR */
+};
+
 // src/logger/loggerConfigSchema.ts
 import { z } from "zod";
 var loggerConfigSchema = z.object({
@@ -68,6 +156,9 @@ var defaultSerializer = (error) => {
       responseData: err.response?.data
     };
   }
+  if (RsError.isRsError(error)) {
+    return error.toJSON();
+  }
   return baseSerializer(error);
 };
 var errorSerializer = (() => {
@@ -332,83 +423,6 @@ var SqlUtils = class _SqlUtils {
   }
 };
 
-// src/restura/RsError.ts
-var HtmlStatusCodes = /* @__PURE__ */ ((HtmlStatusCodes2) => {
-  HtmlStatusCodes2[HtmlStatusCodes2["BAD_REQUEST"] = 400] = "BAD_REQUEST";
-  HtmlStatusCodes2[HtmlStatusCodes2["UNAUTHORIZED"] = 401] = "UNAUTHORIZED";
-  HtmlStatusCodes2[HtmlStatusCodes2["PAYMENT_REQUIRED"] = 402] = "PAYMENT_REQUIRED";
-  HtmlStatusCodes2[HtmlStatusCodes2["FORBIDDEN"] = 403] = "FORBIDDEN";
-  HtmlStatusCodes2[HtmlStatusCodes2["NOT_FOUND"] = 404] = "NOT_FOUND";
-  HtmlStatusCodes2[HtmlStatusCodes2["METHOD_NOT_ALLOWED"] = 405] = "METHOD_NOT_ALLOWED";
-  HtmlStatusCodes2[HtmlStatusCodes2["REQUEST_TIMEOUT"] = 408] = "REQUEST_TIMEOUT";
-  HtmlStatusCodes2[HtmlStatusCodes2["CONFLICT"] = 409] = "CONFLICT";
-  HtmlStatusCodes2[HtmlStatusCodes2["GONE"] = 410] = "GONE";
-  HtmlStatusCodes2[HtmlStatusCodes2["PAYLOAD_TOO_LARGE"] = 413] = "PAYLOAD_TOO_LARGE";
-  HtmlStatusCodes2[HtmlStatusCodes2["UNSUPPORTED_MEDIA_TYPE"] = 415] = "UNSUPPORTED_MEDIA_TYPE";
-  HtmlStatusCodes2[HtmlStatusCodes2["UPGRADE_REQUIRED"] = 426] = "UPGRADE_REQUIRED";
-  HtmlStatusCodes2[HtmlStatusCodes2["UNPROCESSABLE_ENTITY"] = 422] = "UNPROCESSABLE_ENTITY";
-  HtmlStatusCodes2[HtmlStatusCodes2["TOO_MANY_REQUESTS"] = 429] = "TOO_MANY_REQUESTS";
-  HtmlStatusCodes2[HtmlStatusCodes2["SERVER_ERROR"] = 500] = "SERVER_ERROR";
-  HtmlStatusCodes2[HtmlStatusCodes2["NOT_IMPLEMENTED"] = 501] = "NOT_IMPLEMENTED";
-  HtmlStatusCodes2[HtmlStatusCodes2["BAD_GATEWAY"] = 502] = "BAD_GATEWAY";
-  HtmlStatusCodes2[HtmlStatusCodes2["SERVICE_UNAVAILABLE"] = 503] = "SERVICE_UNAVAILABLE";
-  HtmlStatusCodes2[HtmlStatusCodes2["GATEWAY_TIMEOUT"] = 504] = "GATEWAY_TIMEOUT";
-  HtmlStatusCodes2[HtmlStatusCodes2["NETWORK_CONNECT_TIMEOUT"] = 599] = "NETWORK_CONNECT_TIMEOUT";
-  return HtmlStatusCodes2;
-})(HtmlStatusCodes || {});
-var RsError = class _RsError {
-  err;
-  msg;
-  options;
-  status;
-  stack;
-  constructor(errCode, message, options) {
-    this.err = errCode;
-    this.msg = message || "";
-    this.status = _RsError.htmlStatus(errCode);
-    this.stack = new Error().stack || "";
-    this.options = options;
-  }
-  static htmlStatus(code) {
-    return htmlStatusMap[code];
-  }
-  static isRsError(error) {
-    return error instanceof _RsError;
-  }
-};
-var htmlStatusMap = {
-  // 1:1 mappings to HTTP status codes
-  BAD_REQUEST: 400 /* BAD_REQUEST */,
-  UNAUTHORIZED: 401 /* UNAUTHORIZED */,
-  PAYMENT_REQUIRED: 402 /* PAYMENT_REQUIRED */,
-  FORBIDDEN: 403 /* FORBIDDEN */,
-  NOT_FOUND: 404 /* NOT_FOUND */,
-  METHOD_NOT_ALLOWED: 405 /* METHOD_NOT_ALLOWED */,
-  REQUEST_TIMEOUT: 408 /* REQUEST_TIMEOUT */,
-  CONFLICT: 409 /* CONFLICT */,
-  GONE: 410 /* GONE */,
-  PAYLOAD_TOO_LARGE: 413 /* PAYLOAD_TOO_LARGE */,
-  UNSUPPORTED_MEDIA_TYPE: 415 /* UNSUPPORTED_MEDIA_TYPE */,
-  UPGRADE_REQUIRED: 426 /* UPGRADE_REQUIRED */,
-  UNPROCESSABLE_ENTITY: 422 /* UNPROCESSABLE_ENTITY */,
-  TOO_MANY_REQUESTS: 429 /* TOO_MANY_REQUESTS */,
-  SERVER_ERROR: 500 /* SERVER_ERROR */,
-  NOT_IMPLEMENTED: 501 /* NOT_IMPLEMENTED */,
-  BAD_GATEWAY: 502 /* BAD_GATEWAY */,
-  SERVICE_UNAVAILABLE: 503 /* SERVICE_UNAVAILABLE */,
-  GATEWAY_TIMEOUT: 504 /* GATEWAY_TIMEOUT */,
-  NETWORK_CONNECT_TIMEOUT: 599 /* NETWORK_CONNECT_TIMEOUT */,
-  // Specific business errors mapped to appropriate HTTP codes
-  UNKNOWN_ERROR: 500 /* SERVER_ERROR */,
-  RATE_LIMIT_EXCEEDED: 429 /* TOO_MANY_REQUESTS */,
-  INVALID_TOKEN: 401 /* UNAUTHORIZED */,
-  INCORRECT_EMAIL_OR_PASSWORD: 401 /* UNAUTHORIZED */,
-  DUPLICATE: 409 /* CONFLICT */,
-  CONNECTION_ERROR: 504 /* GATEWAY_TIMEOUT */,
-  SCHEMA_ERROR: 500 /* SERVER_ERROR */,
-  DATABASE_ERROR: 500 /* SERVER_ERROR */
-};
-
 // src/restura/validators/ResponseValidator.ts
 var ResponseValidator = class _ResponseValidator {
   rootMap;
@@ -1910,15 +1924,25 @@ function questionMarksToOrderedParams(query) {
     return char;
   });
 }
-function insertObjectQuery(table, obj) {
+function insertObjectQuery(table, obj, options) {
+  const { customSelect } = options ?? {};
   const keys = Object.keys(obj);
   const params = Object.values(obj);
   const columns = keys.map((column) => escapeColumnName(column)).join(", ");
   const values = params.map((value) => SQL`${value}`).join(", ");
   let query = `
-INSERT INTO "${table}" (${columns})
-                 VALUES (${values})
-                 RETURNING *`;
+		INSERT INTO "${table}" (${columns})
+		VALUES (${values})
+		RETURNING *`;
+  if (customSelect) {
+    query = `
+		WITH inserted AS (
+			INSERT INTO "${table}" (${columns})
+			VALUES (${values})
+			RETURNING *
+		)
+		${customSelect}`;
+  }
   query = query.replace(/'(\?)'/g, "?");
   return query;
 }
@@ -2285,6 +2309,35 @@ var initializers = `
         }
         return format.literal(value);
     }
+
+    // Format a value with optional type cast
+    function formatValueWithCast(rawValue, cast) {
+        var formatted = formatValue(unescapeValue(rawValue));
+        return cast ? formatted + '::' + cast : formatted;
+    }
+
+    // Build SQL IN clause from pipe-separated values with optional cast
+    function buildInClauseWithCast(column, rawValue, cast) {
+        var values = splitPipeValues(rawValue);
+        var literals = values.map(function(v) {
+            var formatted = formatValue(v);
+            return cast ? formatted + '::' + cast : formatted;
+        });
+        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 = `
 {
@@ -2319,7 +2372,7 @@ OldOperator
     = "and"i / "or"i
 
 OldColumn
-    = first:OldText rest:("." OldText)* { 
+    = first:OldColumnPart rest:("." OldColumnPart)* { 
         const partsArray = [first];
         if (rest && rest.length > 0) {
             partsArray.push(...rest.map(item => item[1]));
@@ -2347,20 +2400,25 @@ OldColumn
         return result;
     }
 
-OldText
+OldColumnPart
     = text:[a-z0-9 \\t\\r\\n\\-_:@']i+ {
         return text.join(""); 
     }
 
+OldText
+    = text:[a-z0-9 \\t\\r\\n\\-_:@'.]i+ {
+        return text.join(""); 
+    }
+
 OldType
     = "type" _ ":" _ type:OldTypeString {
         return type; 
     }
 
 OldTypeString
-    = text:"startsWith" { return function(column, value) { return \`\${column}::text ILIKE '\${format.literal(value).slice(1,-1)}%'\`; } }
-    / text:"endsWith"  { return function(column, value) { return \`\${column}::text ILIKE '%\${format.literal(value).slice(1,-1)}'\`; } }
-    / text:"contains" { return function(column, value) { return \`\${column}::text ILIKE '%\${format.literal(value).slice(1,-1)}%'\`; } }
+    = text:"startsWith" { return function(column, value) { return \`\${column} ILIKE '\${format.literal(value).slice(1,-1)}%'\`; } }
+    / text:"endsWith"  { return function(column, value) { return \`\${column} ILIKE '%\${format.literal(value).slice(1,-1)}'\`; } }
+    / text:"contains" { return function(column, value) { return \`\${column} ILIKE '%\${format.literal(value).slice(1,-1)}%'\`; } }
     / text:"exact" { return function(column, value)    { return \`\${column} = \${formatValue(value)}\`; } }
     / text:"greaterThanEqual" { return function(column, value) { return \`\${column} >= \${formatValue(value)}\`; } }
     / text:"greaterThan" { return function(column, value) { return \`\${column} > \${formatValue(value)}\`; } }
@@ -2397,11 +2455,11 @@ SimpleExpr
         { return (negate ? 'NOT ' : '') + '(' + op(col) + ')'; }
     / negate:"!"? _ "(" _ col:Column _ "," _ op:NullOperator _ ")" _
         { return (negate ? 'NOT ' : '') + '(' + op(col) + ')'; }
-    / negate:"!"? _ "(" _ col:Column _ "," _ val:Value _ ")" _
-        { return (negate ? 'NOT ' : '') + '(' + col + ' = ' + formatValue(unescapeValue(val)) + ')'; }
+    / negate:"!"? _ "(" _ col:Column _ "," _ val:CastedValue _ ")" _
+        { 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]));
@@ -2411,38 +2469,54 @@ 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:ValueWithPipes { return function(col) { return buildInClause(col, val); }; }
-    / "ne"i _ "," _ val:Value { return function(col) { return col + ' <> ' + formatValue(unescapeValue(val)); }; }
-    / "gte"i _ "," _ val:Value { return function(col) { return col + ' >= ' + formatValue(unescapeValue(val)); }; }
-    / "gt"i _ "," _ val:Value { return function(col) { return col + ' > ' + formatValue(unescapeValue(val)); }; }
-    / "lte"i _ "," _ val:Value { return function(col) { return col + ' <= ' + formatValue(unescapeValue(val)); }; }
-    / "lt"i _ "," _ val:Value { return function(col) { return col + ' < ' + formatValue(unescapeValue(val)); }; }
-    / "has"i _ "," _ val:Value { return function(col) { return col + '::text ILIKE ' + format.literal('%' + unescapeValue(val) + '%'); }; }
-    / "sw"i _ "," _ val:Value { return function(col) { return col + '::text ILIKE ' + format.literal(unescapeValue(val) + '%'); }; }
-    / "ew"i _ "," _ val:Value { return function(col) { return col + '::text ILIKE ' + format.literal('%' + unescapeValue(val)); }; }
+    = "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 }; }
+
+CastedValueWithPipes
+    = val:ValueWithPipes cast:TypeCast? { return { value: val, cast: cast }; }
+
+TypeCast
+    = "::" type:("timestamptz"i / "timestamp"i / "boolean"i / "numeric"i / "bigint"i / "text"i / "date"i / "int"i)
+        { return type.toLowerCase(); }
 
 Value
     = chars:ValueChar+ { return chars.join(''); }
@@ -2451,7 +2525,8 @@ ValueChar
     = "\\\\\\\\" { return '\\\\\\\\'; }
     / "\\\\," { return '\\\\,'; }
     / "\\\\|" { return '\\\\|'; }
-    / [^,()\\\\|]
+    / [^,()\\\\|:]
+    / c:":" !":"  { return c; }
 
 ValueWithPipes
     = chars:ValueWithPipesChar+ { return chars.join(''); }
@@ -2460,7 +2535,8 @@ ValueWithPipesChar
     = "\\\\\\\\" { return '\\\\\\\\'; }
     / "\\\\," { return '\\\\,'; }
     / "\\\\|" { return '\\\\|'; }
-    / [^,()\\\\]
+    / [^,()\\\\:]
+    / c:":" !":"  { return c; }
 `;
 var fullGrammar = entryGrammar + oldGrammar + newGrammar;
 var filterPsqlParser = peg.generate(fullGrammar, {