pqb 0.3.2 → 0.3.4

package/dist/index.js

@@ -4,28 +4,28 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var pg = require('pg');
 
-var __defProp$p = Object.defineProperty;
+var __defProp$q = Object.defineProperty;
 var __defProps$l = Object.defineProperties;
 var __getOwnPropDescs$l = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
-var __hasOwnProp$q = Object.prototype.hasOwnProperty;
-var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$p = (obj, key, value) => key in obj ? __defProp$p(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$p = (a, b) => {
+var __getOwnPropSymbols$r = Object.getOwnPropertySymbols;
+var __hasOwnProp$r = Object.prototype.hasOwnProperty;
+var __propIsEnum$r = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$q = (obj, key, value) => key in obj ? __defProp$q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$q = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$q.call(b, prop))
-      __defNormalProp$p(a, prop, b[prop]);
-  if (__getOwnPropSymbols$q)
-    for (var prop of __getOwnPropSymbols$q(b)) {
-      if (__propIsEnum$q.call(b, prop))
-        __defNormalProp$p(a, prop, b[prop]);
+    if (__hasOwnProp$r.call(b, prop))
+      __defNormalProp$q(a, prop, b[prop]);
+  if (__getOwnPropSymbols$r)
+    for (var prop of __getOwnPropSymbols$r(b)) {
+      if (__propIsEnum$r.call(b, prop))
+        __defNormalProp$q(a, prop, b[prop]);
     }
   return a;
 };
 var __spreadProps$l = (a, b) => __defProps$l(a, __getOwnPropDescs$l(b));
 const addColumnData = (q, key, value) => {
   const cloned = Object.create(q);
-  cloned.data = __spreadProps$l(__spreadValues$p({}, q.data), { [key]: value });
+  cloned.data = __spreadProps$l(__spreadValues$q({}, q.data), { [key]: value });
   return cloned;
 };
 class ColumnType {
@@ -43,12 +43,12 @@ class ColumnType {
   foreignKey(fnOrTable, column, options = {}) {
     const cloned = Object.create(this);
     if (typeof fnOrTable === "string") {
-      cloned.data = __spreadProps$l(__spreadValues$p({}, this.data), {
-        foreignKey: __spreadValues$p({ table: fnOrTable, columns: [column] }, options)
+      cloned.data = __spreadProps$l(__spreadValues$q({}, this.data), {
+        foreignKey: __spreadValues$q({ table: fnOrTable, columns: [column] }, options)
       });
     } else {
-      cloned.data = __spreadProps$l(__spreadValues$p({}, this.data), {
-        foreignKey: __spreadValues$p({ fn: fnOrTable, columns: [column] }, options)
+      cloned.data = __spreadProps$l(__spreadValues$q({}, this.data), {
+        foreignKey: __spreadValues$q({ fn: fnOrTable, columns: [column] }, options)
       });
     }
     return cloned;
@@ -80,7 +80,7 @@ class ColumnType {
     return addColumnData(this, "index", options);
   }
   unique(options = {}) {
-    return addColumnData(this, "index", __spreadProps$l(__spreadValues$p({}, options), { unique: true }));
+    return addColumnData(this, "index", __spreadProps$l(__spreadValues$q({}, options), { unique: true }));
   }
   comment(comment) {
     return addColumnData(this, "comment", comment);
@@ -207,21 +207,21 @@ const addValue = (values, value) => {
   return `$${values.length}`;
 };
 
-var __defProp$o = Object.defineProperty;
+var __defProp$p = Object.defineProperty;
 var __defProps$k = Object.defineProperties;
 var __getOwnPropDescs$k = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
-var __hasOwnProp$p = Object.prototype.hasOwnProperty;
-var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$o = (obj, key, value) => key in obj ? __defProp$o(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$o = (a, b) => {
+var __getOwnPropSymbols$q = Object.getOwnPropertySymbols;
+var __hasOwnProp$q = Object.prototype.hasOwnProperty;
+var __propIsEnum$q = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$p = (obj, key, value) => key in obj ? __defProp$p(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$p = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$p.call(b, prop))
-      __defNormalProp$o(a, prop, b[prop]);
-  if (__getOwnPropSymbols$p)
-    for (var prop of __getOwnPropSymbols$p(b)) {
-      if (__propIsEnum$p.call(b, prop))
-        __defNormalProp$o(a, prop, b[prop]);
+    if (__hasOwnProp$q.call(b, prop))
+      __defNormalProp$p(a, prop, b[prop]);
+  if (__getOwnPropSymbols$q)
+    for (var prop of __getOwnPropSymbols$q(b)) {
+      if (__propIsEnum$q.call(b, prop))
+        __defNormalProp$p(a, prop, b[prop]);
     }
   return a;
 };
@@ -311,14 +311,14 @@ const base = () => ({
   in: all.in(),
   notIn: all.notIn()
 });
-const numeric = () => __spreadProps$k(__spreadValues$o({}, base()), {
+const numeric = () => __spreadProps$k(__spreadValues$p({}, base()), {
   lt: all.lt(),
   lte: all.lte(),
   gt: all.gt(),
   gte: all.gte(),
   between: all.between()
 });
-const text = () => __spreadProps$k(__spreadValues$o({}, base()), {
+const text = () => __spreadProps$k(__spreadValues$p({}, base()), {
   contains: all.contains(),
   containsInsensitive: all.containsInsensitive(),
   startsWith: all.startsWith(),
@@ -326,7 +326,7 @@ const text = () => __spreadProps$k(__spreadValues$o({}, base()), {
   endsWith: all.endsWith(),
   endsWithInsensitive: all.endsWithInsensitive()
 });
-const json = () => __spreadProps$k(__spreadValues$o({}, base()), {
+const json = () => __spreadProps$k(__spreadValues$p({}, base()), {
   jsonPath: all.jsonPath(),
   jsonSupersetOf: all.jsonSupersetOf(),
   jsonSubsetOf: all.jsonSubsetOf()
@@ -342,6 +342,12 @@ const Operators = {
   array: base()
 };
 
+const defaultsKey = Symbol("defaults");
+const queryTypeWithLimitOne = {
+  one: true,
+  oneOrThrow: true
+};
+
 const pushDistinctSql = (ctx, distinct, quotedAs) => {
   ctx.sql.push("DISTINCT");
   if (distinct.length) {
@@ -694,21 +700,21 @@ const pushIn = (ands, prefix, quotedAs, values, arg) => {
   );
 };
 
-var __defProp$n = Object.defineProperty;
+var __defProp$o = Object.defineProperty;
 var __defProps$j = Object.defineProperties;
 var __getOwnPropDescs$j = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$o = Object.getOwnPropertySymbols;
-var __hasOwnProp$o = Object.prototype.hasOwnProperty;
-var __propIsEnum$o = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$n = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$n = (a, b) => {
+var __getOwnPropSymbols$p = Object.getOwnPropertySymbols;
+var __hasOwnProp$p = Object.prototype.hasOwnProperty;
+var __propIsEnum$p = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$o = (obj, key, value) => key in obj ? __defProp$o(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$o = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$o.call(b, prop))
-      __defNormalProp$n(a, prop, b[prop]);
-  if (__getOwnPropSymbols$o)
-    for (var prop of __getOwnPropSymbols$o(b)) {
-      if (__propIsEnum$o.call(b, prop))
-        __defNormalProp$n(a, prop, b[prop]);
+    if (__hasOwnProp$p.call(b, prop))
+      __defNormalProp$o(a, prop, b[prop]);
+  if (__getOwnPropSymbols$p)
+    for (var prop of __getOwnPropSymbols$p(b)) {
+      if (__propIsEnum$p.call(b, prop))
+        __defNormalProp$o(a, prop, b[prop]);
     }
   return a;
 };
@@ -716,7 +722,7 @@ var __spreadProps$j = (a, b) => __defProps$j(a, __getOwnPropDescs$j(b));
 const aggregateToSql = (ctx, model, item, quotedAs) => {
   var _a;
   const sql = [`${item.function}(`];
-  ctx = __spreadProps$j(__spreadValues$n({}, ctx), { sql });
+  ctx = __spreadProps$j(__spreadValues$o({}, ctx), { sql });
   const options = item.options || EMPTY_OBJECT;
   if (options.distinct && !options.withinGroup)
     sql.push("DISTINCT ");
@@ -884,7 +890,7 @@ const selectToSql = (ctx, model, query, quotedAs) => {
   }
 };
 const pushSubQuerySql = (query, as, values, list) => {
-  const { returnType } = query.query;
+  const { returnType = "all" } = query.query;
   switch (returnType) {
     case "all":
     case "one":
@@ -901,7 +907,6 @@ const pushSubQuerySql = (query, as, values, list) => {
       select[0] = { selectAs: { c: first } };
       query = query._wrap(query.__model.clone());
       query._getOptional(raw(`COALESCE(json_agg("c"), '[]')`));
-      delete query.query.take;
       break;
     }
     case "rows":
@@ -1019,22 +1024,30 @@ const havingToSql = (ctx, model, query, quotedAs) => {
 };
 
 const pushWithSql = (ctx, withData) => {
-  withData.forEach((withItem) => {
-    const [name, options, query] = withItem;
-    let inner;
-    if (isRaw(query)) {
-      inner = getRaw(query, ctx.values);
-    } else {
-      inner = query.toSql({ values: ctx.values }).text;
-    }
-    ctx.sql.push(
-      `WITH ${options.recursive ? "RECURSIVE " : ""}${q(name)}${options.columns ? `(${options.columns.map(q).join(", ")})` : ""} AS ${options.materialized ? "MATERIALIZED " : options.notMaterialized ? "NOT MATERIALIZED " : ""}(${inner})`
-    );
-  });
+  if (!withData.length)
+    return;
+  ctx.sql.push(
+    "WITH",
+    withData.map((withItem) => {
+      const [name, options, query] = withItem;
+      let inner;
+      if (isRaw(query)) {
+        inner = getRaw(query, ctx.values);
+      } else {
+        inner = query.toSql({ values: ctx.values }).text;
+      }
+      return `${options.recursive ? "RECURSIVE " : ""}${q(name)}${options.columns ? `(${options.columns.map(q).join(", ")})` : ""} AS ${options.materialized ? "MATERIALIZED " : options.notMaterialized ? "NOT MATERIALIZED " : ""}(${inner})`;
+    }).join(", ")
+  );
 };
 
+const checkIfASimpleQuery = (q) => {
+  if (q.returnType && q.returnType !== "all")
+    return false;
+  const keys = Object.keys(q);
+  return !keys.some((key) => queryKeysOfNotSimpleQuery.includes(key));
+};
 const queryKeysOfNotSimpleQuery = [
-  "take",
   "with",
   "as",
   "from",
@@ -1076,8 +1089,7 @@ const getFrom = (model, query, values) => {
         return `(${sql.text})`;
       }
       const q = query.from.query;
-      const keys = Object.keys(q);
-      if (keys.some((key) => queryKeysOfNotSimpleQuery.includes(key))) {
+      if (!checkIfASimpleQuery(q)) {
         const sql = query.from.toSql({ values });
         return `(${sql.text})`;
       }
@@ -1333,8 +1345,9 @@ const makeSql = (model, { values = [] } = {}) => {
   if (query.order) {
     pushOrderBySql(ctx, quotedAs, query.order);
   }
-  if (query.take || query.limit !== void 0) {
-    sql.push(`LIMIT ${addValue(values, query.take ? 1 : query.limit)}`);
+  const limit = queryTypeWithLimitOne[query.returnType] ? 1 : query.limit;
+  if (limit) {
+    sql.push(`LIMIT ${addValue(values, limit)}`);
   }
   if (query.offset) {
     sql.push(`OFFSET ${addValue(values, query.offset)}`);
@@ -1355,21 +1368,21 @@ const makeSql = (model, { values = [] } = {}) => {
   return { text: sql.join(" "), values };
 };
 
-var __defProp$m = Object.defineProperty;
+var __defProp$n = Object.defineProperty;
 var __defProps$i = Object.defineProperties;
 var __getOwnPropDescs$i = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
-var __hasOwnProp$n = Object.prototype.hasOwnProperty;
-var __propIsEnum$n = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$m = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$m = (a, b) => {
+var __getOwnPropSymbols$o = Object.getOwnPropertySymbols;
+var __hasOwnProp$o = Object.prototype.hasOwnProperty;
+var __propIsEnum$o = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$n = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$n = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$n.call(b, prop))
-      __defNormalProp$m(a, prop, b[prop]);
-  if (__getOwnPropSymbols$n)
-    for (var prop of __getOwnPropSymbols$n(b)) {
-      if (__propIsEnum$n.call(b, prop))
-        __defNormalProp$m(a, prop, b[prop]);
+    if (__hasOwnProp$o.call(b, prop))
+      __defNormalProp$n(a, prop, b[prop]);
+  if (__getOwnPropSymbols$o)
+    for (var prop of __getOwnPropSymbols$o(b)) {
+      if (__propIsEnum$o.call(b, prop))
+        __defNormalProp$n(a, prop, b[prop]);
     }
   return a;
 };
@@ -1389,7 +1402,7 @@ const joinTruthy = (...strings) => {
   return strings.filter((string) => string).join("");
 };
 const getClonedQueryData = (query) => {
-  const cloned = __spreadProps$i(__spreadValues$m({}, query), { [toSqlCacheKey]: void 0 });
+  const cloned = __spreadProps$i(__spreadValues$n({}, query), { [toSqlCacheKey]: void 0 });
   for (const key in query) {
     if (Array.isArray(query[key])) {
       cloned[key] = [
@@ -1450,28 +1463,28 @@ var utils = /*#__PURE__*/Object.freeze({
   assignMethodsToClass: assignMethodsToClass
 });
 
-var __defProp$l = Object.defineProperty;
+var __defProp$m = Object.defineProperty;
 var __defProps$h = Object.defineProperties;
 var __getOwnPropDescs$h = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
-var __hasOwnProp$m = Object.prototype.hasOwnProperty;
-var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$l = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$l = (a, b) => {
+var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
+var __hasOwnProp$n = Object.prototype.hasOwnProperty;
+var __propIsEnum$n = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$m = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$m = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$m.call(b, prop))
-      __defNormalProp$l(a, prop, b[prop]);
-  if (__getOwnPropSymbols$m)
-    for (var prop of __getOwnPropSymbols$m(b)) {
-      if (__propIsEnum$m.call(b, prop))
-        __defNormalProp$l(a, prop, b[prop]);
+    if (__hasOwnProp$n.call(b, prop))
+      __defNormalProp$m(a, prop, b[prop]);
+  if (__getOwnPropSymbols$n)
+    for (var prop of __getOwnPropSymbols$n(b)) {
+      if (__propIsEnum$n.call(b, prop))
+        __defNormalProp$m(a, prop, b[prop]);
     }
   return a;
 };
 var __spreadProps$h = (a, b) => __defProps$h(a, __getOwnPropDescs$h(b));
 const setDataValue = (item, key, value) => {
   const cloned = Object.create(item);
-  cloned.data = __spreadProps$h(__spreadValues$l({}, item.data), { [key]: value });
+  cloned.data = __spreadProps$h(__spreadValues$m({}, item.data), { [key]: value });
   return cloned;
 };
 function min(value) {
@@ -1501,7 +1514,7 @@ const setMethods = {
   size,
   nonempty
 };
-const stringTypeMethods = () => __spreadProps$h(__spreadValues$l({}, arrayMethods), {
+const stringTypeMethods = () => __spreadProps$h(__spreadValues$m({}, arrayMethods), {
   email() {
     return setDataValue(this, "email", true);
   },
@@ -1972,21 +1985,21 @@ class EnumColumn extends ColumnType {
   }
 }
 
-var __defProp$k = Object.defineProperty;
+var __defProp$l = Object.defineProperty;
 var __defProps$g = Object.defineProperties;
 var __getOwnPropDescs$g = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
-var __hasOwnProp$l = Object.prototype.hasOwnProperty;
-var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$k = (a, b) => {
+var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
+var __hasOwnProp$m = Object.prototype.hasOwnProperty;
+var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$l = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$l = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$l.call(b, prop))
-      __defNormalProp$k(a, prop, b[prop]);
-  if (__getOwnPropSymbols$l)
-    for (var prop of __getOwnPropSymbols$l(b)) {
-      if (__propIsEnum$l.call(b, prop))
-        __defNormalProp$k(a, prop, b[prop]);
+    if (__hasOwnProp$m.call(b, prop))
+      __defNormalProp$l(a, prop, b[prop]);
+  if (__getOwnPropSymbols$m)
+    for (var prop of __getOwnPropSymbols$m(b)) {
+      if (__propIsEnum$m.call(b, prop))
+        __defNormalProp$l(a, prop, b[prop]);
     }
   return a;
 };
@@ -1994,42 +2007,42 @@ var __spreadProps$g = (a, b) => __defProps$g(a, __getOwnPropDescs$g(b));
 var __objRest$4 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$l.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$m.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$l)
-    for (var prop of __getOwnPropSymbols$l(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$l.call(source, prop))
+  if (source != null && __getOwnPropSymbols$m)
+    for (var prop of __getOwnPropSymbols$m(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$m.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
 const optional = (type) => {
-  return __spreadProps$g(__spreadValues$k({}, type), {
-    data: __spreadProps$g(__spreadValues$k({}, type.data), { optional: true })
+  return __spreadProps$g(__spreadValues$l({}, type), {
+    data: __spreadProps$g(__spreadValues$l({}, type.data), { optional: true })
   });
 };
 const required = (type) => {
   const _a = type.data, data = __objRest$4(_a, ["optional"]);
-  return __spreadProps$g(__spreadValues$k({}, type), {
+  return __spreadProps$g(__spreadValues$l({}, type), {
     data
   });
 };
 
-var __defProp$j = Object.defineProperty;
+var __defProp$k = Object.defineProperty;
 var __defProps$f = Object.defineProperties;
 var __getOwnPropDescs$f = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
-var __hasOwnProp$k = Object.prototype.hasOwnProperty;
-var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$j = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$j = (a, b) => {
+var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
+var __hasOwnProp$l = Object.prototype.hasOwnProperty;
+var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$k = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$k.call(b, prop))
-      __defNormalProp$j(a, prop, b[prop]);
-  if (__getOwnPropSymbols$k)
-    for (var prop of __getOwnPropSymbols$k(b)) {
-      if (__propIsEnum$k.call(b, prop))
-        __defNormalProp$j(a, prop, b[prop]);
+    if (__hasOwnProp$l.call(b, prop))
+      __defNormalProp$k(a, prop, b[prop]);
+  if (__getOwnPropSymbols$l)
+    for (var prop of __getOwnPropSymbols$l(b)) {
+      if (__propIsEnum$l.call(b, prop))
+        __defNormalProp$k(a, prop, b[prop]);
     }
   return a;
 };
@@ -2037,42 +2050,42 @@ var __spreadProps$f = (a, b) => __defProps$f(a, __getOwnPropDescs$f(b));
 var __objRest$3 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$k.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$l.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$k)
-    for (var prop of __getOwnPropSymbols$k(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$k.call(source, prop))
+  if (source != null && __getOwnPropSymbols$l)
+    for (var prop of __getOwnPropSymbols$l(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$l.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
 const nullable = (type) => {
-  return __spreadProps$f(__spreadValues$j({}, type), {
-    data: __spreadProps$f(__spreadValues$j({}, type.data), { nullable: true })
+  return __spreadProps$f(__spreadValues$k({}, type), {
+    data: __spreadProps$f(__spreadValues$k({}, type.data), { nullable: true })
   });
 };
 const notNullable = (type) => {
   const _a = type.data, data = __objRest$3(_a, ["nullable"]);
-  return __spreadProps$f(__spreadValues$j({}, type), {
+  return __spreadProps$f(__spreadValues$k({}, type), {
     data
   });
 };
 
-var __defProp$i = Object.defineProperty;
+var __defProp$j = Object.defineProperty;
 var __defProps$e = Object.defineProperties;
 var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
-var __hasOwnProp$j = Object.prototype.hasOwnProperty;
-var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$i = (a, b) => {
+var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
+var __hasOwnProp$k = Object.prototype.hasOwnProperty;
+var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$j = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$j = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$j.call(b, prop))
-      __defNormalProp$i(a, prop, b[prop]);
-  if (__getOwnPropSymbols$j)
-    for (var prop of __getOwnPropSymbols$j(b)) {
-      if (__propIsEnum$j.call(b, prop))
-        __defNormalProp$i(a, prop, b[prop]);
+    if (__hasOwnProp$k.call(b, prop))
+      __defNormalProp$j(a, prop, b[prop]);
+  if (__getOwnPropSymbols$k)
+    for (var prop of __getOwnPropSymbols$k(b)) {
+      if (__propIsEnum$k.call(b, prop))
+        __defNormalProp$j(a, prop, b[prop]);
     }
   return a;
 };
@@ -2080,23 +2093,23 @@ var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
 var __objRest$2 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$j.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$k.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$j)
-    for (var prop of __getOwnPropSymbols$j(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$j.call(source, prop))
+  if (source != null && __getOwnPropSymbols$k)
+    for (var prop of __getOwnPropSymbols$k(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$k.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
 const nullish = (type) => {
-  return __spreadProps$e(__spreadValues$i({}, type), {
-    data: __spreadProps$e(__spreadValues$i({}, type.data), { nullable: true, optional: true })
+  return __spreadProps$e(__spreadValues$j({}, type), {
+    data: __spreadProps$e(__spreadValues$j({}, type.data), { nullable: true, optional: true })
   });
 };
 const notNullish = (type) => {
   const _a = type.data, data = __objRest$2(_a, ["nullable", "optional"]);
-  return __spreadProps$e(__spreadValues$i({}, type), {
+  return __spreadProps$e(__spreadValues$j({}, type), {
     data
   });
 };
@@ -2116,21 +2129,21 @@ const union = (types) => {
   });
 };
 
-var __defProp$h = Object.defineProperty;
+var __defProp$i = Object.defineProperty;
 var __defProps$d = Object.defineProperties;
 var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
-var __hasOwnProp$i = Object.prototype.hasOwnProperty;
-var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$h = (a, b) => {
+var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
+var __hasOwnProp$j = Object.prototype.hasOwnProperty;
+var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$i = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$i.call(b, prop))
-      __defNormalProp$h(a, prop, b[prop]);
-  if (__getOwnPropSymbols$i)
-    for (var prop of __getOwnPropSymbols$i(b)) {
-      if (__propIsEnum$i.call(b, prop))
-        __defNormalProp$h(a, prop, b[prop]);
+    if (__hasOwnProp$j.call(b, prop))
+      __defNormalProp$i(a, prop, b[prop]);
+  if (__getOwnPropSymbols$j)
+    for (var prop of __getOwnPropSymbols$j(b)) {
+      if (__propIsEnum$j.call(b, prop))
+        __defNormalProp$i(a, prop, b[prop]);
     }
   return a;
 };
@@ -2162,22 +2175,22 @@ const baseTypeMethods = {
     return this;
   },
   transform(fn) {
-    return __spreadProps$d(__spreadValues$h({}, this), {
+    return __spreadProps$d(__spreadValues$i({}, this), {
       chain: [...this.chain, ["transform", fn]]
     });
   },
   to(fn, type) {
-    return __spreadProps$d(__spreadValues$h({}, type), {
+    return __spreadProps$d(__spreadValues$i({}, type), {
       chain: [...this.chain, ["to", fn, type], ...type.chain]
     });
   },
   refine(check) {
-    return __spreadProps$d(__spreadValues$h({}, this), {
+    return __spreadProps$d(__spreadValues$i({}, this), {
       chain: [...this.chain, ["refine", check]]
     });
   },
   superRefine(check) {
-    return __spreadProps$d(__spreadValues$h({}, this), {
+    return __spreadProps$d(__spreadValues$i({}, this), {
       chain: [...this.chain, ["superRefine", check]]
     });
   },
@@ -2190,7 +2203,7 @@ const baseTypeMethods = {
   },
   default(value) {
     const cloned = Object.create(this);
-    cloned.data = __spreadProps$d(__spreadValues$h({}, cloned.data), { default: value });
+    cloned.data = __spreadProps$d(__spreadValues$i({}, cloned.data), { default: value });
     return cloned;
   },
   array() {
@@ -2198,34 +2211,34 @@ const baseTypeMethods = {
   }
 };
 const constructType = (type) => {
-  return __spreadValues$h(__spreadValues$h({}, baseTypeMethods), type);
+  return __spreadValues$i(__spreadValues$i({}, baseTypeMethods), type);
 };
 
-var __defProp$g = Object.defineProperty;
+var __defProp$h = Object.defineProperty;
 var __defProps$c = Object.defineProperties;
 var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
-var __hasOwnProp$h = Object.prototype.hasOwnProperty;
-var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$g = (a, b) => {
+var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
+var __hasOwnProp$i = Object.prototype.hasOwnProperty;
+var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$h = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$h.call(b, prop))
-      __defNormalProp$g(a, prop, b[prop]);
-  if (__getOwnPropSymbols$h)
-    for (var prop of __getOwnPropSymbols$h(b)) {
-      if (__propIsEnum$h.call(b, prop))
-        __defNormalProp$g(a, prop, b[prop]);
+    if (__hasOwnProp$i.call(b, prop))
+      __defNormalProp$h(a, prop, b[prop]);
+  if (__getOwnPropSymbols$i)
+    for (var prop of __getOwnPropSymbols$i(b)) {
+      if (__propIsEnum$i.call(b, prop))
+        __defNormalProp$h(a, prop, b[prop]);
     }
   return a;
 };
 var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
 const array = (element) => {
-  return constructType(__spreadValues$g({
+  return constructType(__spreadValues$h({
     dataType: "array",
     element,
     deepPartial() {
-      return __spreadProps$c(__spreadValues$g({}, this), {
+      return __spreadProps$c(__spreadValues$h({}, this), {
         element: this.element.deepPartial()
       });
     },
@@ -2235,21 +2248,21 @@ const array = (element) => {
   }, arrayMethods));
 };
 
-var __defProp$f = Object.defineProperty;
+var __defProp$g = Object.defineProperty;
 var __defProps$b = Object.defineProperties;
 var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
-var __hasOwnProp$g = Object.prototype.hasOwnProperty;
-var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$f = (a, b) => {
+var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
+var __hasOwnProp$h = Object.prototype.hasOwnProperty;
+var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$g = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$g.call(b, prop))
-      __defNormalProp$f(a, prop, b[prop]);
-  if (__getOwnPropSymbols$g)
-    for (var prop of __getOwnPropSymbols$g(b)) {
-      if (__propIsEnum$g.call(b, prop))
-        __defNormalProp$f(a, prop, b[prop]);
+    if (__hasOwnProp$h.call(b, prop))
+      __defNormalProp$g(a, prop, b[prop]);
+  if (__getOwnPropSymbols$h)
+    for (var prop of __getOwnPropSymbols$h(b)) {
+      if (__propIsEnum$h.call(b, prop))
+        __defNormalProp$g(a, prop, b[prop]);
     }
   return a;
 };
@@ -2273,7 +2286,7 @@ const discriminatedUnion = (discriminator, options) => {
         partial.shape[discriminator] = option.shape[discriminator];
         newOptionsMap.set(key, partial);
       });
-      return __spreadProps$b(__spreadValues$f({}, this), {
+      return __spreadProps$b(__spreadValues$g({}, this), {
         options: newOptionsMap
       });
     }
@@ -2302,21 +2315,21 @@ const instanceOf = (cls) => {
   });
 };
 
-var __defProp$e = Object.defineProperty;
+var __defProp$f = Object.defineProperty;
 var __defProps$a = Object.defineProperties;
 var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
-var __hasOwnProp$f = Object.prototype.hasOwnProperty;
-var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$e = (a, b) => {
+var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
+var __hasOwnProp$g = Object.prototype.hasOwnProperty;
+var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$f = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$f.call(b, prop))
-      __defNormalProp$e(a, prop, b[prop]);
-  if (__getOwnPropSymbols$f)
-    for (var prop of __getOwnPropSymbols$f(b)) {
-      if (__propIsEnum$f.call(b, prop))
-        __defNormalProp$e(a, prop, b[prop]);
+    if (__hasOwnProp$g.call(b, prop))
+      __defNormalProp$f(a, prop, b[prop]);
+  if (__getOwnPropSymbols$g)
+    for (var prop of __getOwnPropSymbols$g(b)) {
+      if (__propIsEnum$g.call(b, prop))
+        __defNormalProp$f(a, prop, b[prop]);
     }
   return a;
 };
@@ -2328,7 +2341,7 @@ const lazy = (fn) => {
       return this.typeCache || (this.typeCache = fn());
     },
     deepPartial() {
-      return __spreadProps$a(__spreadValues$e({}, this), {
+      return __spreadProps$a(__spreadValues$f({}, this), {
         typeCache: void 0,
         getter: () => this.getter().deepPartial()
       });
@@ -2341,21 +2354,21 @@ const literal = (value) => constructType({
   value
 });
 
-var __defProp$d = Object.defineProperty;
+var __defProp$e = Object.defineProperty;
 var __defProps$9 = Object.defineProperties;
 var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
-var __hasOwnProp$e = Object.prototype.hasOwnProperty;
-var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$d = (a, b) => {
+var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
+var __hasOwnProp$f = Object.prototype.hasOwnProperty;
+var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$e = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$e.call(b, prop))
-      __defNormalProp$d(a, prop, b[prop]);
-  if (__getOwnPropSymbols$e)
-    for (var prop of __getOwnPropSymbols$e(b)) {
-      if (__propIsEnum$e.call(b, prop))
-        __defNormalProp$d(a, prop, b[prop]);
+    if (__hasOwnProp$f.call(b, prop))
+      __defNormalProp$e(a, prop, b[prop]);
+  if (__getOwnPropSymbols$f)
+    for (var prop of __getOwnPropSymbols$f(b)) {
+      if (__propIsEnum$f.call(b, prop))
+        __defNormalProp$e(a, prop, b[prop]);
     }
   return a;
 };
@@ -2366,7 +2379,7 @@ const map = (keyType, valueType) => {
     keyType,
     valueType,
     deepPartial() {
-      return __spreadProps$9(__spreadValues$d({}, this), {
+      return __spreadProps$9(__spreadValues$e({}, this), {
         keyType: this.keyType.deepPartial(),
         valueType: this.valueType.deepPartial()
       });
@@ -2392,21 +2405,21 @@ const nativeEnum = (givenEnum) => {
   });
 };
 
-var __defProp$c = Object.defineProperty;
+var __defProp$d = Object.defineProperty;
 var __defProps$8 = Object.defineProperties;
 var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
-var __hasOwnProp$d = Object.prototype.hasOwnProperty;
-var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$c = (a, b) => {
+var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
+var __hasOwnProp$e = Object.prototype.hasOwnProperty;
+var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$d = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$d.call(b, prop))
-      __defNormalProp$c(a, prop, b[prop]);
-  if (__getOwnPropSymbols$d)
-    for (var prop of __getOwnPropSymbols$d(b)) {
-      if (__propIsEnum$d.call(b, prop))
-        __defNormalProp$c(a, prop, b[prop]);
+    if (__hasOwnProp$e.call(b, prop))
+      __defNormalProp$d(a, prop, b[prop]);
+  if (__getOwnPropSymbols$e)
+    for (var prop of __getOwnPropSymbols$e(b)) {
+      if (__propIsEnum$e.call(b, prop))
+        __defNormalProp$d(a, prop, b[prop]);
     }
   return a;
 };
@@ -2419,12 +2432,12 @@ const object = (shape) => {
     catchAllType: void 0,
     extend(add) {
       return object(
-        Object.assign(__spreadValues$c({}, this.shape), add)
+        Object.assign(__spreadValues$d({}, this.shape), add)
       );
     },
     merge(obj) {
       return object(
-        Object.assign(__spreadValues$c({}, this.shape), obj.shape)
+        Object.assign(__spreadValues$d({}, this.shape), obj.shape)
       );
     },
     pick(...arr) {
@@ -2442,7 +2455,7 @@ const object = (shape) => {
       return object(picked);
     },
     partial(...arr) {
-      const mapped = __spreadValues$c({}, this.shape);
+      const mapped = __spreadValues$d({}, this.shape);
       if (arr.length) {
         arr.forEach((key) => {
           mapped[key] = mapped[key].optional();
@@ -2459,48 +2472,48 @@ const object = (shape) => {
       for (const key in this.shape) {
         newShape[key] = optional(this.shape[key].deepPartial());
       }
-      return __spreadProps$8(__spreadValues$c({}, this), {
+      return __spreadProps$8(__spreadValues$d({}, this), {
         shape: newShape
       });
     },
     passthrough() {
-      return __spreadProps$8(__spreadValues$c({}, this), {
+      return __spreadProps$8(__spreadValues$d({}, this), {
         unknownKeys: "passthrough"
       });
     },
     strict() {
-      return __spreadProps$8(__spreadValues$c({}, this), {
+      return __spreadProps$8(__spreadValues$d({}, this), {
         unknownKeys: "strict"
       });
     },
     strip() {
-      return __spreadProps$8(__spreadValues$c({}, this), {
+      return __spreadProps$8(__spreadValues$d({}, this), {
         unknownKeys: "strip"
       });
     },
     catchAll(type) {
-      return __spreadProps$8(__spreadValues$c({}, this), {
+      return __spreadProps$8(__spreadValues$d({}, this), {
         catchAllType: type
       });
     }
   });
 };
 
-var __defProp$b = Object.defineProperty;
+var __defProp$c = Object.defineProperty;
 var __defProps$7 = Object.defineProperties;
 var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
-var __hasOwnProp$c = Object.prototype.hasOwnProperty;
-var __propIsEnum$c = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$b = (a, b) => {
+var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
+var __hasOwnProp$d = Object.prototype.hasOwnProperty;
+var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$c = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$c.call(b, prop))
-      __defNormalProp$b(a, prop, b[prop]);
-  if (__getOwnPropSymbols$c)
-    for (var prop of __getOwnPropSymbols$c(b)) {
-      if (__propIsEnum$c.call(b, prop))
-        __defNormalProp$b(a, prop, b[prop]);
+    if (__hasOwnProp$d.call(b, prop))
+      __defNormalProp$c(a, prop, b[prop]);
+  if (__getOwnPropSymbols$d)
+    for (var prop of __getOwnPropSymbols$d(b)) {
+      if (__propIsEnum$d.call(b, prop))
+        __defNormalProp$c(a, prop, b[prop]);
     }
   return a;
 };
@@ -2510,7 +2523,7 @@ const any = () => {
     dataType: "any"
   });
 };
-const bigIntMethods = __spreadValues$b({
+const bigIntMethods = __spreadValues$c({
   dataType: "bigint"
 }, numberTypeMethods);
 const bigint = () => {
@@ -2536,19 +2549,19 @@ const nullType = () => {
     dataType: "null"
   });
 };
-const numberMethods = __spreadProps$7(__spreadValues$b({}, numberTypeMethods), {
+const numberMethods = __spreadProps$7(__spreadValues$c({}, numberTypeMethods), {
   dataType: "number"
 });
 const number = () => {
   return constructType(numberMethods);
 };
-const dateMethods = __spreadProps$7(__spreadValues$b({}, dateTypeMethods), {
+const dateMethods = __spreadProps$7(__spreadValues$c({}, dateTypeMethods), {
   dataType: "date"
 });
 const date = () => {
   return constructType(dateMethods);
 };
-const stringMethods = __spreadProps$7(__spreadValues$b({}, stringTypeMethods()), {
+const stringMethods = __spreadProps$7(__spreadValues$c({}, stringTypeMethods()), {
   dataType: "string"
 });
 const string = () => {
@@ -2584,21 +2597,21 @@ const scalarTypes = {
   void: voidType
 };
 
-var __defProp$a = Object.defineProperty;
+var __defProp$b = Object.defineProperty;
 var __defProps$6 = Object.defineProperties;
 var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
-var __hasOwnProp$b = Object.prototype.hasOwnProperty;
-var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$a = (a, b) => {
+var __getOwnPropSymbols$c = Object.getOwnPropertySymbols;
+var __hasOwnProp$c = Object.prototype.hasOwnProperty;
+var __propIsEnum$c = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$b = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$b.call(b, prop))
-      __defNormalProp$a(a, prop, b[prop]);
-  if (__getOwnPropSymbols$b)
-    for (var prop of __getOwnPropSymbols$b(b)) {
-      if (__propIsEnum$b.call(b, prop))
-        __defNormalProp$a(a, prop, b[prop]);
+    if (__hasOwnProp$c.call(b, prop))
+      __defNormalProp$b(a, prop, b[prop]);
+  if (__getOwnPropSymbols$c)
+    for (var prop of __getOwnPropSymbols$c(b)) {
+      if (__propIsEnum$c.call(b, prop))
+        __defNormalProp$b(a, prop, b[prop]);
     }
   return a;
 };
@@ -2610,38 +2623,38 @@ function record(...args) {
     keyType,
     valueType,
     deepPartial() {
-      return __spreadProps$6(__spreadValues$a({}, this), {
+      return __spreadProps$6(__spreadValues$b({}, this), {
         valueType: this.valueType.deepPartial()
       });
     }
   });
 }
 
-var __defProp$9 = Object.defineProperty;
+var __defProp$a = Object.defineProperty;
 var __defProps$5 = Object.defineProperties;
 var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$a = Object.getOwnPropertySymbols;
-var __hasOwnProp$a = Object.prototype.hasOwnProperty;
-var __propIsEnum$a = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$9 = (a, b) => {
+var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
+var __hasOwnProp$b = Object.prototype.hasOwnProperty;
+var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$a = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$a.call(b, prop))
-      __defNormalProp$9(a, prop, b[prop]);
-  if (__getOwnPropSymbols$a)
-    for (var prop of __getOwnPropSymbols$a(b)) {
-      if (__propIsEnum$a.call(b, prop))
-        __defNormalProp$9(a, prop, b[prop]);
+    if (__hasOwnProp$b.call(b, prop))
+      __defNormalProp$a(a, prop, b[prop]);
+  if (__getOwnPropSymbols$b)
+    for (var prop of __getOwnPropSymbols$b(b)) {
+      if (__propIsEnum$b.call(b, prop))
+        __defNormalProp$a(a, prop, b[prop]);
     }
   return a;
 };
 var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const set = (valueType) => {
-  return constructType(__spreadValues$9({
+  return constructType(__spreadValues$a({
     dataType: "set",
     valueType,
     deepPartial() {
-      return __spreadProps$5(__spreadValues$9({}, this), {
+      return __spreadProps$5(__spreadValues$a({}, this), {
         valueType: this.valueType.deepPartial()
       });
     },
@@ -2651,21 +2664,21 @@ const set = (valueType) => {
   }, setMethods));
 };
 
-var __defProp$8 = Object.defineProperty;
+var __defProp$9 = Object.defineProperty;
 var __defProps$4 = Object.defineProperties;
 var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
-var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
-var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$8 = (a, b) => {
+var __getOwnPropSymbols$a = Object.getOwnPropertySymbols;
+var __hasOwnProp$a = Object.prototype.hasOwnProperty;
+var __propIsEnum$a = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$9 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$9.call(b, prop))
-      __defNormalProp$8(a, prop, b[prop]);
-  if (__getOwnPropSymbols$9)
-    for (var prop of __getOwnPropSymbols$9(b)) {
-      if (__propIsEnum$9.call(b, prop))
-        __defNormalProp$8(a, prop, b[prop]);
+    if (__hasOwnProp$a.call(b, prop))
+      __defNormalProp$9(a, prop, b[prop]);
+  if (__getOwnPropSymbols$a)
+    for (var prop of __getOwnPropSymbols$a(b)) {
+      if (__propIsEnum$a.call(b, prop))
+        __defNormalProp$9(a, prop, b[prop]);
     }
   return a;
 };
@@ -2676,38 +2689,38 @@ const tuple = (items, rest = null) => {
     items,
     restType: rest,
     rest(rest2) {
-      return __spreadProps$4(__spreadValues$8({}, this), {
+      return __spreadProps$4(__spreadValues$9({}, this), {
         restType: rest2
       });
     },
     deepPartial() {
-      return __spreadProps$4(__spreadValues$8({}, this), {
+      return __spreadProps$4(__spreadValues$9({}, this), {
         items: this.items.map((item) => item.deepPartial())
       });
     }
   });
 };
 
-var __defProp$7 = Object.defineProperty;
+var __defProp$8 = Object.defineProperty;
 var __defProps$3 = Object.defineProperties;
 var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
-var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
-var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$7 = (a, b) => {
+var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
+var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
+var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$8 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$8.call(b, prop))
-      __defNormalProp$7(a, prop, b[prop]);
-  if (__getOwnPropSymbols$8)
-    for (var prop of __getOwnPropSymbols$8(b)) {
-      if (__propIsEnum$8.call(b, prop))
-        __defNormalProp$7(a, prop, b[prop]);
+    if (__hasOwnProp$9.call(b, prop))
+      __defNormalProp$8(a, prop, b[prop]);
+  if (__getOwnPropSymbols$9)
+    for (var prop of __getOwnPropSymbols$9(b)) {
+      if (__propIsEnum$9.call(b, prop))
+        __defNormalProp$8(a, prop, b[prop]);
     }
   return a;
 };
 var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
-const jsonTypes = __spreadProps$3(__spreadValues$7({
+const jsonTypes = __spreadProps$3(__spreadValues$8({
   array,
   discriminatedUnion,
   enum: enumType,
@@ -2862,21 +2875,21 @@ const checkIfDataHasUpdatedAt = (data) => {
   });
 };
 
-var __defProp$6 = Object.defineProperty;
+var __defProp$7 = Object.defineProperty;
 var __defProps$2 = Object.defineProperties;
 var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
-var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
-var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$6 = (a, b) => {
+var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
+var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
+var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$7 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$7.call(b, prop))
-      __defNormalProp$6(a, prop, b[prop]);
-  if (__getOwnPropSymbols$7)
-    for (var prop of __getOwnPropSymbols$7(b)) {
-      if (__propIsEnum$7.call(b, prop))
-        __defNormalProp$6(a, prop, b[prop]);
+    if (__hasOwnProp$8.call(b, prop))
+      __defNormalProp$7(a, prop, b[prop]);
+  if (__getOwnPropSymbols$8)
+    for (var prop of __getOwnPropSymbols$8(b)) {
+      if (__propIsEnum$8.call(b, prop))
+        __defNormalProp$7(a, prop, b[prop]);
     }
   return a;
 };
@@ -2959,7 +2972,7 @@ const columnTypes = {
       columns: toArray(columns).map(
         (column) => typeof column === "string" ? { column } : column
       ),
-      options: __spreadProps$2(__spreadValues$6({}, options), { unique: true })
+      options: __spreadProps$2(__spreadValues$7({}, options), { unique: true })
     };
     tableData.indexes.push(index);
     return emptyObject;
@@ -2995,26 +3008,18 @@ class ArrayOfColumnsObjects extends ColumnType {
 }
 class PluckResultColumnType extends ColumnType {
 }
-class TableSchema {
-  constructor(shape) {
-    this.shape = shape;
-    this.primaryKeys = Object.entries(this.shape).filter(([, column]) => {
-      return column.isPrimaryKey;
-    }).map(([key]) => key);
-  }
-}
 
-var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
-var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
-var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
+var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
+var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
+var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
 var __objRest$1 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$6.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$7.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$6)
-    for (var prop of __getOwnPropSymbols$6(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$6.call(source, prop))
+  if (source != null && __getOwnPropSymbols$7)
+    for (var prop of __getOwnPropSymbols$7(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$7.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -3119,11 +3124,6 @@ class TransactionAdapter {
   }
 }
 
-const removeFromQuery = (q, key) => {
-  if (q.query)
-    delete q.query[key];
-  return q;
-};
 const pushQueryArray = (q, key, value) => {
   if (!q.query[key])
     q.query[key] = value;
@@ -3154,7 +3154,6 @@ const setQueryObjectValue = (q, object, key, value) => {
 const getValueKey = Symbol("get");
 const _get = (q, returnType, arg) => {
   q.query.returnType = returnType;
-  q.query.take = true;
   if (typeof arg === "object" && isRaw(arg)) {
     addParserForRawExpression(q, getValueKey, arg);
     q.query.select = [arg];
@@ -3206,7 +3205,7 @@ class Then {
   }
 }
 const handleResult = async (q, result) => {
-  return parseResult(q, q.query.returnType, result);
+  return parseResult(q, q.query.returnType || "all", result);
 };
 const then = async (q, resolve, reject) => {
   let sql;
@@ -3233,7 +3232,7 @@ const then = async (q, resolve, reject) => {
     if (q.query.log) {
       logData = q.query.log.beforeQuery(sql);
     }
-    const queryResult = await q.query.adapter[queryMethodByReturnType[q.query.returnType]](sql);
+    const queryResult = await q.query.adapter[queryMethodByReturnType[q.query.returnType || "all"]](sql);
     if (q.query.log) {
       q.query.log.afterQuery(sql, logData);
       sql = void 0;
@@ -3254,7 +3253,7 @@ const then = async (q, resolve, reject) => {
     reject == null ? void 0 : reject(error);
   }
 };
-const parseResult = (q, returnType, result) => {
+const parseResult = (q, returnType = "all", result) => {
   var _a, _b;
   switch (returnType) {
     case "all": {
@@ -3361,7 +3360,7 @@ const addParserForSelectItem = (q, as, key, arg) => {
     const rel = arg(q);
     const parsers = getQueryParsers(rel);
     if (parsers) {
-      if (rel.query.take) {
+      if (queryTypeWithLimitOne[rel.query.returnType]) {
         addParserToQuery(q.query, key, (item) => parseRecord(parsers, item));
       } else {
         addParserToQuery(
@@ -3467,21 +3466,21 @@ class Select {
   }
 }
 
-var __defProp$5 = Object.defineProperty;
+var __defProp$6 = Object.defineProperty;
 var __defProps$1 = Object.defineProperties;
 var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$5 = (a, b) => {
+var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
+var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
+var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$6 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$5.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
+    if (__hasOwnProp$6.call(b, prop))
+      __defNormalProp$6(a, prop, b[prop]);
+  if (__getOwnPropSymbols$6)
+    for (var prop of __getOwnPropSymbols$6(b)) {
+      if (__propIsEnum$6.call(b, prop))
+        __defNormalProp$6(a, prop, b[prop]);
     }
   return a;
 };
@@ -3506,7 +3505,7 @@ const buildAggregateSelectItem = (functionName, arg, options) => {
   return {
     function: functionName,
     arg,
-    options: __spreadProps$1(__spreadValues$5({}, options), {
+    options: __spreadProps$1(__spreadValues$6({}, options), {
       order: (options == null ? void 0 : options.order) ? Array.isArray(options.order) ? options.order : [options.order] : void 0,
       filter: options == null ? void 0 : options.filter,
       filterOr: options == null ? void 0 : options.filterOr
@@ -3521,7 +3520,6 @@ const parseIntOrNullColumn = new IntegerColumn().parse(
 );
 const get = (q) => {
   q.query.returnType = "valueOrThrow";
-  removeFromQuery(q, "take");
   const select = q.query.select;
   if (select.length > 1) {
     select[0] = select[select.length - 1];
@@ -3844,8 +3842,8 @@ class Clear {
   _clear(...clears) {
     clears.forEach((clear) => {
       if (clear === "where") {
-        removeFromQuery(this, "and");
-        removeFromQuery(this, "or");
+        delete this.query.and;
+        delete this.query.or;
       } else if (clear === "counters") {
         if ("type" in this.query && this.query.type === "update") {
           this.query.updateData = this.query.updateData.filter((item) => {
@@ -3866,7 +3864,7 @@ class Clear {
           });
         }
       } else {
-        removeFromQuery(this, clear);
+        delete this.query[clear];
       }
     });
     return this;
@@ -4020,19 +4018,19 @@ class From {
   }
 }
 
-var __defProp$4 = Object.defineProperty;
-var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$4 = (a, b) => {
+var __defProp$5 = Object.defineProperty;
+var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
+var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
+var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$5 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$4.call(b, prop))
-      __defNormalProp$4(a, prop, b[prop]);
-  if (__getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(b)) {
-      if (__propIsEnum$4.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
+    if (__hasOwnProp$5.call(b, prop))
+      __defNormalProp$5(a, prop, b[prop]);
+  if (__getOwnPropSymbols$5)
+    for (var prop of __getOwnPropSymbols$5(b)) {
+      if (__propIsEnum$5.call(b, prop))
+        __defNormalProp$5(a, prop, b[prop]);
     }
   return a;
 };
@@ -4040,15 +4038,15 @@ const processHavingArg = (arg) => {
   if ("__model" in arg || isRaw(arg)) {
     return arg;
   } else {
-    const processed = __spreadValues$4({}, arg);
+    const processed = __spreadValues$5({}, arg);
     for (const fn in arg) {
       const data = arg[fn];
       if (typeof data === "object") {
-        processed[fn] = __spreadValues$4({}, data);
+        processed[fn] = __spreadValues$5({}, data);
         for (const column in data) {
           const value = data[column];
           if (typeof value === "object") {
-            processed[fn][column] = __spreadValues$4({}, value);
+            processed[fn][column] = __spreadValues$5({}, value);
             const options = value;
             if ("order" in options && options.order && !Array.isArray(options.order)) {
               processed[fn][column].order = [options.order];
@@ -4089,19 +4087,19 @@ class Having {
   }
 }
 
-var __defProp$3 = Object.defineProperty;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
+var __defProp$4 = Object.defineProperty;
+var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
+var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
+var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$4 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
+    if (__hasOwnProp$4.call(b, prop))
+      __defNormalProp$4(a, prop, b[prop]);
+  if (__getOwnPropSymbols$4)
+    for (var prop of __getOwnPropSymbols$4(b)) {
+      if (__propIsEnum$4.call(b, prop))
+        __defNormalProp$4(a, prop, b[prop]);
     }
   return a;
 };
@@ -4144,7 +4142,7 @@ const createInsertCtx = (q) => ({
   relations: q.relations
 });
 const getInsertSingleReturnType = (q) => {
-  const { select, returnType } = q.query;
+  const { select, returnType = "all" } = q.query;
   if (select) {
     return returnType === "all" ? "one" : returnType;
   } else {
@@ -4164,7 +4162,7 @@ const handleInsertOneData = (q, data, ctx) => {
   const columnsMap = {};
   const defaults = q.query.defaults;
   if (defaults) {
-    data = __spreadValues$3(__spreadValues$3({}, defaults), data);
+    data = __spreadValues$4(__spreadValues$4({}, defaults), data);
   }
   processInsertItem(data, 0, ctx, columns, columnsMap);
   const values = [columns.map((key) => data[key])];
@@ -4175,7 +4173,7 @@ const handleInsertManyData = (q, data, ctx) => {
   const columnsMap = {};
   const defaults = q.query.defaults;
   if (defaults) {
-    data = data.map((item) => __spreadValues$3(__spreadValues$3({}, defaults), item));
+    data = data.map((item) => __spreadValues$4(__spreadValues$4({}, defaults), item));
   }
   data.forEach((item, i) => {
     processInsertItem(item, i, ctx, columns, columnsMap);
@@ -4673,10 +4671,9 @@ class Json {
     const q = this._wrap(this.__model.clone());
     q._getOptional(
       raw(
-        this.query.take ? `row_to_json("t".*)` : `COALESCE(json_agg(row_to_json("t".*)), '[]')`
+        queryTypeWithLimitOne[this.query.returnType] ? `row_to_json("t".*)` : `COALESCE(json_agg(row_to_json("t".*)), '[]')`
       )
     );
-    delete q.query.take;
     return q;
   }
   jsonSet(column, path, value, options) {
@@ -4827,6 +4824,60 @@ class QueryLog {
   }
 }
 
+var __defProp$3 = Object.defineProperty;
+var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
+var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
+var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$3 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$3.call(b, prop))
+      __defNormalProp$3(a, prop, b[prop]);
+  if (__getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(b)) {
+      if (__propIsEnum$3.call(b, prop))
+        __defNormalProp$3(a, prop, b[prop]);
+    }
+  return a;
+};
+const mergableObjects = {
+  withShapes: true,
+  parsers: true,
+  defaults: true,
+  joinedParsers: true
+};
+class MergeQueryMethods {
+  merge(q) {
+    return this.clone()._merge(q);
+  }
+  _merge(q) {
+    const a = this.query;
+    const b = q.query;
+    for (const key in b) {
+      const value = b[key];
+      switch (typeof value) {
+        case "boolean":
+        case "string":
+        case "number":
+          a[key] = value;
+          break;
+        case "object":
+          if (Array.isArray(value)) {
+            a[key] = a[key] ? [...a[key], ...value] : value;
+          } else if (mergableObjects[key]) {
+            a[key] = a[key] ? __spreadValues$3(__spreadValues$3({}, a[key]), value) : value;
+          } else {
+            a[key] = value;
+          }
+          break;
+      }
+    }
+    if (b.returnType)
+      a.returnType = b.returnType;
+    return this;
+  }
+}
+
 var __defProp$2 = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -4985,7 +5036,7 @@ class Update {
     return q._update(...args);
   }
   _update(...args) {
-    var _a, _b;
+    var _a, _b, _c;
     const { query } = this;
     const data = args[0];
     const set = __spreadValues$1({}, data);
@@ -4993,7 +5044,7 @@ class Update {
     const relations = this.relations;
     const prependRelations = {};
     const appendRelations = {};
-    const originalReturnType = query.returnType;
+    const originalReturnType = query.returnType || "all";
     for (const key in data) {
       if (relations[key]) {
         delete set[key];
@@ -5027,12 +5078,14 @@ class Update {
     if ((state == null ? void 0 : state.updateLater) || appendRelationKeys.length && originalReturnType !== "all") {
       query.returnType = "all";
       if (state == null ? void 0 : state.updateLater) {
-        this.schema.primaryKeys.forEach((key) => {
-          var _a2, _b2;
-          if (!((_a2 = query.select) == null ? void 0 : _a2.includes("*")) && !((_b2 = query.select) == null ? void 0 : _b2.includes(key))) {
-            this._select(key);
-          }
-        });
+        if (!((_c = query.select) == null ? void 0 : _c.includes("*"))) {
+          this.primaryKeys.forEach((key) => {
+            var _a2;
+            if (!((_a2 = query.select) == null ? void 0 : _a2.includes(key))) {
+              this._select(key);
+            }
+          });
+        }
       }
       const { handleResult } = query;
       query.handleResult = async (q, queryResult) => {
@@ -5040,7 +5093,7 @@ class Update {
         if (state == null ? void 0 : state.updateLater) {
           await Promise.all(state.updateLaterPromises);
           const t = this.__model.clone().transacting(q);
-          const keys = this.schema.primaryKeys;
+          const keys = this.primaryKeys;
           t._whereIn(
             keys,
             resultOfTypeAll.map((item) => keys.map((key) => item[key]))
@@ -5066,6 +5119,9 @@ class Update {
           return (q, result) => {
             var _a2, _b2;
             const all = resultOfTypeAll || result;
+            if (q.query.returnType !== originalReturnType) {
+              q.query.returnType = originalReturnType;
+            }
             return (_b2 = (_a2 = relations[relationName]).nestedUpdate) == null ? void 0 : _b2.call(_a2, q, all, appendRelations[relationName]);
           };
         })
@@ -5235,7 +5291,6 @@ class QueryMethods {
   }
   _all() {
     this.query.returnType = "all";
-    removeFromQuery(this, "take");
     return this;
   }
   take() {
@@ -5243,7 +5298,6 @@ class QueryMethods {
   }
   _take() {
     this.query.returnType = "oneOrThrow";
-    this.query.take = true;
     return this;
   }
   takeOptional() {
@@ -5251,7 +5305,6 @@ class QueryMethods {
   }
   _takeOptional() {
     this.query.returnType = "one";
-    this.query.take = true;
     return this;
   }
   rows() {
@@ -5259,7 +5312,6 @@ class QueryMethods {
   }
   _rows() {
     this.query.returnType = "rows";
-    removeFromQuery(this, "take");
     return this;
   }
   pluck(select) {
@@ -5267,7 +5319,6 @@ class QueryMethods {
   }
   _pluck(select) {
     this.query.returnType = "pluck";
-    removeFromQuery(this, "take");
     this.query.select = [select];
     addParserForSelectItem(this, this.query.as || this.table, "pluck", select);
     return this;
@@ -5277,7 +5328,6 @@ class QueryMethods {
   }
   _exec() {
     this.query.returnType = "void";
-    removeFromQuery(this, "take");
     return this;
   }
   clone() {
@@ -5294,22 +5344,20 @@ class QueryMethods {
   _distinct(...columns) {
     return pushQueryArray(this, "distinct", columns);
   }
-  find(...args) {
-    return this.clone()._find(...args);
+  find(value) {
+    return this.clone()._find(value);
   }
-  _find(...args) {
-    const conditions = {};
-    this.schema.primaryKeys.forEach((key, i) => {
-      conditions[key] = args[i];
-    });
-    return this._where(conditions)._take();
+  _find(value) {
+    return this._where({
+      [this.singlePrimaryKey]: value
+    })._take();
   }
-  findOptional(...args) {
-    return this.clone()._findOptional(...args);
+  findOptional(value) {
+    return this.clone()._findOptional(value);
   }
-  _findOptional(...args) {
+  _findOptional(value) {
     return this._find(
-      ...args
+      value
     ).takeOptional();
   }
   findBy(...args) {
@@ -5386,7 +5434,6 @@ class QueryMethods {
     const q = this._getOptional(raw("true"));
     q.query.notFoundDefault = false;
     q.query.coalesceValue = false;
-    delete q.query.take;
     return q;
   }
   truncate(options) {
@@ -5426,7 +5473,8 @@ applyMixins(QueryMethods, [
   QueryLog,
   QueryCallbacks,
   QueryUpsert,
-  QueryGet
+  QueryGet,
+  MergeQueryMethods
 ]);
 
 var __defProp = Object.defineProperty;
@@ -5470,14 +5518,18 @@ class Db {
     this.query = {
       adapter,
       handleResult,
-      returnType: "all",
       logger,
       log: logParamToLogObject(logger, options.log)
     };
     if (options == null ? void 0 : options.schema) {
       this.query.schema = options.schema;
     }
-    this.schema = new TableSchema(shape);
+    this.primaryKeys = Object.keys(shape).filter(
+      (key) => shape[key].isPrimaryKey
+    );
+    if (this.primaryKeys.length === 1) {
+      this.singlePrimaryKey = this.primaryKeys[0];
+    }
     const columns = Object.keys(
       shape
     );
@@ -5518,7 +5570,7 @@ const createDb = (_a) => {
   var _b = _a, {
     log,
     logger,
-    columnTypes: ct = columnTypes
+    columnTypes: ct
   } = _b, options = __objRest(_b, [
     "log",
     "logger",
@@ -5553,8 +5605,6 @@ const createDb = (_a) => {
   return db;
 };
 
-const defaultsKey = Symbol("defaults");
-
 const relationQueryKey = Symbol("relationQuery");
 const isRequiredRelationKey = Symbol("isRequiredRelation");
 
@@ -5604,6 +5654,7 @@ exports.LineColumn = LineColumn;
 exports.LsegColumn = LsegColumn;
 exports.MacAddr8Column = MacAddr8Column;
 exports.MacAddrColumn = MacAddrColumn;
+exports.MergeQueryMethods = MergeQueryMethods;
 exports.MoneyColumn = MoneyColumn;
 exports.MoreThanOneRowError = MoreThanOneRowError;
 exports.NotFoundError = NotFoundError;
@@ -5628,7 +5679,6 @@ exports.Select = Select;
 exports.SerialColumn = SerialColumn;
 exports.SmallIntColumn = SmallIntColumn;
 exports.SmallSerialColumn = SmallSerialColumn;
-exports.TableSchema = TableSchema;
 exports.TextBaseColumn = TextBaseColumn;
 exports.TextColumn = TextColumn;
 exports.Then = Then;
@@ -5663,6 +5713,7 @@ exports.aggregate1FunctionNames = aggregate1FunctionNames;
 exports.applyMixins = applyMixins;
 exports.array = array;
 exports.arrayToEnum = arrayToEnum;
+exports.checkIfASimpleQuery = checkIfASimpleQuery;
 exports.columnTypes = columnTypes;
 exports.columnUtils = utils;
 exports.constructType = constructType;
@@ -5712,13 +5763,12 @@ exports.pushQueryArray = pushQueryArray;
 exports.pushQueryOn = pushQueryOn;
 exports.pushQueryOrOn = pushQueryOrOn;
 exports.pushQueryValue = pushQueryValue;
-exports.queryKeysOfNotSimpleQuery = queryKeysOfNotSimpleQuery;
 exports.queryMethodByReturnType = queryMethodByReturnType;
+exports.queryTypeWithLimitOne = queryTypeWithLimitOne;
 exports.quote = quote;
 exports.raw = raw;
 exports.record = record;
 exports.relationQueryKey = relationQueryKey;
-exports.removeFromQuery = removeFromQuery;
 exports.required = required;
 exports.resetTableData = resetTableData;
 exports.scalarTypes = scalarTypes;