pqb 0.39.0 → 0.39.2

package/dist/index.d.ts

@@ -553,8 +553,9 @@ declare class NotFoundError extends OrchidOrmError {
     constructor(query: Query, message?: string);
 }
 declare class OrchidOrmInternalError extends Error {
-    query: Query;
+    #private;
     constructor(query: Query, message?: string);
+    get query(): Query;
 }
 type QueryErrorName = 'parseComplete' | 'bindComplete' | 'closeComplete' | 'noData' | 'portalSuspended' | 'replicationStart' | 'emptyQuery' | 'copyDone' | 'copyData' | 'rowDescription' | 'parameterDescription' | 'parameterStatus' | 'backendKeyData' | 'notification' | 'readyForQuery' | 'commandComplete' | 'dataRow' | 'copyInResponse' | 'copyOutResponse' | 'authenticationOk' | 'authenticationMD5Password' | 'authenticationCleartextPassword' | 'authenticationSASL' | 'authenticationSASLContinue' | 'authenticationSASLFinal' | 'error' | 'notice';
 declare abstract class QueryError<T extends PickQueryShape = PickQueryShape> extends OrchidOrmInternalError {
@@ -587,7 +588,6 @@ declare class MoreThanOneRowError extends OrchidOrmInternalError {
     constructor(query: Query, message?: string);
 }
 declare class UnhandledTypeError extends OrchidOrmInternalError {
-    query: Query;
     constructor(query: Query, value: never);
 }
 
@@ -2683,7 +2683,7 @@ declare class ArrayColumn<Schema extends ColumnTypeSchemaArg, Item extends Array
     constructor(schema: Schema, item: Item, inputType: InputType, outputType?: OutputType, queryType?: QueryType);
     toSQL(): string;
     toCode(this: ArrayColumn<ColumnSchemaConfig, ArrayColumnValue, unknown, unknown, unknown>, ctx: ColumnToCodeCtx, key: string): Code;
-    parseFn: ((input: unknown) => unknown[]) & {
+    parseFn: ((source: string) => unknown[]) & {
         hideFromCode: boolean;
     };
 }
@@ -7893,7 +7893,7 @@ declare class BooleanColumn<Schema extends ColumnSchemaConfig> extends ColumnTyp
     operators: OperatorsBoolean;
     constructor(schema: Schema);
     toCode(ctx: ColumnToCodeCtx, key: string): Code;
-    parseItem: (input: string) => boolean;
+    parseItem(input: string): boolean;
 }
 
 declare class CustomTypeColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, unknown, ReturnType<Schema['unknown']>, typeof Operators.any> {

package/dist/index.js

@@ -1826,12 +1826,14 @@ class BooleanColumn extends ColumnType {
     super(schema, schema.boolean());
     this.dataType = "bool";
     this.operators = Operators.boolean;
-    this.parseItem = (input) => input[0] === "t";
     this.data.alias = "boolean";
   }
   toCode(ctx, key) {
     return columnCode(this, ctx, key, "boolean()");
   }
+  parseItem(input) {
+    return input[0] === "t";
+  }
 }
 
 const encodeFn = (x) => x === null ? x : JSON.stringify(x);
@@ -1866,15 +1868,22 @@ const queryTypeWithLimitOne = {
 };
 const isQueryReturnsAll = (q) => !q.q.returnType || q.q.returnType === "all";
 
-function simpleColumnToSQL(ctx, key, column, quotedAs) {
+const applySqlComputed = (ctx, q, computed, as, quotedAs) => {
+  var _a;
+  const parser = computed.result.value.parseFn;
+  if (parser)
+    ((_a = q.parsers) != null ? _a : q.parsers = {})[as] = parser;
+  return computed.toSQL(ctx, quotedAs);
+};
+function simpleColumnToSQL(ctx, q, key, column, quotedAs) {
   if (!column)
     return `"${key}"`;
   const { data } = column;
-  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+  return data.computed ? applySqlComputed(ctx, q, data.computed, key, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
-function simpleExistingColumnToSQL(ctx, key, column, quotedAs) {
+function simpleExistingColumnToSQL(ctx, q, key, column, quotedAs) {
   const { data } = column;
-  return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+  return data.computed ? applySqlComputed(ctx, q, data.computed, key, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
 const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
   var _a;
@@ -1893,7 +1902,7 @@ const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
   if (!select && ((_a = data.joinedShapes) == null ? void 0 : _a[column])) {
     return `"${column}".r`;
   }
-  return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
+  return simpleColumnToSQL(ctx, data, column, shape[column], quotedAs);
 };
 const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
   var _a;
@@ -1908,12 +1917,12 @@ const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
       for (const s of data.select) {
         if (typeof s === "object" && "selectAs" in s) {
           if (column in s.selectAs) {
-            return simpleColumnToSQL(ctx, column, data.shape[column]);
+            return simpleColumnToSQL(ctx, data, column, data.shape[column]);
           }
         }
       }
     }
-    return simpleColumnToSQL(ctx, column, data.shape[column], quotedAs);
+    return simpleColumnToSQL(ctx, data, column, data.shape[column], quotedAs);
   }
 };
 const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) => {
@@ -1931,17 +1940,30 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
       return `"${tableName}"."${col.data.name}"`;
     }
     if (col.data.computed) {
-      return `${col.data.computed.toSQL(ctx, quoted)}`;
+      return applySqlComputed(ctx, data, col.data.computed, column, quoted);
     }
     return `"${tableName}"."${key}"`;
   }
   return `"${tableName}"."${key}"`;
 };
-const tableColumnToSqlWithAs = (ctx, data, column, table, key, quotedAs, select) => {
+const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
+  const index = column.indexOf(".");
+  return index !== -1 ? tableColumnToSqlWithAs(
+    ctx,
+    data,
+    column,
+    column.slice(0, index),
+    column.slice(index + 1),
+    as,
+    quotedAs,
+    select
+  ) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select);
+};
+const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, select) => {
   var _a, _b, _c;
   if (key === "*") {
     if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
-      return select ? `row_to_json("${table}".*) "${table}"` : `"${table}".r "${table}"`;
+      return select ? `row_to_json("${table}".*) "${as}"` : `"${table}".r "${as}"`;
     }
     return column;
   }
@@ -1950,29 +1972,41 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, quotedAs, select)
   const col = quoted === quotedAs ? data.shape[key] : (_c = data.joinedShapes) == null ? void 0 : _c[tableName][key];
   if (col) {
     if (col.data.name && col.data.name !== key) {
-      return `"${tableName}"."${col.data.name}" "${key}"`;
+      return `"${tableName}"."${col.data.name}" "${as}"`;
     }
     if (col.data.computed) {
-      return `${col.data.computed.toSQL(ctx, quoted)} "${key}"`;
+      return `${applySqlComputed(
+        ctx,
+        data,
+        col.data.computed,
+        as,
+        quoted
+      )} "${as}"`;
     }
   }
-  return `"${tableName}"."${key}"`;
+  return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
 };
-const ownColumnToSqlWithAs = (ctx, data, column, quotedAs, select) => {
+const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
   var _a;
   if (!select && ((_a = data.joinedShapes) == null ? void 0 : _a[column])) {
-    return select ? `row_to_json("${column}".*) "${column}"` : `"${column}".r "${column}"`;
+    return select ? `row_to_json("${column}".*) "${as}"` : `"${column}".r "${as}"`;
   }
   const col = data.shape[column];
   if (col) {
     if (col.data.name && col.data.name !== column) {
-      return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}" "${column}"`;
+      return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}"${col.data.name === as ? "" : ` "${as}"`}`;
     }
     if (col.data.computed) {
-      return `${col.data.computed.toSQL(ctx, quotedAs)} "${column}"`;
+      return `${applySqlComputed(
+        ctx,
+        data,
+        col.data.computed,
+        as,
+        quotedAs
+      )} "${as}"`;
     }
   }
-  return `${quotedAs ? `${quotedAs}.` : ""}"${column}"`;
+  return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
 };
 const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select) => {
   return typeof expr === "string" ? columnToSql(ctx, data, shape, expr, quotedAs, select) : expr.toSQL(ctx, quotedAs);
@@ -1991,6 +2025,25 @@ const pushDistinctSql = (ctx, table, distinct, quotedAs) => {
   }
 };
 
+var __accessCheck = (obj, member, msg) => {
+  if (!member.has(obj))
+    throw TypeError("Cannot " + msg);
+};
+var __privateGet = (obj, member, getter) => {
+  __accessCheck(obj, member, "read from private field");
+  return getter ? getter.call(obj) : member.get(obj);
+};
+var __privateAdd = (obj, member, value) => {
+  if (member.has(obj))
+    throw TypeError("Cannot add the same private member more than once");
+  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+};
+var __privateSet = (obj, member, value, setter) => {
+  __accessCheck(obj, member, "write to private field");
+  setter ? setter.call(obj, value) : member.set(obj, value);
+  return value;
+};
+var _query;
 class OrchidOrmError extends Error {
 }
 class NotFoundError extends OrchidOrmError {
@@ -2002,9 +2055,14 @@ class NotFoundError extends OrchidOrmError {
 class OrchidOrmInternalError extends Error {
   constructor(query, message) {
     super(message);
-    this.query = query;
+    __privateAdd(this, _query, void 0);
+    __privateSet(this, _query, query);
+  }
+  get query() {
+    return __privateGet(this, _query);
   }
 }
+_query = new WeakMap();
 class QueryError extends OrchidOrmInternalError {
   get isUnique() {
     return this.code === "23505";
@@ -2034,7 +2092,6 @@ class MoreThanOneRowError extends OrchidOrmInternalError {
 class UnhandledTypeError extends OrchidOrmInternalError {
   constructor(query, value) {
     super(query, `Unhandled type: ${JSON.stringify(value)} received`);
-    this.query = query;
   }
 }
 
@@ -2281,7 +2338,13 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
         let column = query.shape[key];
         let quotedColumn;
         if (column) {
-          quotedColumn = simpleExistingColumnToSQL(ctx, key, column, quotedAs);
+          quotedColumn = simpleExistingColumnToSQL(
+            ctx,
+            query,
+            key,
+            column,
+            quotedAs
+          );
         } else if (!column) {
           const index = key.indexOf(".");
           if (index !== -1) {
@@ -2289,7 +2352,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
             const quoted = `"${table2}"`;
             const name = key.slice(index + 1);
             column = quotedAs === quoted ? query.shape[name] : (_b = (_a = query.joinedShapes) == null ? void 0 : _a[table2]) == null ? void 0 : _b[name];
-            quotedColumn = simpleColumnToSQL(ctx, name, column, quoted);
+            quotedColumn = simpleColumnToSQL(ctx, query, name, column, quoted);
           } else {
             column = (_d = (_c = query.joinedShapes) == null ? void 0 : _c[key]) == null ? void 0 : _d.value;
             quotedColumn = `"${key}".r`;
@@ -2950,16 +3013,9 @@ class ArrayColumn extends ColumnType {
     this.dataType = "array";
     this.operators = Operators.array;
     this.parseFn = Object.assign(
-      (input) => {
+      (source) => {
         const entries = [];
-        parseArray(
-          input,
-          0,
-          input.length,
-          entries,
-          false,
-          this.data.item
-        );
+        parsePostgresArray(source, entries, this.data.item.parseItem);
         return entries;
       },
       {
@@ -2991,70 +3047,60 @@ class ArrayColumn extends ColumnType {
     return columnCode(this, ctx, key, code);
   }
 }
-const parseArray = (input, pos, len, entries, nested, item) => {
-  if (input[0] === "[") {
-    while (pos < len) {
-      let char = input[pos++];
-      if (char === "\\") {
-        char = input[pos++];
+const parsePostgresArray = (source, entries, transform) => {
+  let pos = 0;
+  if (source[0] === "[") {
+    pos = source.indexOf("=") + 1;
+    if (!pos)
+      pos = source.length;
+  }
+  if (source[pos] === "{")
+    pos++;
+  let recorded = "";
+  while (pos < source.length) {
+    const character = source[pos++];
+    if (character === "{") {
+      const innerEntries = [];
+      entries.push(innerEntries);
+      pos += parsePostgresArray(source.slice(pos - 1), innerEntries, transform) - 1;
+    } else if (character === "}") {
+      if (recorded) {
+        entries.push(
+          recorded === "NULL" ? null : transform ? transform(recorded) : recorded
+        );
       }
-      if (char === "=")
-        break;
-    }
-  }
-  let quote = false;
-  let start = pos;
-  while (pos < len) {
-    let char = input[pos++];
-    const escaped = char === "\\";
-    if (escaped) {
-      char = input[pos++];
-    }
-    if (char === '"' && !escaped) {
-      if (quote) {
-        pushEntry(input, start, pos, entries, item);
-      } else {
-        start = pos;
-      }
-      quote = !quote;
-    } else if (char === "," && !quote) {
-      if (start !== pos) {
-        pushEntry(input, start, pos, entries, item);
-      }
-      start = pos;
-    } else if (char === "{" && !quote) {
-      let array;
-      let nestedItem = item;
-      if (nested) {
-        array = [];
-        entries.push(array);
-        if ("item" in item.data) {
-          nestedItem = item.data.item;
+      return pos;
+    } else if (character === '"') {
+      let esc = false;
+      let rec = "";
+      while (pos < source.length) {
+        let char;
+        while ((char = source[pos++]) === "\\") {
+          if (!(esc = !esc))
+            rec += "\\";
         }
-      } else {
-        array = entries;
-      }
-      pos = parseArray(input, pos, len, array, true, nestedItem);
-      start = pos + 1;
-    } else if (char === "}" && !quote) {
-      if (start !== pos) {
-        pushEntry(input, start, pos, entries, item);
+        if (esc) {
+          esc = false;
+        } else if (char === '"') {
+          break;
+        }
+        rec += char;
+      }
+      entries.push(transform ? transform(rec) : rec);
+      recorded = "";
+    } else if (character === ",") {
+      if (recorded) {
+        entries.push(
+          recorded === "NULL" ? null : transform ? transform(recorded) : recorded
+        );
+        recorded = "";
       }
-      start = pos + 1;
-      break;
+    } else {
+      recorded += character;
     }
   }
   return pos;
 };
-const pushEntry = (input, start, pos, entries, item) => {
-  let entry = input.slice(start, pos - 1);
-  if (entry === "NULL") {
-    entry = null;
-  } else if (item.parseItem) {
-    entry = item.parseItem(entry);
-  }
-  entries.push(entry);
-};
 
 const parseDateToNumber = (value) => value ? Date.parse(value) : value;
 const parseDateToDate = (value) => value ? new Date(value) : value;
@@ -4841,13 +4887,21 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
               item,
               tableName,
               key,
+              key === "*" ? tableName : key,
               quotedAs,
               true
             );
           } else {
             if (hookSelect == null ? void 0 : hookSelect.get(item))
               (selected != null ? selected : selected = {})[item] = quotedAs;
-            sql = ownColumnToSqlWithAs(ctx, table.q, item, quotedAs, true);
+            sql = ownColumnToSqlWithAs(
+              ctx,
+              table.q,
+              item,
+              item,
+              quotedAs,
+              true
+            );
           }
         }
         list.push(sql);
@@ -4866,14 +4920,14 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
               }
             } else if (value) {
               list.push(
-                `${columnToSql(
+                columnToSqlWithAs(
                   ctx,
                   table.q,
-                  table.q.shape,
                   value,
+                  as,
                   quotedAs,
                   true
-                )} "${as}"`
+                )
               );
             }
           }
@@ -4902,7 +4956,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
         quotedTable = quotedAs;
         columnName = select;
         col = query.shape[select];
-        sql = simpleColumnToSQL(ctx, select, col, quotedAs);
+        sql = simpleColumnToSQL(ctx, query, select, col, quotedAs);
       }
       if (selected == null ? void 0 : selected[columnName]) {
         if ((selected == null ? void 0 : selected[columnName]) === quotedTable) {
@@ -11371,6 +11425,8 @@ class ColumnRefExpression extends orchidCore.Expression {
   makeSQL(ctx, quotedAs) {
     return simpleExistingColumnToSQL(
       ctx,
+      // it's for parsers for computed SQL. In the column ref case, parsers should be set when selecting the column ref.
+      {},
       this.name,
       this.result.value,
       quotedAs