@platformatic/sql-mapper 0.34.0 → 0.35.0

package/lib/entity.js

@@ -202,7 +202,10 @@ function createMapper (defaultDb, sql, log, table, fields, primaryKeys, relation
     like: 'LIKE',
     ilike: 'ILIKE',
     any: 'ANY',
-    all: 'ALL'
+    all: 'ALL',
+    contains: '@>',
+    contained: '<@',
+    overlaps: '&&'
   }
 
   function computeCriteria (opts) {
@@ -235,6 +238,12 @@ function createMapper (defaultDb, sql, log, table, fields, primaryKeys, relation
             criteria.push(sql`${value[key]} = ANY (${sql.ident(field)})`)
           } else if (operator === 'ALL') {
             criteria.push(sql`${value[key]} = ALL (${sql.ident(field)})`)
+          } else if (operator === '@>') {
+            criteria.push(sql`${sql.ident(field)} @> ${value[key]}`)
+          } else if (operator === '<@') {
+            criteria.push(sql`${sql.ident(field)} <@ ${value[key]}`)
+          } else if (operator === '&&') {
+            criteria.push(sql`${sql.ident(field)} && ${value[key]}`)
           } else {
             throw new Error('Unsupported operator for Array field')
           }
@@ -251,7 +260,7 @@ function createMapper (defaultDb, sql, log, table, fields, primaryKeys, relation
           }
           const like = operator === 'LIKE' ? sql`LIKE` : queries.hasILIKE ? sql`ILIKE` : sql`LIKE`
           criteria.push(sql`${leftHand} ${like} ${value[key]}`)
-        } else if (operator === 'ANY' || operator === 'ALL') {
+        } else if (operator === 'ANY' || operator === 'ALL' || operator === '@>' || operator === '<@' || operator === '&&') {
           throw new Error('Unsupported operator for non Array field')
         } else {
           criteria.push(sql`${sql.ident(field)} ${sql.__dangerous__rawValue(operator)} ${computeCriteriaValue(fieldWrap, value[key])}`)

package/mapper.d.ts

@@ -103,7 +103,27 @@ export interface WhereCondition {
     /**
      * Like ignore-case value.
      */
-    ilike?: string
+    ilike?: string,
+    /**
+     * All subquery
+     */
+    all?: string,
+    /**
+     * Any subquery
+     */
+    any?: string
+    /**
+     * Contains values
+     */
+    contains?: any[],
+    /**
+     * Contained by values
+     */
+    contained?: any[],
+    /**
+     * Overlaps with values
+     */
+    overlaps?: any[]
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "description": "A data mapper utility for SQL databases",
   "main": "mapper.js",
   "types": "mapper.d.ts",
@@ -29,7 +29,7 @@
     "camelcase": "^6.3.0",
     "fastify-plugin": "^4.5.0",
     "inflected": "^2.1.0",
-    "@platformatic/types": "0.34.0"
+    "@platformatic/types": "0.35.0"
   },
   "tsd": {
     "directory": "test/types"

package/test/entity.test.js

@@ -1071,6 +1071,27 @@ test('array support (PG)', { skip: !(isPg) }, async ({ teardown, same, rejects }
     }
   }), [{ id: 2, test: [4], checkmark: true }])
 
+  // where contains
+  same(await generatedTest.find({
+    where: {
+      test: { contains: [4] }
+    }
+  }), [{ id: 1, test: [4, 5, 6], checkmark: true }, { id: 2, test: [4], checkmark: true }])
+
+  // where contained
+  same(await generatedTest.find({
+    where: {
+      test: { contained: [4, 5, 6] }
+    }
+  }), [{ id: 1, test: [4, 5, 6], checkmark: true }, { id: 2, test: [4], checkmark: true }])
+
+  // where overlaps
+  same(await generatedTest.find({
+    where: {
+      test: { overlaps: [4] }
+    }
+  }), [{ id: 1, test: [4, 5, 6], checkmark: true }, { id: 2, test: [4], checkmark: true }])
+
   // where eq
   await rejects(generatedTest.find({
     where: {