imodel-pg 0.16.1 → 0.19.0

package/index.d.mts

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

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.16.1
+ * imodel v0.19.0
  * (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':
@@ -503,6 +502,41 @@ function getSelect(table, select) {
   return Sql`, `.glue(...selectList);
 }
 
+/** @import { DBColumn, Environment, FindArg, SelectItem } from 'imodel' */
+/**
+ *
+ * @param {Environment} env
+ * @param {SelectItem[]} selectList
+ * @returns {Sql?}
+ */
+function buildSelect(env, selectList) {
+  /** @type {Sql[]} */
+  const list = [];
+  for (const {
+    distinct,
+    table,
+    columns,
+    select,
+    where,
+    sort,
+    offset,
+    limit,
+    group,
+    having
+  } of selectList) {
+    const Table = Sql.Table(table);
+    const selectSql = getSelect(Table, select);
+    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`, 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;
+  }
+  return list.length === 1 && list[0] || Sql`UNION`.glue(list);
+}
+
 /** @import { Environment, WhereValue } from 'imodel' */
 /**
  *
@@ -527,7 +561,7 @@ function toField(k) {
  * @param {WhereValue[]?} [wheres]
  * @returns {Sql | undefined}
  */
-function getWhere2(env, wheres) {
+function buildWhere(env, wheres) {
   if (!wheres?.length) {
     return;
   }
@@ -569,14 +603,14 @@ function getWhere2(env, wheres) {
     const {
       field: k,
       operator: o,
-      value: v
+      value: v,
+      subquery
     } = where;
     if (Array.isArray(k)) {
       let {
         not
       } = where;
       const column = Sql`(${Sql`,`.glue(k.map(toField))})`;
-      let values = v;
       switch (o?.toUpperCase().replaceAll('_', '').replaceAll(' ', '')) {
         case 'NOTIN':
         case 'NOT':
@@ -585,7 +619,15 @@ function getWhere2(env, wheres) {
           not = !not;
           break;
       }
-      values = Array.isArray(v) ? Sql`(${Sql`,`.glue(v.map(v => Sql`(${Array.isArray(v) && v.length ? Sql(['', ...Array(v.length - 1).fill(','), ''], ...v.map(v => v ?? null)) : v ?? null})`))})` : Sql`(${v ?? null})`;
+      if (subquery?.length) {
+        const select = buildSelect(env, subquery);
+        if (!select) {
+          return null;
+        }
+        const value = Sql`(${select})`;
+        return Sql`${column} ${Sql(not ? `NOT IN` : `IN`)} ${value}`;
+      }
+      const values = Array.isArray(v) ? Sql`(${Sql`,`.glue(v.map(v => Sql`(${Array.isArray(v) && v.length ? Sql(['', ...Array(v.length - 1).fill(','), ''], ...v.map(v => v ?? null)) : v ?? null})`))})` : Sql`(${v ?? null})`;
       return Sql`${column} ${Sql(not ? `NOT IN` : `IN`)} ${values}`;
     }
     let {
@@ -639,7 +681,13 @@ function getWhere2(env, wheres) {
           break;
         }
     }
-    if ((values ?? null) === null) {
+    if (subquery?.length) {
+      const select = buildSelect(env, subquery);
+      if (!select) {
+        return null;
+      }
+      values = Sql`(${select})`;
+    } else if ((values ?? null) === null) {
       values = Sql`null`;
       if (operator === '=') {
         operator = 'IS';
@@ -665,7 +713,7 @@ function getWhere2(env, wheres) {
           break;
       }
     }
-    if (Array.isArray(v) && (operator === 'IN' || operator === 'NOT IN') && v.length) {
+    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 (!not) {
@@ -688,37 +736,13 @@ function getWhere2(env, wheres) {
  * @returns {Sql | undefined}
  */
 function getWhere(env, where, key = 'WHERE') {
-  const andList = getWhere2(env, where);
+  const andList = buildWhere(env, where);
   if (!andList) {
     return;
   }
   return Sql`${Sql(key)} ${andList}`;
 }
 
-/** @import { DBColumn, Environment, FindArg } from 'imodel' */
-/**
- *
- * @param {Environment} env
- * @param {string} table
- * @param {Record<string, DBColumn>} columns
- * @param {FindArg} param1
- * @returns {Sql}
- */
-function selectSql(env, table, columns, {
-  select,
-  where,
-  sort,
-  offset,
-  limit
-}) {
-  const Table = Sql.Table(table);
-  const selectSql = getSelect(Table, select);
-  const orderSql = getOrder(sort);
-  const limitSql = limit && limit > 0 ? Sql('LIMIT', limit) : undefined;
-  const offsetSql = offset && offset > 0 ? Sql('OFFSET', offset) : undefined;
-  return Sql(Sql`SELECT ${selectSql} FROM ${Table}`, getWhere(env, where), orderSql, limitSql, offsetSql);
-}
-
 /** @import { Environment, DBColumn, WhereValue } from 'imodel' */
 /**
  *
@@ -949,7 +973,7 @@ FROM (values${Sql`,`.glue(list.map(data => Sql`(${Sql`,`.glue(dataFieldType.map(
     }
     return Sql(t, data[f] ?? null);
   }))})`))}) as ${tmpId}(${Sql`,`.glue(dataFields.map(f => Sql.Field(f)))})
-WHERE ${Sql`AND`.glue([pKeys.map(f => Sql`${main.field(f)}=${tmp.field(f)}`), getWhere2(env, where)].flat().filter(Boolean))}${returnSql}`;
+WHERE ${Sql`AND`.glue([pKeys.map(f => Sql`${main.field(f)}=${tmp.field(f)}`), buildWhere(env, where)].flat().filter(Boolean))}${returnSql}`;
 }
 
 const defaultSchema = Sql`(SELECT (current_schemas(false))[1])`;
@@ -1652,37 +1676,6 @@ async function syncTables(env, query, tables, schema) {
   }
 }
 
-/** @import { DBColumn, Environment, FindArg, SelectItem } from 'imodel' */
-/**
- *
- * @param {Environment} env
- * @param {SelectItem[]} selectList
- * @returns {Sql}
- */
-function buildSelect(env, selectList) {
-  /** @type {Sql[]} */
-  const list = [];
-  for (const {
-    table,
-    columns,
-    select,
-    where,
-    sort,
-    offset,
-    limit,
-    group,
-    having
-  } of selectList) {
-    const Table = Sql.Table(table);
-    const selectSql = getSelect(Table, select);
-    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')));
-  }
-  return list.length === 1 && list[0] || Sql`UNION`.glue(list);
-}
-
 /** @import { Environment, IConnection } from 'imodel' */
 const {
   types
@@ -1832,20 +1825,26 @@ function index (pool, version) {
   /**
    * @template {pg.QueryResultRow} T
    * @param {Environment<PgEnvTrans>} env
-   * @param {Sql} sql
+   * @param {Sql?} [sql]
    * @returns {Promise<T[]>}
    */
   async function query(env, sql) {
+    if (!sql) {
+      return [];
+    }
     /** @type {pg.QueryResult<T>} */
     const result = await _exec(sql, env);
     return result.rows;
   }
   /**
    * @param {Environment<PgEnvTrans>} env
-   * @param {Sql} sql
+   * @param {Sql?} [sql]
    * @returns {Promise<number>}
    */
   async function exec(env, sql) {
+    if (!sql) {
+      return 0;
+    }
     const result = await _exec(sql, env);
     return result.rowCount || 0;
   }
@@ -1887,9 +1886,6 @@ function index (pool, version) {
     upsert(env, table, columns, data, keys, conflict, conflictSet) {
       return query(env, insertSql(env, table, columns, data, keys, conflict, conflictSet));
     },
-    find(env, table, columns, argv) {
-      return query(env, selectSql(env, table, columns, argv));
-    },
     select(env, select) {
       return query(env, buildSelect(env, select));
     },
@@ -1904,12 +1900,17 @@ function index (pool, version) {
     },
     updateReturn(env, returning, table, columns, update, where) {
       if (!Object.keys(update).length) {
-        return query(env, selectSql(env, table, columns, {
-          where: where || [],
+        return query(env, buildSelect(env, [{
+          table,
+          columns,
           select: returning.map(v => [v, {
             field: v
-          }])
-        }));
+          }]),
+          where: where || [],
+          sort: [],
+          group: [],
+          having: []
+        }]));
       }
       return query(env, updateSql(env, table, columns, update, where, returning));
     },

package/package.json

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