imodel-pg 0.17.0 → 0.19.1

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.17.0
+ * imodel v0.19.1
  * (c) 2019-2026 undefined
  * @license undefined
  */

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.17.0
+ * imodel v0.19.1
  * (c) 2019-2026 undefined
  * @license undefined
  */
@@ -66,7 +66,6 @@ function getBaseType(s, {
     case 'ip':
     case 'ipv4':
     case 'ipv6':
-      return 'cidr';
     case 'ipnet':
     case 'ipnetv4':
     case 'ipnetv6':
@@ -514,6 +513,7 @@ function buildSelect(env, selectList) {
   /** @type {Sql[]} */
   const list = [];
   for (const {
+    distinct,
     table,
     columns,
     select,
@@ -529,7 +529,7 @@ function buildSelect(env, selectList) {
     const orderSql = getOrder(sort);
     const limitSql = limit && limit > 0 ? Sql('LIMIT', limit) : undefined;
     const offsetSql = offset && offset > 0 ? Sql('OFFSET', offset) : undefined;
-    list.push(Sql(Sql`SELECT ${selectSql} FROM ${Table}`, getWhere(env, where), orderSql, limitSql, offsetSql, group?.length ? Sql`GROUP BY ${Sql`,`.glue(group.map(v => Sql.Field(v)))}` : undefined, getWhere(env, having, 'HAVING')));
+    list.push(Sql(Sql`SELECT`, distinct ? Sql`DISTINCT` : undefined, Sql`${selectSql}`, Sql`FROM ${Table}`, getWhere(env, where), orderSql, limitSql, offsetSql, group?.length ? Sql`GROUP BY ${Sql`,`.glue(group.map(v => Sql.Field(v)))}` : undefined, getWhere(env, having, 'HAVING')));
   }
   if (!list.length) {
     return null;
@@ -600,6 +600,17 @@ function buildWhere(env, wheres) {
       }
       return Sql`(${Sql` OR `.glue(...orList)})`;
     }
+    if (where.exists) {
+      const {
+        subquery,
+        not
+      } = where;
+      const select = buildSelect(env, subquery);
+      if (!select) {
+        return null;
+      }
+      return not ? Sql`NOT EXISTS(${select})` : Sql`EXISTS(${select})`;
+    }
     const {
       field: k,
       operator: o,
@@ -650,6 +661,11 @@ function buildWhere(env, wheres) {
         not = !not;
         operator = 'IN';
         break;
+      case 'NOTANY':
+        not = !not;
+      case 'ANY':
+        operator = 'ANY';
+        break;
       case 'NOTLIKE':
         not = !not;
         operator = 'LIKE';
@@ -716,6 +732,12 @@ function buildWhere(env, wheres) {
     if (!subquery?.length && Array.isArray(v) && (operator === 'IN' || operator === 'NOT IN') && v.length) {
       values = Sql(['(', ...Array(v.length - 1).fill(','), ')'], ...v.map(v => v ?? null));
     }
+    if (operator === 'ANY') {
+      if (!not) {
+        return Sql`${values} = ANY(${toField(k)})`;
+      }
+      return Sql`not(${values} = ANY(${toField(k)}))`;
+    }
     if (!not) {
       return Sql`${toField(k)} ${Sql(operator)} ${values}`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imodel-pg",
-  "version": "0.17.0",
+  "version": "0.19.1",
   "dependencies": {
     "pg": "^8.13.3",
     "tagged-sql": "^0.9.0"