pqb 0.40.0 → 0.40.2

package/dist/index.js

@@ -921,7 +921,7 @@ const makeVarArg = (_op) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   );
 };
-const quoteValue$1 = (arg, ctx, quotedAs, jsonArray) => {
+const quoteValue = (arg, ctx, quotedAs, jsonArray) => {
   if (arg && typeof arg === "object") {
     if (!jsonArray && Array.isArray(arg)) {
       return `(${arg.map((value) => orchidCore.addValue(ctx.values, value)).join(", ")})`;
@@ -953,16 +953,16 @@ const quoteLikeValue = (arg, ctx, quotedAs, jsonArray) => {
 };
 const base = {
   equals: make(
-    (key, value, ctx, quotedAs) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue(value, ctx, quotedAs)}`
   ),
   not: make(
-    (key, value, ctx, quotedAs) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue(value, ctx, quotedAs)}`
   ),
   in: make(
-    (key, value, ctx, quotedAs) => `${key} IN ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} IN ${quoteValue(value, ctx, quotedAs)}`
   ),
   notIn: make(
-    (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs)}`
   )
 };
 const boolean = __spreadProps$b(__spreadValues$k({}, base), {
@@ -975,19 +975,19 @@ const boolean = __spreadProps$b(__spreadValues$k({}, base), {
 });
 const numeric = __spreadProps$b(__spreadValues$k({}, base), {
   lt: make(
-    (key, value, ctx, quotedAs) => `${key} < ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} < ${quoteValue(value, ctx, quotedAs)}`
   ),
   lte: make(
-    (key, value, ctx, quotedAs) => `${key} <= ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} <= ${quoteValue(value, ctx, quotedAs)}`
   ),
   gt: make(
-    (key, value, ctx, quotedAs) => `${key} > ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} > ${quoteValue(value, ctx, quotedAs)}`
   ),
   gte: make(
-    (key, value, ctx, quotedAs) => `${key} >= ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} >= ${quoteValue(value, ctx, quotedAs)}`
   ),
   between: make(
-    (key, [from, to], ctx, quotedAs) => `${key} BETWEEN ${quoteValue$1(from, ctx, quotedAs)} AND ${quoteValue$1(
+    (key, [from, to], ctx, quotedAs) => `${key} BETWEEN ${quoteValue(from, ctx, quotedAs)} AND ${quoteValue(
       to,
       ctx,
       quotedAs
@@ -1041,10 +1041,10 @@ const json = __spreadProps$b(__spreadValues$k({}, base), {
     { _op: jsonPathQueryOp }
   ),
   jsonSupersetOf: make(
-    (key, value, ctx, quotedAs) => `${key} @> ${quoteValue$1(value, ctx, quotedAs, true)}`
+    (key, value, ctx, quotedAs) => `${key} @> ${quoteValue(value, ctx, quotedAs, true)}`
   ),
   jsonSubsetOf: make(
-    (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue$1(value, ctx, quotedAs, true)}`
+    (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs, true)}`
   ),
   jsonSet: makeVarArg(
     (key, [path, value], ctx) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${orchidCore.addValue(
@@ -1079,193 +1079,6 @@ const Operators = {
   array: base
 };
 
-class NumberBaseColumn extends ColumnType {
-  constructor() {
-    super(...arguments);
-    this.operators = Operators.number;
-  }
-}
-class IntegerBaseColumn extends NumberBaseColumn {
-  constructor(schema) {
-    super(schema, schema.int());
-    this.data.int = true;
-  }
-}
-class NumberAsStringBaseColumn extends ColumnType {
-  constructor(schema) {
-    super(schema, schema.stringSchema());
-    this.operators = Operators.number;
-  }
-}
-class DecimalColumn extends NumberAsStringBaseColumn {
-  constructor(schema, numericPrecision, numericScale) {
-    super(schema);
-    this.operators = Operators.number;
-    this.dataType = "numeric";
-    this.data.numericPrecision = numericPrecision;
-    this.data.numericScale = numericScale;
-    this.data.alias = "decimal";
-  }
-  toCode(ctx, key) {
-    const { numericPrecision, numericScale } = this.data;
-    return columnCode(
-      this,
-      ctx,
-      key,
-      `decimal(${numericPrecision || ""}${numericScale ? `, ${numericScale}` : ""})`
-    );
-  }
-  toSQL() {
-    const { numericPrecision, numericScale } = this.data;
-    return orchidCore.joinTruthy(
-      this.dataType,
-      numericPrecision ? numericScale ? `(${numericPrecision}, ${numericScale})` : `(${numericPrecision})` : void 0
-    );
-  }
-}
-const skipNumberMethods = { int: true };
-const intToCode = (column, ctx, key, alias) => {
-  let code;
-  if (column.data.identity) {
-    code = identityToCode(column.data.identity, alias);
-  } else {
-    code = [`${alias}()`];
-  }
-  orchidCore.addCode(
-    code,
-    orchidCore.numberDataToCode(column.data, ctx.migration, skipNumberMethods)
-  );
-  return columnCode(column, ctx, key, code);
-};
-class SmallIntColumn extends IntegerBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int2";
-    this.parseItem = parseInt;
-    this.data.alias = "smallint";
-  }
-  toCode(ctx, key) {
-    return intToCode(this, ctx, key, "smallint");
-  }
-  identity(options = {}) {
-    return orchidCore.setColumnData(this, "identity", options);
-  }
-}
-class IntegerColumn extends IntegerBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int4";
-    this.parseItem = parseInt;
-    this.data.alias = "integer";
-  }
-  toCode(ctx, key) {
-    return intToCode(this, ctx, key, "integer");
-  }
-  identity(options = {}) {
-    return orchidCore.setColumnData(this, "identity", options);
-  }
-}
-class BigIntColumn extends NumberAsStringBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int8";
-    this.data.alias = "bigint";
-  }
-  toCode(ctx, key) {
-    return intToCode(this, ctx, key, "bigint");
-  }
-  identity(options = {}) {
-    return orchidCore.setColumnData(this, "identity", options);
-  }
-}
-class RealColumn extends NumberBaseColumn {
-  constructor(schema) {
-    super(schema, schema.number());
-    this.dataType = "float4";
-    this.parseItem = parseFloat;
-    this.data.alias = "real";
-  }
-  toCode(ctx, key) {
-    return columnCode(
-      this,
-      ctx,
-      key,
-      `real()${orchidCore.numberDataToCode(this.data, ctx.migration)}`
-    );
-  }
-}
-class DoublePrecisionColumn extends NumberAsStringBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "float8";
-    this.data.alias = "doublePrecision";
-  }
-  toCode(ctx, key) {
-    return columnCode(this, ctx, key, `doublePrecision()`);
-  }
-}
-class SmallSerialColumn extends IntegerBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int2";
-    this.parseItem = parseInt;
-    this.data.int = true;
-    this.data.alias = "smallSerial";
-  }
-  toSQL() {
-    return "smallserial";
-  }
-  toCode(ctx, key) {
-    return columnCode(
-      this,
-      ctx,
-      key,
-      `smallSerial()${orchidCore.numberDataToCode(
-        this.data,
-        ctx.migration,
-        skipNumberMethods
-      )}`
-    );
-  }
-}
-class SerialColumn extends IntegerBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int4";
-    this.parseItem = parseInt;
-    this.data.int = true;
-    this.data.alias = "serial";
-  }
-  toSQL() {
-    return "serial";
-  }
-  toCode(ctx, key) {
-    return columnCode(
-      this,
-      ctx,
-      key,
-      `serial()${orchidCore.numberDataToCode(
-        this.data,
-        ctx.migration,
-        skipNumberMethods
-      )}`
-    );
-  }
-}
-class BigSerialColumn extends NumberAsStringBaseColumn {
-  constructor(schema) {
-    super(schema);
-    this.dataType = "int8";
-    this.data.alias = "bigint";
-  }
-  toSQL() {
-    return "bigserial";
-  }
-  toCode(ctx, key) {
-    return columnCode(this, ctx, key, `bigSerial()`);
-  }
-}
-
 var __defProp$j = Object.defineProperty;
 var __defProps$a = Object.defineProperties;
 var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
@@ -1449,13 +1262,14 @@ class CircleColumn extends ColumnType {
     return columnCode(this, ctx, key, `circle()`);
   }
 }
-class MoneyColumn extends NumberBaseColumn {
+class MoneyColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
     this.dataType = "money";
+    this.operators = Operators.number;
     this.parseFn = Object.assign(
       function(input) {
-        return parseFloat(input.replace(/,/g, "").replace(/\$/g, ""));
+        return input === null ? input : parseFloat(input.replace(/,/g, "").replace(/\$/g, ""));
       },
       {
         hideFromCode: true
@@ -3021,6 +2835,8 @@ class ArrayColumn extends ColumnType {
     this.operators = Operators.array;
     this.parseFn = Object.assign(
       (source) => {
+        if (!source)
+          return source;
         const entries = [];
         parsePostgresArray(source, entries, this.data.item.parseItem);
         return entries;
@@ -3109,6 +2925,193 @@ const parsePostgresArray = (source, entries, transform) => {
   return pos;
 };
 
+class NumberBaseColumn extends ColumnType {
+  constructor() {
+    super(...arguments);
+    this.operators = Operators.number;
+  }
+}
+class IntegerBaseColumn extends NumberBaseColumn {
+  constructor(schema) {
+    super(schema, schema.int());
+    this.data.int = true;
+  }
+}
+class NumberAsStringBaseColumn extends ColumnType {
+  constructor(schema) {
+    super(schema, schema.stringSchema());
+    this.operators = Operators.number;
+  }
+}
+class DecimalColumn extends NumberAsStringBaseColumn {
+  constructor(schema, numericPrecision, numericScale) {
+    super(schema);
+    this.operators = Operators.number;
+    this.dataType = "numeric";
+    this.data.numericPrecision = numericPrecision;
+    this.data.numericScale = numericScale;
+    this.data.alias = "decimal";
+  }
+  toCode(ctx, key) {
+    const { numericPrecision, numericScale } = this.data;
+    return columnCode(
+      this,
+      ctx,
+      key,
+      `decimal(${numericPrecision || ""}${numericScale ? `, ${numericScale}` : ""})`
+    );
+  }
+  toSQL() {
+    const { numericPrecision, numericScale } = this.data;
+    return orchidCore.joinTruthy(
+      this.dataType,
+      numericPrecision ? numericScale ? `(${numericPrecision}, ${numericScale})` : `(${numericPrecision})` : void 0
+    );
+  }
+}
+const skipNumberMethods = { int: true };
+const intToCode = (column, ctx, key, alias) => {
+  let code;
+  if (column.data.identity) {
+    code = identityToCode(column.data.identity, alias);
+  } else {
+    code = [`${alias}()`];
+  }
+  orchidCore.addCode(
+    code,
+    orchidCore.numberDataToCode(column.data, ctx.migration, skipNumberMethods)
+  );
+  return columnCode(column, ctx, key, code);
+};
+class SmallIntColumn extends IntegerBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int2";
+    this.parseItem = parseInt;
+    this.data.alias = "smallint";
+  }
+  toCode(ctx, key) {
+    return intToCode(this, ctx, key, "smallint");
+  }
+  identity(options = {}) {
+    return orchidCore.setColumnData(this, "identity", options);
+  }
+}
+class IntegerColumn extends IntegerBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int4";
+    this.parseItem = parseInt;
+    this.data.alias = "integer";
+  }
+  toCode(ctx, key) {
+    return intToCode(this, ctx, key, "integer");
+  }
+  identity(options = {}) {
+    return orchidCore.setColumnData(this, "identity", options);
+  }
+}
+class BigIntColumn extends NumberAsStringBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int8";
+    this.data.alias = "bigint";
+  }
+  toCode(ctx, key) {
+    return intToCode(this, ctx, key, "bigint");
+  }
+  identity(options = {}) {
+    return orchidCore.setColumnData(this, "identity", options);
+  }
+}
+class RealColumn extends NumberBaseColumn {
+  constructor(schema) {
+    super(schema, schema.number());
+    this.dataType = "float4";
+    this.parseItem = parseFloat;
+    this.data.alias = "real";
+  }
+  toCode(ctx, key) {
+    return columnCode(
+      this,
+      ctx,
+      key,
+      `real()${orchidCore.numberDataToCode(this.data, ctx.migration)}`
+    );
+  }
+}
+class DoublePrecisionColumn extends NumberAsStringBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "float8";
+    this.data.alias = "doublePrecision";
+  }
+  toCode(ctx, key) {
+    return columnCode(this, ctx, key, `doublePrecision()`);
+  }
+}
+class SmallSerialColumn extends IntegerBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int2";
+    this.parseItem = parseInt;
+    this.data.int = true;
+    this.data.alias = "smallSerial";
+  }
+  toSQL() {
+    return "smallserial";
+  }
+  toCode(ctx, key) {
+    return columnCode(
+      this,
+      ctx,
+      key,
+      `smallSerial()${orchidCore.numberDataToCode(
+        this.data,
+        ctx.migration,
+        skipNumberMethods
+      )}`
+    );
+  }
+}
+class SerialColumn extends IntegerBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int4";
+    this.parseItem = parseInt;
+    this.data.int = true;
+    this.data.alias = "serial";
+  }
+  toSQL() {
+    return "serial";
+  }
+  toCode(ctx, key) {
+    return columnCode(
+      this,
+      ctx,
+      key,
+      `serial()${orchidCore.numberDataToCode(
+        this.data,
+        ctx.migration,
+        skipNumberMethods
+      )}`
+    );
+  }
+}
+class BigSerialColumn extends NumberAsStringBaseColumn {
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int8";
+    this.data.alias = "bigint";
+  }
+  toSQL() {
+    return "bigserial";
+  }
+  toCode(ctx, key) {
+    return columnCode(this, ctx, key, `bigSerial()`);
+  }
+}
+
 const parseDateToNumber = (value) => value ? Date.parse(value) : value;
 const parseDateToDate = (value) => value ? new Date(value) : value;
 parseDateToNumber.hideFromCode = parseDateToDate.hideFromCode = true;
@@ -3179,25 +3182,26 @@ const defaultSchemaConfig = {
   timestamp: (precision) => new TimestampTZColumn(defaultSchemaConfig, precision)
 };
 
-const quoteValue = (value, nested = false) => {
+const escape = (value, migration, nested) => {
   const type = typeof value;
   if (type === "number" || type === "bigint")
     return String(value);
   else if (type === "string")
-    return quoteString(value);
+    return escapeString(value);
   else if (type === "boolean")
     return value ? "true" : "false";
   else if (value instanceof Date)
     return `'${value.toISOString()}'`;
   else if (Array.isArray(value))
-    return `${nested ? "" : "ARRAY"}[${value.map((el) => quoteValue(el, true)).join(",")}]`;
+    return migration && nested && !value.length ? "" : (migration ? "{" : nested ? "[" : "ARRAY[") + value.map((el) => escape(el, migration, true)).join(",") + (migration ? "}" : "]");
   else if (value === null || value === void 0)
     return "NULL";
   else
-    return quoteString(JSON.stringify(value));
+    return escapeString(JSON.stringify(value));
 };
-const quote = (value) => quoteValue(value);
-const quoteString = (value) => `'${value.replaceAll("'", "''")}'`;
+const escapeForLog = (value) => escape(value);
+const escapeForMigration = (value) => escape(value, true);
+const escapeString = (value) => `'${value.replaceAll("'", "''")}'`;
 
 const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values) => {
   const elapsed = process.hrtime(time);
@@ -3206,7 +3210,7 @@ const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values
   if (!(values == null ? void 0 : values.length)) {
     return result;
   }
-  const formattedValues = `[${values.map(quote).join(", ")}]`;
+  const formattedValues = `[${values.map(escapeForLog).join(", ")}]`;
   return `${result} ${colors ? valuesColor(formattedValues) : formattedValues}`;
 };
 const logParamToLogObject = (logger, log) => {
@@ -4239,7 +4243,7 @@ const addParserForSelectItem = (q, as, key, arg) => {
             let returnType = originalReturnType;
             const { hookSelect } = query;
             const batches = [];
-            let last = path.length;
+            const last = path.length;
             if (returnType === "value" || returnType === "valueOrThrow") {
               if (hookSelect) {
                 batches.push = (item) => {
@@ -4249,8 +4253,6 @@ const addParserForSelectItem = (q, as, key, arg) => {
                   batches.push = Array.prototype.push;
                   return batches.push(item);
                 };
-              } else {
-                last--;
               }
             }
             collectNestedSelectBatches(batches, rows, path, last);
@@ -4311,19 +4313,19 @@ const addParserForSelectItem = (q, as, key, arg) => {
                 const parse = (_b2 = query.parsers) == null ? void 0 : _b2[orchidCore.getValueKey];
                 if (parse) {
                   if (returnType === "value") {
-                    for (const { data } of batches) {
-                      data[key] = data[key] === void 0 ? arg.q.notFoundDefault : parse(data[key]);
+                    for (const item of batches) {
+                      item.parent[item.key] = item.data = item.data === void 0 ? arg.q.notFoundDefault : parse(item.data);
                     }
                   } else {
-                    for (const { data } of batches) {
-                      if (data[key] === void 0)
+                    for (const item of batches) {
+                      if (item.data === void 0)
                         throw new NotFoundError(arg);
-                      data[key] = parse(data[key]);
+                      item.parent[item.key] = item.data = parse(item.data);
                     }
                   }
                 } else if (returnType !== "value") {
                   for (const { data } of batches) {
-                    if (data[key] === void 0)
+                    if (data === void 0)
                       throw new NotFoundError(arg);
                   }
                 }
@@ -4392,7 +4394,9 @@ const collectNestedSelectBatches = (batches, rows, path, last) => {
   const stack = rows.map(
     (row) => ({
       data: row,
-      i: 0
+      parent: row,
+      i: 0,
+      key: path[0]
     })
   );
   while (stack.length > 0) {
@@ -5824,7 +5828,7 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
   }).join(", ")})` : "";
   const target = "from" in copy ? copy.from : copy.to;
   sql.push(
-    `COPY "${table.table}"${columns} ${"from" in copy ? "FROM" : "TO"} ${typeof target === "string" ? quoteString(target) : `PROGRAM ${quoteString(target.program)}`}`
+    `COPY "${table.table}"${columns} ${"from" in copy ? "FROM" : "TO"} ${typeof target === "string" ? escapeString(target) : `PROGRAM ${escapeString(target.program)}`}`
   );
   if (Object.keys(copy).length > (copy.columns ? 2 : 1)) {
     const options = [];
@@ -5833,15 +5837,15 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
     if (copy.freeze)
       options.push(`FREEZE ${copy.freeze}`);
     if (copy.delimiter)
-      options.push(`DELIMITER ${quoteString(copy.delimiter)}`);
+      options.push(`DELIMITER ${escapeString(copy.delimiter)}`);
     if (copy.null)
-      options.push(`NULL ${quoteString(copy.null)}`);
+      options.push(`NULL ${escapeString(copy.null)}`);
     if (copy.header)
       options.push(`HEADER ${copy.header}`);
     if (copy.quote)
-      options.push(`QUOTE ${quoteString(copy.quote)}`);
+      options.push(`QUOTE ${escapeString(copy.quote)}`);
     if (copy.escape)
-      options.push(`ESCAPE ${quoteString(copy.escape)}`);
+      options.push(`ESCAPE ${escapeString(copy.escape)}`);
     if (copy.forceQuote)
       options.push(
         `FORCE_QUOTE ${copy.forceQuote === "*" ? "*" : `(${copy.forceQuote.map((x) => `"${x}"`).join(", ")})`}`
@@ -5855,7 +5859,7 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
         `FORCE_NULL (${copy.forceNull.map((x) => `"${x}"`).join(", ")})`
       );
     if (copy.encoding)
-      options.push(`ENCODING ${quoteString(copy.encoding)}`);
+      options.push(`ENCODING ${escapeString(copy.encoding)}`);
     sql.push(`WITH (${options.join(", ")})`);
   }
   pushWhereStatementSql(ctx, table, query, quotedAs);
@@ -13168,6 +13172,9 @@ exports.copyTableData = copyTableData;
 exports.countSelect = countSelect;
 exports.createDb = createDb;
 exports.defaultSchemaConfig = defaultSchemaConfig;
+exports.escapeForLog = escapeForLog;
+exports.escapeForMigration = escapeForMigration;
+exports.escapeString = escapeString;
 exports.extendQuery = extendQuery;
 exports.filterResult = filterResult;
 exports.foreignKeyArgumentToCode = foreignKeyArgumentToCode;
@@ -13213,8 +13220,6 @@ exports.queryJson = queryJson;
 exports.queryMethodByReturnType = queryMethodByReturnType;
 exports.queryTypeWithLimitOne = queryTypeWithLimitOne;
 exports.queryWrap = queryWrap;
-exports.quote = quote;
-exports.quoteString = quoteString;
 exports.raw = raw;
 exports.referencesArgsToCode = referencesArgsToCode;
 exports.resolveSubQueryCallback = resolveSubQueryCallback;