pqb 0.38.8 → 0.39.1

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);
@@ -1991,6 +1993,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 +2023,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 +2060,6 @@ class MoreThanOneRowError extends OrchidOrmInternalError {
 class UnhandledTypeError extends OrchidOrmInternalError {
   constructor(query, value) {
     super(query, `Unhandled type: ${JSON.stringify(value)} received`);
-    this.query = query;
   }
 }
 
@@ -2950,16 +2975,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 +3009,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;
@@ -4512,8 +4520,10 @@ const maybeUnNameColumn = (column, isSubQuery) => {
   return isSubQuery && (column == null ? void 0 : column.data.name) ? orchidCore.setColumnData(column, "name", void 0) : column;
 };
 function _querySelect(q, args) {
+  var _a, _b;
   const len = args.length;
   if (!len) {
+    (_b = (_a = q.q).select) != null ? _b : _a.select = [];
     return q;
   }
   const as = q.q.as || q.table;
@@ -4806,7 +4816,9 @@ function queryJson(self, coalesce) {
 }
 
 const pushSelectSql = (ctx, table, query, quotedAs) => {
-  ctx.sql.push(selectToSql(ctx, table, query, quotedAs));
+  const sql = selectToSql(ctx, table, query, quotedAs);
+  if (sql)
+    ctx.sql.push(sql);
 };
 const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect) => {
   var _a, _b;
@@ -4917,7 +4929,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
       list.push(sql);
     }
   }
-  return list.length ? list.join(", ") : selectAllSql(table, query, quotedAs);
+  return list.length ? list.join(", ") : query.select ? "" : selectAllSql(table, query, quotedAs);
 };
 function selectedObjectToSQL(ctx, quotedAs, item) {
   const sql = item.toSQL(ctx, quotedAs);