relq 1.0.55 → 1.0.57

package/dist/cjs/condition/array-condition-builder.cjs

@@ -92,6 +92,22 @@ class ArrayConditionCollector {
         });
         return this.parent;
     }
+    slice(column, start, end, values) {
+        this.parent.conditions.push({
+            method: 'array_slice',
+            column,
+            values: { start, end, values }
+        });
+        return this.parent;
+    }
+    atIndex(column, index, value) {
+        this.parent.conditions.push({
+            method: 'array_at_index',
+            column,
+            values: { index, value }
+        });
+        return this.parent;
+    }
     containsPattern(column, pattern, matchType = 'prefix') {
         this.parent.conditions.push({
             method: 'array_contains_pattern',
@@ -237,6 +253,14 @@ function buildArrayConditionSQL(condition) {
         }
         case 'array_length':
             return (0, pg_format_1.default)('array_length(%I, 1) = %L', column, values);
+        case 'array_slice': {
+            const { start, end, values: sliceValues } = values;
+            return (0, pg_format_1.default)('%I[%s:%s] = ARRAY[%s]', column, start, end, sliceValues.map(v => (0, pg_format_1.default)('%L', v)).join(','));
+        }
+        case 'array_at_index': {
+            const { index, value } = values;
+            return (0, pg_format_1.default)('%I[%s] = %L', column, index, value);
+        }
         case 'array_contains_pattern': {
             const { pattern, matchType } = values;
             const likePattern = formatLikePattern(pattern, matchType);

package/dist/cjs/condition/condition-collector.cjs

@@ -13,6 +13,7 @@ const fulltext_condition_builder_1 = require("./fulltext-condition-builder.cjs")
 const range_condition_builder_1 = require("./range-condition-builder.cjs");
 const geometric_condition_builder_1 = require("./geometric-condition-builder.cjs");
 const network_condition_builder_1 = require("./network-condition-builder.cjs");
+const postgis_condition_builder_1 = require("./postgis-condition-builder.cjs");
 class ConditionCollector {
     conditions = [];
     _jsonb;
@@ -21,12 +22,16 @@ class ConditionCollector {
     _range;
     _geometric;
     _network;
+    _postgis;
     get jsonb() {
         if (!this._jsonb) {
             this._jsonb = new jsonb_condition_builder_1.JsonbConditionCollector(this);
         }
         return this._jsonb;
     }
+    get json() {
+        return this.jsonb;
+    }
     get array() {
         if (!this._array) {
             this._array = new array_condition_builder_1.ArrayConditionCollector(this);
@@ -57,6 +62,12 @@ class ConditionCollector {
         }
         return this._network;
     }
+    get postgis() {
+        if (!this._postgis) {
+            this._postgis = new postgis_condition_builder_1.PostgisConditionCollector(this);
+        }
+        return this._postgis;
+    }
     equal(column, value) {
         this.conditions.push({ method: 'equal', column, values: value });
         return this;
@@ -97,28 +108,52 @@ class ConditionCollector {
         this.conditions.push({ method: 'notBetween', column, values: [start, end] });
         return this;
     }
-    startsWith(column, value) {
-        this.conditions.push({ method: 'startsWith', column, values: value });
+    startsWith(column, value, caseInsensitive) {
+        this.conditions.push({
+            method: caseInsensitive ? 'startsWithI' : 'startsWith',
+            column,
+            values: value
+        });
         return this;
     }
-    notStartsWith(column, value) {
-        this.conditions.push({ method: 'notStartsWith', column, values: value });
+    notStartsWith(column, value, caseInsensitive) {
+        this.conditions.push({
+            method: caseInsensitive ? 'notStartsWithI' : 'notStartsWith',
+            column,
+            values: value
+        });
         return this;
     }
-    endsWith(column, value) {
-        this.conditions.push({ method: 'endsWith', column, values: value });
+    endsWith(column, value, caseInsensitive) {
+        this.conditions.push({
+            method: caseInsensitive ? 'endsWithI' : 'endsWith',
+            column,
+            values: value
+        });
         return this;
     }
-    notEndsWith(column, value) {
-        this.conditions.push({ method: 'notEndsWith', column, values: value });
+    notEndsWith(column, value, caseInsensitive) {
+        this.conditions.push({
+            method: caseInsensitive ? 'notEndsWithI' : 'notEndsWith',
+            column,
+            values: value
+        });
         return this;
     }
-    contains(column, value) {
-        this.conditions.push({ method: 'contains', column, values: value });
+    contains(column, value, caseInsensitive) {
+        this.conditions.push({
+            method: caseInsensitive ? 'containsI' : 'contains',
+            column,
+            values: value
+        });
         return this;
     }
-    notContains(column, value) {
-        this.conditions.push({ method: 'notContains', column, values: value });
+    notContains(column, value, caseInsensitive) {
+        this.conditions.push({
+            method: caseInsensitive ? 'notContainsI' : 'notContains',
+            column,
+            values: value
+        });
         return this;
     }
     like(column, pattern) {
@@ -133,6 +168,66 @@ class ConditionCollector {
         this.conditions.push({ method: 'ilike', column, values: pattern });
         return this;
     }
+    notIlike(column, pattern) {
+        this.conditions.push({ method: 'notIlike', column, values: pattern });
+        return this;
+    }
+    regex(column, pattern) {
+        this.conditions.push({ method: 'regex', column, values: pattern });
+        return this;
+    }
+    iregex(column, pattern) {
+        this.conditions.push({ method: 'iregex', column, values: pattern });
+        return this;
+    }
+    notRegex(column, pattern) {
+        this.conditions.push({ method: 'notRegex', column, values: pattern });
+        return this;
+    }
+    notIregex(column, pattern) {
+        this.conditions.push({ method: 'notIregex', column, values: pattern });
+        return this;
+    }
+    similarTo(column, pattern) {
+        this.conditions.push({ method: 'similarTo', column, values: pattern });
+        return this;
+    }
+    notSimilarTo(column, pattern) {
+        this.conditions.push({ method: 'notSimilarTo', column, values: pattern });
+        return this;
+    }
+    isTrue(column) {
+        this.conditions.push({ method: 'isTrue', column });
+        return this;
+    }
+    isFalse(column) {
+        this.conditions.push({ method: 'isFalse', column });
+        return this;
+    }
+    distinctFrom(column, value) {
+        this.conditions.push({ method: 'distinctFrom', column, values: value });
+        return this;
+    }
+    notDistinctFrom(column, value) {
+        this.conditions.push({ method: 'notDistinctFrom', column, values: value });
+        return this;
+    }
+    overlaps(start, end) {
+        this.conditions.push({
+            method: 'overlaps',
+            values: { startColumn: start[0], startValue: start[1], endColumn: end[0], endValue: end[1] }
+        });
+        return this;
+    }
+    greaterThanOrEqual(column, value) {
+        return this.greaterThanEqual(column, value);
+    }
+    lessThanOrEqual(column, value) {
+        return this.lessThanEqual(column, value);
+    }
+    notNull(column) {
+        return this.isNotNull(column);
+    }
     in(column, values) {
         this.conditions.push({ method: 'in', column, values });
         return this;
@@ -169,8 +264,10 @@ class ConditionCollector {
         this.conditions.push({ method: 'and', values: subBuilder.getConditions() });
         return this;
     }
-    raw(condition) {
-        this.conditions.push({ method: 'raw', values: condition });
+    not(callback) {
+        const subBuilder = new ConditionCollector();
+        callback(subBuilder);
+        this.conditions.push({ method: 'not', values: subBuilder.getConditions() });
         return this;
     }
     getConditions() {
@@ -205,6 +302,9 @@ function buildConditionSQL(condition) {
     if (method.startsWith('network_')) {
         return (0, network_condition_builder_1.buildNetworkConditionSQL)(condition);
     }
+    if (method.startsWith('postgis_')) {
+        return (0, postgis_condition_builder_1.buildPostgisConditionSQL)(condition);
+    }
     const col = column ? formatColumn(column) : '';
     switch (method) {
         case 'equal':
@@ -239,22 +339,64 @@ function buildConditionSQL(condition) {
         }
         case 'startsWith':
             return `${col} LIKE ${(0, pg_format_1.default)('%L', `${values}%`)}`;
+        case 'startsWithI':
+            return `${col} ILIKE ${(0, pg_format_1.default)('%L', `${values}%`)}`;
         case 'notStartsWith':
             return `${col} NOT LIKE ${(0, pg_format_1.default)('%L', `${values}%`)}`;
+        case 'notStartsWithI':
+            return `${col} NOT ILIKE ${(0, pg_format_1.default)('%L', `${values}%`)}`;
         case 'endsWith':
             return `${col} LIKE ${(0, pg_format_1.default)('%L', `%${values}`)}`;
+        case 'endsWithI':
+            return `${col} ILIKE ${(0, pg_format_1.default)('%L', `%${values}`)}`;
         case 'notEndsWith':
             return `${col} NOT LIKE ${(0, pg_format_1.default)('%L', `%${values}`)}`;
+        case 'notEndsWithI':
+            return `${col} NOT ILIKE ${(0, pg_format_1.default)('%L', `%${values}`)}`;
         case 'contains':
             return `${col} LIKE ${(0, pg_format_1.default)('%L', `%${values}%`)}`;
+        case 'containsI':
+            return `${col} ILIKE ${(0, pg_format_1.default)('%L', `%${values}%`)}`;
         case 'notContains':
             return `${col} NOT LIKE ${(0, pg_format_1.default)('%L', `%${values}%`)}`;
+        case 'notContainsI':
+            return `${col} NOT ILIKE ${(0, pg_format_1.default)('%L', `%${values}%`)}`;
         case 'like':
             return `${col} LIKE ${(0, pg_format_1.default)('%L', values)}`;
         case 'notLike':
             return `${col} NOT LIKE ${(0, pg_format_1.default)('%L', values)}`;
         case 'ilike':
             return `${col} ILIKE ${(0, pg_format_1.default)('%L', values)}`;
+        case 'notIlike':
+            return `${col} NOT ILIKE ${(0, pg_format_1.default)('%L', values)}`;
+        case 'regex':
+            return `${col} ~ ${(0, pg_format_1.default)('%L', values)}`;
+        case 'iregex':
+            return `${col} ~* ${(0, pg_format_1.default)('%L', values)}`;
+        case 'notRegex':
+            return `${col} !~ ${(0, pg_format_1.default)('%L', values)}`;
+        case 'notIregex':
+            return `${col} !~* ${(0, pg_format_1.default)('%L', values)}`;
+        case 'similarTo':
+            return `${col} SIMILAR TO ${(0, pg_format_1.default)('%L', values)}`;
+        case 'notSimilarTo':
+            return `${col} NOT SIMILAR TO ${(0, pg_format_1.default)('%L', values)}`;
+        case 'isTrue':
+            return `${col} IS TRUE`;
+        case 'isFalse':
+            return `${col} IS FALSE`;
+        case 'distinctFrom':
+            return `${col} IS DISTINCT FROM ${(0, pg_format_1.default)('%L', values)}`;
+        case 'notDistinctFrom':
+            return `${col} IS NOT DISTINCT FROM ${(0, pg_format_1.default)('%L', values)}`;
+        case 'overlaps': {
+            const { startColumn, startValue, endColumn, endValue } = values;
+            const startCol = formatColumn(startColumn);
+            const endCol = formatColumn(endColumn);
+            const startVal = startValue instanceof Date ? startValue.toISOString() : startValue;
+            const endVal = endValue instanceof Date ? endValue.toISOString() : endValue;
+            return `(${startCol}, ${endCol}) OVERLAPS (${(0, pg_format_1.default)('%L', startVal)}, ${(0, pg_format_1.default)('%L', endVal)})`;
+        }
         case 'in': {
             const valueList = Array.isArray(values) ? values : [values];
             const formattedValues = valueList.map(v => (0, pg_format_1.default)('%L', v)).join(', ');
@@ -281,8 +423,10 @@ function buildConditionSQL(condition) {
             const andConditions = values;
             return `(${andConditions.map(c => buildConditionSQL(c)).join(' AND ')})`;
         }
-        case 'raw':
-            return values;
+        case 'not': {
+            const notConditions = values;
+            return `NOT (${notConditions.map(c => buildConditionSQL(c)).join(' AND ')})`;
+        }
         default:
             return '';
     }

package/dist/cjs/condition/geometric-condition-builder.cjs

@@ -6,6 +6,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GeometricConditionCollector = void 0;
 exports.buildGeometricConditionSQL = buildGeometricConditionSQL;
 const pg_format_1 = __importDefault(require("../addon/pg-format/index.cjs"));
+function geometricToSQL(input) {
+    if (typeof input === 'string')
+        return input;
+    if (Array.isArray(input) && input.length === 2 && typeof input[0] === 'number' && typeof input[1] === 'number') {
+        return `(${input[0]},${input[1]})`;
+    }
+    if (Array.isArray(input) && input.length === 2 && Array.isArray(input[0]) && typeof input[1] === 'number') {
+        const [center, radius] = input;
+        return `<(${center[0]},${center[1]}),${radius}>`;
+    }
+    if (Array.isArray(input) && input.length === 2 && Array.isArray(input[0]) && Array.isArray(input[1])) {
+        const [p1, p2] = input;
+        return `((${p1[0]},${p1[1]}),(${p2[0]},${p2[1]}))`;
+    }
+    if (Array.isArray(input) && input.length > 2) {
+        const points = input;
+        return `(${points.map(p => `(${p[0]},${p[1]})`).join(',')})`;
+    }
+    return String(input);
+}
 class GeometricConditionCollector {
     parent;
     constructor(parent) {
@@ -15,7 +35,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_contains',
             column,
-            values: value
+            values: geometricToSQL(value)
         });
         return this.parent;
     }
@@ -23,7 +43,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_contained_by',
             column,
-            values: value
+            values: geometricToSQL(value)
         });
         return this.parent;
     }
@@ -31,7 +51,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_overlaps',
             column,
-            values: value
+            values: geometricToSQL(value)
         });
         return this.parent;
     }
@@ -39,7 +59,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_strictly_left',
             column,
-            values: value
+            values: geometricToSQL(value)
         });
         return this.parent;
     }
@@ -47,7 +67,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_strictly_right',
             column,
-            values: value
+            values: geometricToSQL(value)
         });
         return this.parent;
     }
@@ -55,7 +75,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_below',
             column,
-            values: value
+            values: geometricToSQL(value)
         });
         return this.parent;
     }
@@ -63,7 +83,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_above',
             column,
-            values: value
+            values: geometricToSQL(value)
         });
         return this.parent;
     }
@@ -71,7 +91,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_intersects',
             column,
-            values: value
+            values: geometricToSQL(value)
         });
         return this.parent;
     }
@@ -109,7 +129,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_same_as',
             column,
-            values: value
+            values: geometricToSQL(value)
         });
         return this.parent;
     }
@@ -117,7 +137,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_distance_lt',
             column,
-            values: { value, threshold: maxDistance }
+            values: { value: geometricToSQL(value), threshold: maxDistance }
         });
         return this.parent;
     }
@@ -125,7 +145,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_distance_lte',
             column,
-            values: { value, threshold: maxDistance }
+            values: { value: geometricToSQL(value), threshold: maxDistance }
         });
         return this.parent;
     }
@@ -133,7 +153,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_distance_gt',
             column,
-            values: { value, threshold: minDistance }
+            values: { value: geometricToSQL(value), threshold: minDistance }
         });
         return this.parent;
     }
@@ -141,7 +161,7 @@ class GeometricConditionCollector {
         this.parent.conditions.push({
             method: 'geometric_distance_between',
             column,
-            values: { value, min: minDistance, max: maxDistance }
+            values: { value: geometricToSQL(value), min: minDistance, max: maxDistance }
         });
         return this.parent;
     }

package/dist/cjs/condition/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildNetworkConditionSQL = exports.NetworkConditionCollector = exports.buildGeometricConditionSQL = exports.GeometricConditionCollector = exports.buildRangeConditionSQL = exports.RangeConditionCollector = exports.buildFulltextConditionSQL = exports.FulltextConditionCollector = exports.buildArrayConditionSQL = exports.ArrayConditionCollector = exports.buildJsonbConditionSQL = exports.JsonbConditionCollector = exports.buildConditionsSQL = exports.buildConditionSQL = exports.ConditionCollector = void 0;
+exports.buildPostgisConditionSQL = exports.PostgisConditionCollector = exports.buildNetworkConditionSQL = exports.NetworkConditionCollector = exports.buildGeometricConditionSQL = exports.GeometricConditionCollector = exports.buildRangeConditionSQL = exports.RangeConditionCollector = exports.buildFulltextConditionSQL = exports.FulltextConditionCollector = exports.buildArrayConditionSQL = exports.ArrayConditionCollector = exports.buildJsonbConditionSQL = exports.JsonbConditionCollector = exports.buildConditionsSQL = exports.buildConditionSQL = exports.ConditionCollector = void 0;
 var condition_collector_1 = require("./condition-collector.cjs");
 Object.defineProperty(exports, "ConditionCollector", { enumerable: true, get: function () { return condition_collector_1.ConditionCollector; } });
 Object.defineProperty(exports, "buildConditionSQL", { enumerable: true, get: function () { return condition_collector_1.buildConditionSQL; } });
@@ -23,3 +23,6 @@ Object.defineProperty(exports, "buildGeometricConditionSQL", { enumerable: true,
 var network_condition_builder_1 = require("./network-condition-builder.cjs");
 Object.defineProperty(exports, "NetworkConditionCollector", { enumerable: true, get: function () { return network_condition_builder_1.NetworkConditionCollector; } });
 Object.defineProperty(exports, "buildNetworkConditionSQL", { enumerable: true, get: function () { return network_condition_builder_1.buildNetworkConditionSQL; } });
+var postgis_condition_builder_1 = require("./postgis-condition-builder.cjs");
+Object.defineProperty(exports, "PostgisConditionCollector", { enumerable: true, get: function () { return postgis_condition_builder_1.PostgisConditionCollector; } });
+Object.defineProperty(exports, "buildPostgisConditionSQL", { enumerable: true, get: function () { return postgis_condition_builder_1.buildPostgisConditionSQL; } });

package/dist/cjs/condition/network-condition-builder.cjs

@@ -6,6 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkConditionCollector = void 0;
 exports.buildNetworkConditionSQL = buildNetworkConditionSQL;
 const pg_format_1 = __importDefault(require("../addon/pg-format/index.cjs"));
+function networkToSQL(address) {
+    if (typeof address === 'string')
+        return address;
+    const { octets, mask } = address;
+    const ip = octets.join('.');
+    return mask !== undefined ? `${ip}/${mask}` : ip;
+}
 class NetworkConditionCollector {
     parent;
     constructor(parent) {
@@ -15,7 +22,7 @@ class NetworkConditionCollector {
         this.parent.conditions.push({
             method: 'network_contained_by_strict',
             column,
-            values: value
+            values: networkToSQL(value)
         });
         return this.parent;
     }
@@ -23,7 +30,7 @@ class NetworkConditionCollector {
         this.parent.conditions.push({
             method: 'network_contained_by_or_equal',
             column,
-            values: value
+            values: networkToSQL(value)
         });
         return this.parent;
     }
@@ -31,7 +38,7 @@ class NetworkConditionCollector {
         this.parent.conditions.push({
             method: 'network_contains_strict',
             column,
-            values: value
+            values: networkToSQL(value)
         });
         return this.parent;
     }
@@ -39,7 +46,7 @@ class NetworkConditionCollector {
         this.parent.conditions.push({
             method: 'network_contains_or_equal',
             column,
-            values: value
+            values: networkToSQL(value)
         });
         return this.parent;
     }
@@ -47,7 +54,7 @@ class NetworkConditionCollector {
         this.parent.conditions.push({
             method: 'network_overlaps',
             column,
-            values: value
+            values: networkToSQL(value)
         });
         return this.parent;
     }
@@ -55,7 +62,7 @@ class NetworkConditionCollector {
         this.parent.conditions.push({
             method: 'network_same_family',
             column,
-            values: value
+            values: networkToSQL(value)
         });
         return this.parent;
     }