orchid-orm 1.37.5 → 1.37.7

package/dist/index.d.ts

@@ -710,4 +710,4 @@ declare const createRepo: <T extends Query, Methods extends MethodsBase<T>>(tabl
     shape: T['shape'];
 }>(q: Q) => Query & Q & MapMethods<T, Methods>) & T, Methods>;
 
-export { BaseTableClass, BaseTableInstance, Insertable, MapMethods, MapQueryMethods, MethodsBase, ORMTableInput, ORMTableInputToQueryBuilder, OrchidORM, Queryable, Repo, ScopeFn, Selectable, SetColumnsResult, Table, TableClass, TableClasses, TableInfo, TableToDb, Updatable, createBaseTable, createRepo, orchidORM };
+export { type BaseTableClass, type BaseTableInstance, type Insertable, type MapMethods, type MapQueryMethods, type MethodsBase, type ORMTableInput, type ORMTableInputToQueryBuilder, type OrchidORM, type Queryable, type Repo, type ScopeFn, type Selectable, type SetColumnsResult, type Table, type TableClass, type TableClasses, type TableInfo, type TableToDb, type Updatable, createBaseTable, createRepo, orchidORM };

package/dist/index.js

@@ -59,33 +59,28 @@ function createBaseTable({
       return this._pkeySchema === void 0 ? this._pkeySchema = schemaConfig.pkeySchema.call(this) : this._pkeySchema;
     }
     static getFilePath() {
-      if (filePath)
-        return filePath;
+      if (filePath) return filePath;
       if (typeof filePathOrStack === "string") {
         return filePath = filePathOrStack;
       }
       filePath = orchidCore.getCallerFilePath(filePathOrStack);
-      if (filePath)
-        return filePath;
+      if (filePath) return filePath;
       throw new Error(
         `Failed to determine file path of a base table. Please set the \`filePath\` option of \`createBaseTable\` manually.`
       );
     }
     static instance() {
-      var _a2;
-      return (_a2 = this._instance) != null ? _a2 : this._instance = new this();
+      return this._instance ?? (this._instance = new this());
     }
     clone() {
       return this;
     }
     getFilePath() {
-      if (this.filePath)
-        return this.filePath;
+      if (this.filePath) return this.filePath;
       if (typeof filePathOrStack === "string")
         return this.filePath = filePathOrStack;
       const filePath2 = orchidCore.getCallerFilePath(filePathOrStack);
-      if (filePath2)
-        return this.filePath = filePath2;
+      if (filePath2) return this.filePath = filePath2;
       throw new Error(
         `Failed to determine file path for table ${this.constructor.name}. Please set \`filePath\` property manually`
       );
@@ -97,8 +92,7 @@ function createBaseTable({
       if (this.snakeCase) {
         for (const key in shape) {
           const column = shape[key];
-          if (column.data.name)
-            continue;
+          if (column.data.name) continue;
           const snakeName = orchidCore.toSnakeCase(key);
           if (snakeName !== key) {
             column.data.name = snakeName;
@@ -152,20 +146,17 @@ function createBaseTable({
 }
 
 const getThroughRelation = (table, through) => {
-  var _a;
-  return (_a = table.relations[through]) == null ? void 0 : _a.relationConfig;
+  return table.relations[through]?.relationConfig;
 };
 const getSourceRelation = (throughRelation, source) => {
-  var _a;
-  return (_a = throughRelation.query.relations[source]) == null ? void 0 : _a.relationConfig;
+  return throughRelation.query.relations[source]?.relationConfig;
 };
 const hasRelationHandleCreate = (q, ctx, item, rowIndex, key, primaryKeys, nestedInsert) => {
   const value = item[key];
   if ((!value.create || Array.isArray(value.create) && value.create.length === 0) && (!value.connect || Array.isArray(value.connect) && value.connect.length === 0) && (!value.connectOrCreate || Array.isArray(value.connectOrCreate) && value.connectOrCreate.length === 0))
     return;
   const store = ctx;
-  if (!store.hasRelation)
-    store.hasRelation = {};
+  if (!store.hasRelation) store.hasRelation = {};
   const values = [rowIndex, value];
   if (store.hasRelation[key]) {
     store.hasRelation[key].push(values);
@@ -283,8 +274,7 @@ class BelongsToVirtualColumn extends pqb.VirtualColumn {
       return index;
     });
     const store = ctx;
-    if (!store.belongsTo)
-      store.belongsTo = {};
+    if (!store.belongsTo) store.belongsTo = {};
     const values = [rowIndex, columnIndexes, item[key]];
     if (store.belongsTo[key]) {
       store.belongsTo[key].push(values);
@@ -389,8 +379,7 @@ const nestedInsert$3 = ({ query, primaryKeys }) => {
     items.length = 0;
     for (const item of data) {
       if (item.connectOrCreate) {
-        if (!connectOrCreated[connectOrCreatedI++])
-          items.push(item);
+        if (!connectOrCreated[connectOrCreatedI++]) items.push(item);
       } else if (item.create) {
         items.push(item);
       }
@@ -432,7 +421,6 @@ const nestedInsert$3 = ({ query, primaryKeys }) => {
 };
 const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
   return (q, update, params, state) => {
-    var _a;
     if (params.upsert && pqb.isQueryReturnsAll(q)) {
       throw new Error("`upsert` option is not allowed in a batch update");
     }
@@ -450,8 +438,8 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
           if (primaryKey in params.set) {
             update[foreignKeys[i]] = params.set[primaryKey];
           } else {
-            (loadPrimaryKeys != null ? loadPrimaryKeys : loadPrimaryKeys = []).push(primaryKey);
-            (loadForeignKeys != null ? loadForeignKeys : loadForeignKeys = []).push(foreignKeys[i]);
+            (loadPrimaryKeys ?? (loadPrimaryKeys = [])).push(primaryKey);
+            (loadForeignKeys ?? (loadForeignKeys = [])).push(foreignKeys[i]);
           }
         }
         if (loadPrimaryKeys) {
@@ -487,7 +475,7 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
       selectIfNotSelected(q, foreignKeys);
     }
     if (upsert) {
-      ((_a = state.queries) != null ? _a : state.queries = []).push(async (queryResult) => {
+      (state.queries ?? (state.queries = [])).push(async (queryResult) => {
         const row = queryResult.rows[0];
         let obj = {};
         for (let i = 0; i < len; i++) {
@@ -534,15 +522,13 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
                 row = void 0;
                 break;
               } else {
-                (row != null ? row : row = []).push(id);
+                (row ?? (row = [])).push(id);
               }
             }
-            if (row)
-              ids.push(row);
+            if (row) ids.push(row);
           }
         }
-        if (!(ids == null ? void 0 : ids.length))
-          return;
+        if (!ids?.length) return;
         const t = query.whereIn(
           primaryKeys,
           ids
@@ -557,22 +543,6 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
   };
 };
 
-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$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;
-};
 class HasOneVirtualColumn extends pqb.VirtualColumn {
   constructor(schema, key, state) {
     super(schema);
@@ -744,7 +714,9 @@ const nestedInsert$2 = ({ query, primaryKeys, foreignKeys }) => {
     if (items.length) {
       for (let i = 0, len = items.length; i < len; i++) {
         const [selfData, item] = items[i];
-        const data2 = __spreadValues$4({}, "create" in item ? item.create : item.connectOrCreate.create);
+        const data2 = {
+          ..."create" in item ? item.create : item.connectOrCreate.create
+        };
         for (let i2 = 0; i2 < primaryKeys.length; i2++) {
           data2[foreignKeys[i2]] = selfData[primaryKeys[i2]];
         }
@@ -773,7 +745,7 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys }) => {
       await pqb._queryUpdate(currentRelationsQuery, setNulls);
       const record = data[0];
       if (params.create) {
-        const obj = __spreadValues$4({}, params.create);
+        const obj = { ...params.create };
         for (let i = 0; i < len; i++) {
           obj[foreignKeys[i]] = record[primaryKeys[i]];
         }
@@ -807,7 +779,7 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys }) => {
             if (!updatedIds.some(
               (updated) => updated.every((value, i) => value === ids2[i])
             )) {
-              const obj = __spreadValues$4({}, data2);
+              const obj = { ...data2 };
               for (let i = 0; i < len; i++) {
                 obj[foreignKeys[i]] = ids2[i];
               }
@@ -821,22 +793,6 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys }) => {
   };
 };
 
-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;
-};
 class HasManyVirtualColumn extends pqb.VirtualColumn {
   constructor(schema, key, state) {
     super(schema);
@@ -1056,13 +1012,19 @@ const nestedInsert$1 = ({ query, primaryKeys, foreignKeys }) => {
         }
         if (create) {
           for (const item of create) {
-            records.push(__spreadValues$3(__spreadValues$3({}, item), obj));
+            records.push({
+              ...item,
+              ...obj
+            });
           }
         }
         if (connectOrCreate) {
           for (const item of connectOrCreate) {
             if (connected[connectedI++] === 0) {
-              records.push(__spreadValues$3(__spreadValues$3({}, item.create), obj));
+              records.push({
+                ...item.create,
+                ...obj
+              });
             }
           }
         }
@@ -1074,7 +1036,6 @@ const nestedInsert$1 = ({ query, primaryKeys, foreignKeys }) => {
 const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
   const len = primaryKeys.length;
   return async (_, data, params) => {
-    var _a;
     const t = query.clone();
     if (params.create) {
       const obj = {};
@@ -1082,7 +1043,10 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
         obj[foreignKeys[i]] = data[0][primaryKeys[i]];
       }
       await t.insertMany(
-        params.create.map((create) => __spreadValues$3(__spreadValues$3({}, create), obj))
+        params.create.map((create) => ({
+          ...create,
+          ...obj
+        }))
       );
       delete t.q[pqb.toSQLCacheKey];
     }
@@ -1122,7 +1086,7 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
       const q = getWhereForNestedUpdate(
         t,
         data,
-        params.delete || ((_a = params.update) == null ? void 0 : _a.where),
+        params.delete || params.update?.where,
         primaryKeys,
         foreignKeys
       );
@@ -1135,25 +1099,6 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
   };
 };
 
-var __defProp$2 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
-var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
-var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$2 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$2.call(b, prop))
-      __defNormalProp$2(a, prop, b[prop]);
-  if (__getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(b)) {
-      if (__propIsEnum$2.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 class HasAndBelongsToManyVirtualColumn extends pqb.VirtualColumn {
   constructor(joinTable, schema, key, state) {
     super(schema);
@@ -1185,10 +1130,9 @@ class HasAndBelongsToManyVirtualColumn extends pqb.VirtualColumn {
   }
 }
 const removeColumnName = (column) => {
-  if (!column.data.name)
-    return column;
+  if (!column.data.name) return column;
   const cloned = Object.create(column);
-  cloned.data = __spreadProps$1(__spreadValues$2({}, column.data), { name: void 0 });
+  cloned.data = { ...column.data, name: void 0 };
   return cloned;
 };
 const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query) => {
@@ -1200,13 +1144,11 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
   const throughPrimaryKeys = options.through.references;
   const { snakeCase } = table.internal;
   const foreignKeysFull = foreignKeys.map((key, i) => {
-    if (snakeCase)
-      key = foreignKeys[i] = orchidCore.toSnakeCase(key);
+    if (snakeCase) key = foreignKeys[i] = orchidCore.toSnakeCase(key);
     return `${joinTable}.${key}`;
   });
   const throughForeignKeysFull = throughForeignKeys.map((key, i) => {
-    if (snakeCase)
-      key = throughForeignKeys[i] = orchidCore.toSnakeCase(key);
+    if (snakeCase) key = throughForeignKeys[i] = orchidCore.toSnakeCase(key);
     return `${joinTable}.${key}`;
   });
   const foreignTable = pqb.getQueryAs(query);
@@ -1230,9 +1172,10 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
     );
   }
   baseQuery.shape = shape;
-  baseQuery.q = __spreadProps$1(__spreadValues$2({}, baseQuery.q), {
+  baseQuery.q = {
+    ...baseQuery.q,
     shape: baseQuery.shape
-  });
+  };
   const subQuery = Object.create(baseQuery);
   const state = {
     relatedTableQuery: query,
@@ -1274,9 +1217,10 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
       baseQuery2,
       pqb.getQueryAs(baseQuery2),
       foreignAs,
-      __spreadProps$1(__spreadValues$2({}, baseQuery2.q.joinedShapes), {
+      {
+        ...baseQuery2.q.joinedShapes,
         [foreignAs]: joiningQuery.q.shape
-      })
+      }
     );
   };
   return {
@@ -1309,9 +1253,10 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
         joiningQuery,
         pqb.getQueryAs(baseQuery2),
         pqb.getQueryAs(joiningQuery),
-        __spreadProps$1(__spreadValues$2({}, joiningQuery.q.joinedShapes), {
+        {
+          ...joiningQuery.q.joinedShapes,
           [baseQuery2.q.as || baseQuery2.table]: baseQuery2.q.shape
-        })
+        }
       )
     ),
     reverseJoin,
@@ -1382,7 +1327,7 @@ const insertToJoinTable = (state, joinTableTransaction, data, idsRows) => {
       obj[state.foreignKeys[i]] = item[state.primaryKeys[i]];
     }
     for (const ids of idsRows) {
-      const record = __spreadValues$2({}, obj);
+      const record = { ...obj };
       for (let i = 0; i < throughLen; i++) {
         record[state.throughForeignKeys[i]] = ids[i];
       }
@@ -1525,7 +1470,7 @@ const nestedInsert = ({
         obj[foreignKeys[i]] = selfData[primaryKeys[i]];
       }
       for (const relationData of relationKeys) {
-        const record = __spreadValues$2({}, obj);
+        const record = { ...obj };
         for (let i = 0; i < throughLen; i++) {
           record[throughForeignKeys[i]] = relationData[throughPrimaryKeys[i]];
         }
@@ -1551,7 +1496,7 @@ const nestedUpdate = (state) => {
           obj[state.foreignKeys[i]] = item[state.primaryKeys[i]];
         }
         for (const ids of idsRows) {
-          const record = __spreadValues$2({}, obj);
+          const record = { ...obj };
           for (let i = 0; i < throughLen; i++) {
             record[state.throughForeignKeys[i]] = ids[i];
           }
@@ -1625,7 +1570,6 @@ const nestedUpdate = (state) => {
 };
 
 const applyRelations = (qb, tables, result) => {
-  var _a;
   const tableEntries = Object.entries(tables);
   const delayedRelations = /* @__PURE__ */ new Map();
   for (const name in tables) {
@@ -1683,13 +1627,12 @@ const applyRelations = (qb, tables, result) => {
     for (const key in value) {
       for (const item of value[key]) {
         const { relation } = item;
-        if (item.dbTable.relations[item.relationName])
-          continue;
+        if (item.dbTable.relations[item.relationName]) continue;
         const as = item.dbTable.definedAs;
         let message = `Cannot define a \`${item.relationName}\` relation on \`${as}\``;
         const table = result[as];
         const { through, source } = relation.options;
-        const throughRel = (_a = table.relations[through]) == null ? void 0 : _a.relationConfig;
+        const throughRel = table.relations[through]?.relationConfig;
         if (through && !throughRel) {
           message += `: cannot find \`${through}\` relation required by the \`through\` option`;
         } else if (source && throughRel && !throughRel.table.relations[source]) {
@@ -1713,7 +1656,6 @@ const delayRelation = (delayedRelations, table, relationName, data) => {
   }
 };
 const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, delayedRelations) => {
-  var _a;
   const baseQuery = Object.create(otherDbTable);
   baseQuery.baseQuery = baseQuery;
   const query = (relation.options.scope ? relation.options.scope(baseQuery) : baseQuery).as(relationName);
@@ -1774,9 +1716,8 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
   };
   dbTable.relations[relationName] = query;
   const tableRelations = delayedRelations.get(dbTable);
-  if (!tableRelations)
-    return;
-  (_a = tableRelations[relationName]) == null ? void 0 : _a.forEach((data2) => {
+  if (!tableRelations) return;
+  tableRelations[relationName]?.forEach((data2) => {
     applyRelation(qb, data2, delayedRelations);
   });
 };
@@ -1794,50 +1735,13 @@ function isInTransaction() {
   return this.$queryBuilder.isInTransaction();
 }
 
-var __defProp$1 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$1 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop))
-      __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop))
-        __defNormalProp$1(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp$1.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$1.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-const orchidORM = (_a, tables) => {
-  var _b = _a, {
-    log,
-    logger,
-    autoPreparedStatements,
-    noPrimaryKey = "error"
-  } = _b, options = __objRest(_b, [
-    "log",
-    "logger",
-    "autoPreparedStatements",
-    "noPrimaryKey"
-  ]);
-  var _a2;
+const orchidORM = ({
+  log,
+  logger,
+  autoPreparedStatements,
+  noPrimaryKey = "error",
+  ...options
+}, tables) => {
   const commonOptions = {
     log,
     logger,
@@ -1884,7 +1788,8 @@ const orchidORM = (_a, tables) => {
     const tableClass = tables[key];
     const table = tableClass.instance();
     tableInstances[key] = table;
-    const options2 = __spreadProps(__spreadValues$1({}, commonOptions), {
+    const options2 = {
+      ...commonOptions,
       schema: table.schema,
       language: table.language,
       scopes: table.scopes,
@@ -1894,7 +1799,7 @@ const orchidORM = (_a, tables) => {
       noPrimaryKey: table.noPrimaryKey ? "ignore" : void 0,
       computed: table.computed,
       nowSQL: tableClass.nowSQL
-    });
+    };
     const dbTable = new pqb.Db(
       adapter,
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1904,7 +1809,7 @@ const orchidORM = (_a, tables) => {
       table.types,
       transactionStorage,
       options2,
-      (_a2 = table.constructor.prototype.tableData) != null ? _a2 : orchidCore.emptyObject
+      table.constructor.prototype.tableData ?? orchidCore.emptyObject
     );
     dbTable.definedAs = key;
     dbTable.db = result;
@@ -1923,24 +1828,13 @@ const orchidORM = (_a, tables) => {
   return result;
 };
 
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 const createRepo = (table, methods) => {
-  const queryMethods = __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, methods.queryMethods), methods.queryOneMethods), methods.queryWithWhereMethods), methods.queryOneWithWhereMethods);
+  const queryMethods = {
+    ...methods.queryMethods,
+    ...methods.queryOneMethods,
+    ...methods.queryWithWhereMethods,
+    ...methods.queryOneWithWhereMethods
+  };
   const plainMethods = methods.methods;
   const repo = (q2) => {
     const proto = Object.create(q2.baseQuery);