@dwtechs/antity-pgsql 0.17.5 → 0.17.7

package/README.md

@@ -152,7 +152,7 @@ type Row = Record<string, string | number | boolean | Date | number[]>;
 
 type Comparator =
   "=" | "<" | ">" | "<=" | ">=" | "<>" |
-  "IS" | "IS NOT" | "IN" | "NOT IN" | "LIKE" | "NOT LIKE";
+  "IS" | "IS NOT" | "IN" | "NOT IN" | "LIKE" | "NOT LIKE" | "&&";
 
 type MatchMode =  
   "startsWith" | 
@@ -164,6 +164,7 @@ type MatchMode =
   "between" |
   "in" |
   "notIn" |
+  "&&" | // array overlap — use with array-typed columns; generates: column && ARRAY[$1,$2]
   "lt" |
   "lte" |
   "gt" |

package/dist/antity-pgsql.d.ts

@@ -60,9 +60,9 @@ export declare class Property extends BaseProperty {
 }
 
 export type LogicalOperator = "AND" | "OR";
-export type Comparator = "=" | "<" | ">" | "<=" | ">=" | "<>" | "IS" | "IS NOT" | "IN" | "NOT IN" | "LIKE" | "NOT LIKE";
-export type MatchMode = "startsWith" | "endsWith" | "contains" | "notContains" | "equals" | "notEquals" | "between" | "in" | "notIn" | "lt" | "lte" | "gt" | "gte" | "is" | "isNot" | "before" | "after" | "st_contains" | "st_dwithin" | Comparator;
-export type MappedType = "string" | "number" | "date";
+export type Comparator = "=" | "<" | ">" | "<=" | ">=" | "<>" | "IS" | "IS NOT" | "IN" | "NOT IN" | "LIKE" | "NOT LIKE" | "&&";
+export type MatchMode = "startsWith" | "endsWith" | "contains" | "notContains" | "equals" | "notEquals" | "between" | "in" | "notIn" | "&&" | "lt" | "lte" | "gt" | "gte" | "is" | "isNot" | "before" | "after" | "st_contains" | "st_dwithin" | Comparator;
+export type MappedType = "string" | "number" | "date" | "array";
 export type Geometry = {
   lng: number;
   lat: number;

package/dist/antity-pgsql.js

@@ -24,7 +24,7 @@ SOFTWARE.
 https://github.com/DWTechs/Antity-pgsql.js
 */
 
-import { isArray, isString } from '@dwtechs/checkard';
+import { isArray, isInteger, isString } from '@dwtechs/checkard';
 import { deleteProps, chunk, flatten } from '@dwtechs/sparray';
 import { log } from '@dwtechs/winstan';
 import { Entity } from '@dwtechs/antity';
@@ -104,7 +104,7 @@ function quoteIfUppercase(word) {
     return word;
 }
 
-function index(index, matchMode) {
+function index(index, matchMode, value) {
     const i = index.map((i) => `$${i}`);
     switch (matchMode) {
         case "in":
@@ -112,12 +112,16 @@ function index(index, matchMode) {
         case "IN":
         case "NOT IN":
             return `(${i})`;
+        case "&&": {
+            const cast = isArray(value, ">", 0) && isInteger(value[0]) ? '::integer[]' : '';
+            return `ARRAY[${i}]${cast}`;
+        }
         default:
             return `${i}`;
     }
 }
 
-const COMPARATORS = new Set(["=", "<", ">", "<=", ">=", "<>", "IS", "IS NOT", "IN", "NOT IN", "LIKE", "NOT LIKE"]);
+const COMPARATORS = new Set(["=", "<", ">", "<=", ">=", "<>", "IS", "IS NOT", "IN", "NOT IN", "LIKE", "NOT LIKE", "&&"]);
 function comparator(matchMode) {
     if (matchMode && COMPARATORS.has(matchMode))
         return matchMode;
@@ -154,6 +158,8 @@ function comparator(matchMode) {
             return "<";
         case "after":
             return ">";
+        case "&&":
+            return "&&";
         default:
             return null;
     }
@@ -197,7 +203,7 @@ function add(filters) {
                 if (shouldSkipValue(value, matchMode))
                     continue;
                 const indexes = isArray(value) ? value.map(() => i++) : [i++];
-                const cond = addOne(k, indexes, matchMode);
+                const cond = addOne(k, indexes, matchMode, value);
                 if (cond) {
                     groupConditions.push(cond);
                     if (isArray(value))
@@ -217,10 +223,10 @@ function add(filters) {
     }
     return { conditions, args };
 }
-function addOne(key, indexes, matchMode) {
+function addOne(key, indexes, matchMode, value) {
     const sqlKey = `${quoteIfUppercase(key)}`;
     const comparator$1 = comparator(matchMode);
-    const index$1 = index(indexes, matchMode);
+    const index$1 = index(indexes, matchMode, value);
     return comparator$1 ? `${sqlKey} ${comparator$1} ${index$1}` : "";
 }
 
@@ -524,6 +530,8 @@ function type(type) {
             return s;
         case "object":
             return s;
+        case "array":
+            return "array";
         default:
             return s;
     }
@@ -533,6 +541,7 @@ const matchModes = {
     string: new Set(["startsWith", "contains", "endsWith", "notContains", "equals", "notEquals", "lt", "lte", "gt", "gte", "in", "notIn"]),
     number: new Set(["equals", "notEquals", "lt", "lte", "gt", "gte", "in", "notIn"]),
     date: new Set(["is", "isNot", "dateAfter"]),
+    array: new Set(["&&"]),
 };
 function matchMode(type, matchMode) {
     return COMPARATORS.has(matchMode) || matchModes[type].has(matchMode);
@@ -555,6 +564,12 @@ function cleanFilters(filters, properties) {
             const type$1 = type(prop.type);
             const filterValue = filters[k];
             const filterArray = isArray(filterValue) ? filterValue : [filterValue];
+            if (type$1 === "array") {
+                for (const f of filterArray) {
+                    if (f.matchMode === "in")
+                        f.matchMode = "&&";
+                }
+            }
             const validFilters = filterArray.filter((f) => {
                 const { matchMode: matchMode$1 } = f;
                 if (!matchMode$1 || !matchMode(type$1, matchMode$1)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwtechs/antity-pgsql",
-  "version": "0.17.5",
+  "version": "0.17.7",
   "description": "Open source library to add PostgreSQL support to @dwtechs/Antity entities.",
   "keywords": [
     "entities"