orchid-orm 1.20.0 → 1.21.0

package/dist/index.js

@@ -133,7 +133,7 @@ const getThroughRelation = (table, through) => {
 };
 const getSourceRelation = (throughRelation, source) => {
   var _a;
-  return (_a = throughRelation.table.relations[source]) == null ? void 0 : _a.relationConfig;
+  return (_a = throughRelation.query.relations[source]) == null ? void 0 : _a.relationConfig;
 };
 const hasRelationHandleCreate = (q, ctx, item, rowIndex, key, primaryKeys, nestedInsert) => {
   const value = item[key];
@@ -150,7 +150,8 @@ const hasRelationHandleCreate = (q, ctx, item, rowIndex, key, primaryKeys, neste
   q.q.wrapInTransaction = true;
   const relationData = [values];
   store.hasRelation[key] = relationData;
-  q._afterCreate(
+  pqb._queryHookAfterCreate(
+    q,
     primaryKeys,
     (rows, q2) => nestedInsert(
       q2,
@@ -167,7 +168,7 @@ const hasRelationHandleUpdate = (q, set, key, primaryKeys, nestedUpdate) => {
     return;
   selectIfNotSelected(q, primaryKeys);
   q.q.wrapInTransaction = true;
-  q._afterUpdate(q.primaryKeys, (rows, q2) => {
+  pqb._queryHookAfterUpdate(q, q.primaryKeys, (rows, q2) => {
     return nestedUpdate(
       q2,
       rows,
@@ -359,7 +360,7 @@ const nestedInsert$3 = ({ query, primaryKeys }) => {
       for (let i = 0, len = items.length; i < len; i++) {
         items[i] = "create" in items[i] ? items[i].create : items[i].connectOrCreate.create;
       }
-      created = await t.select(...primaryKeys)._createMany(items);
+      created = await pqb._queryCreateMany(t.select(...primaryKeys), items);
     } else {
       created = orchidCore.emptyArray;
     }
@@ -393,7 +394,7 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
       throw new Error("`upsert` option is not allowed in a batch update");
     }
     let idsForDelete;
-    q._beforeUpdate(async (q2) => {
+    pqb._queryHookBeforeUpdate(q, async (q2) => {
       if (params.disconnect) {
         for (const key of foreignKeys) {
           update[key] = null;
@@ -411,7 +412,9 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
           }
         }
         if (loadPrimaryKeys) {
-          const record = await query.select(...loadPrimaryKeys)._findBy(params.set);
+          const record = await pqb._queryFindBy(query.select(...loadPrimaryKeys), [
+            params.set
+          ]);
           for (let i = 0, len2 = loadPrimaryKeys.length; i < len2; i++) {
             update[loadForeignKeys[i]] = record[loadPrimaryKeys[i]];
           }
@@ -419,7 +422,7 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
       } else if (params.create) {
         const q3 = query.clone();
         q3.q.select = primaryKeys;
-        const record = await q3._create(params.create);
+        const record = await pqb._queryCreate(q3, params.create);
         for (let i = 0; i < len; i++) {
           update[foreignKeys[i]] = record[primaryKeys[i]];
         }
@@ -427,7 +430,7 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
         const selectQuery = q2.clone();
         selectQuery.q.type = void 0;
         selectQuery.q.distinct = orchidCore.emptyArray;
-        idsForDelete = await selectQuery._rows();
+        idsForDelete = await pqb._queryRows(selectQuery);
         for (const foreignKey of foreignKeys) {
           update[foreignKey] = null;
         }
@@ -451,17 +454,20 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
           obj[primaryKeys[i]] = id;
         }
         if (obj) {
-          await query.findBy(obj)._update(upsert.update);
+          await pqb._queryUpdate(
+            query.findBy(obj),
+            upsert.update
+          );
         } else {
           const data = typeof upsert.create === "function" ? upsert.create() : upsert.create;
-          const result = await query.select(...primaryKeys)._create(data);
+          const result = await pqb._queryCreate(query.select(...primaryKeys), data);
           for (let i = 0; i < len; i++) {
             ((_a2 = state.updateData) != null ? _a2 : state.updateData = {})[foreignKeys[i]] = result[primaryKeys[i]];
           }
         }
       });
     } else if (params.delete || params.update) {
-      q._afterUpdate([], async (data) => {
+      pqb._queryHookAfterUpdate(q, [], async (data) => {
         let ids;
         if (params.delete) {
           ids = idsForDelete;
@@ -489,11 +495,9 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
           ids
         );
         if (params.delete) {
-          await t._delete();
+          await pqb._queryDelete(t);
         } else {
-          await t._update(
-            params.update
-          );
+          await pqb._queryUpdate(t, params.update);
         }
       });
     }
@@ -613,7 +617,7 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
       for (let i = 0; i < len; i++) {
         values[foreignKeys[i]] = params[primaryKeys[i]];
       }
-      return query.where(values)._defaults(values);
+      return pqb._queryDefaults(query.where(values), values);
     },
     virtualColumn: new HasOneVirtualColumn(
       pqb.defaultSchemaConfig,
@@ -653,9 +657,15 @@ const nestedInsert$2 = ({ query, primaryKeys, foreignKeys }) => {
         for (let i2 = 0; i2 < len; i2++) {
           data2[foreignKeys[i2]] = selfData[primaryKeys[i2]];
         }
-        items[i] = "connect" in item ? t.where(item.connect)._updateOrThrow(data2) : t.where(
-          item.connectOrCreate.where
-        )._update(data2);
+        items[i] = "connect" in item ? pqb._queryUpdateOrThrow(
+          t.where(item.connect),
+          data2
+        ) : pqb._queryUpdate(
+          t.where(
+            item.connectOrCreate.where
+          ),
+          data2
+        );
       }
       connected = await Promise.all(items);
     } else {
@@ -701,7 +711,8 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys }) => {
       ids
     );
     if (params.create || params.disconnect || params.set) {
-      await currentRelationsQuery._update(
+      await pqb._queryUpdate(
+        currentRelationsQuery,
         setNulls
       );
       const record = data[0];
@@ -717,16 +728,25 @@ const nestedUpdate$2 = ({ query, primaryKeys, foreignKeys }) => {
         for (let i = 0; i < len; i++) {
           obj[foreignKeys[i]] = record[primaryKeys[i]];
         }
-        await t._where(params.set)._update(obj);
+        await pqb._queryUpdate(
+          pqb._queryWhere(t, [params.set]),
+          obj
+        );
       }
     } else if (params.update) {
-      await currentRelationsQuery._update(params.update);
+      await pqb._queryUpdate(
+        currentRelationsQuery,
+        params.update
+      );
     } else if (params.delete) {
-      await currentRelationsQuery._delete();
+      await pqb._queryDelete(currentRelationsQuery);
     } else if (params.upsert) {
       const { update, create } = params.upsert;
       currentRelationsQuery.q.select = foreignKeys;
-      const updatedIds = await currentRelationsQuery._rows()._update(update);
+      const updatedIds = await pqb._queryUpdate(
+        pqb._queryRows(currentRelationsQuery),
+        update
+      );
       if (updatedIds.length < ids.length) {
         const data2 = typeof create === "function" ? create() : create;
         await t.createMany(
@@ -865,7 +885,7 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
       for (let i = 0; i < len; i++) {
         values[foreignKeys[i]] = params[primaryKeys[i]];
       }
-      return query.where(values)._defaults(values);
+      return pqb._queryDefaults(query.where(values), values);
     },
     virtualColumn: new HasManyVirtualColumn(
       pqb.defaultSchemaConfig,
@@ -914,7 +934,10 @@ const nestedInsert$1 = ({ query, primaryKeys, foreignKeys }) => {
         for (let i2 = 0; i2 < len2; i2++) {
           obj[foreignKeys[i2]] = selfData[primaryKeys[i2]];
         }
-        items[i] = t.orWhere(...connect)._updateOrThrow(obj);
+        items[i] = pqb._queryUpdateOrThrow(
+          t.orWhere(...connect),
+          obj
+        );
       }
       await Promise.all(items);
     }
@@ -935,7 +958,10 @@ const nestedInsert$1 = ({ query, primaryKeys, foreignKeys }) => {
             obj[foreignKeys[i2]] = selfData[primaryKeys[i2]];
           }
           queries.push(
-            t.where(item.where)._update(obj)
+            pqb._queryUpdate(
+              t.where(item.where),
+              obj
+            )
           );
         }
       }
@@ -980,7 +1006,7 @@ const nestedInsert$1 = ({ query, primaryKeys, foreignKeys }) => {
           }
         }
       }
-      await t._createMany(records);
+      await pqb._queryCreateMany(t, records);
     }
   };
 };
@@ -1004,24 +1030,30 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
       for (const foreignKey of foreignKeys) {
         obj[foreignKey] = null;
       }
-      await getWhereForNestedUpdate(
-        t,
-        data,
-        params.disconnect,
-        primaryKeys,
-        foreignKeys
-      )._update(obj);
+      await pqb._queryUpdate(
+        getWhereForNestedUpdate(
+          t,
+          data,
+          params.disconnect,
+          primaryKeys,
+          foreignKeys
+        ),
+        obj
+      );
       if (params.set) {
         delete t.q[pqb.toSQLCacheKey];
         const obj2 = {};
         for (let i = 0; i < len; i++) {
           obj2[foreignKeys[i]] = data[0][primaryKeys[i]];
         }
-        await t.where(
-          Array.isArray(params.set) ? {
-            OR: params.set
-          } : params.set
-        )._update(obj2);
+        await pqb._queryUpdate(
+          t.where(
+            Array.isArray(params.set) ? {
+              OR: params.set
+            } : params.set
+          ),
+          obj2
+        );
       }
     }
     if (params.delete || params.update) {
@@ -1034,9 +1066,9 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
         foreignKeys
       );
       if (params.delete) {
-        await q._delete();
+        await pqb._queryDelete(q);
       } else if (params.update) {
-        await q._update(params.update.data);
+        await pqb._queryUpdate(q, params.update.data);
       }
     }
   };
@@ -1160,13 +1192,13 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
   const joinQuery = (joiningQuery, tableAs, foreignAs) => {
     return joiningQuery.whereExists(subQuery, (q) => {
       for (let i = 0; i < throughLen; i++) {
-        q._on(
+        pqb._queryJoinOn(q, [
           throughForeignKeysFull[i],
           `${foreignAs}.${throughPrimaryKeys[i]}`
-        );
+        ]);
       }
       for (let i = 0; i < len; i++) {
-        q._on(foreignKeysFull[i], `${tableAs}.${primaryKeys[i]}`);
+        pqb._queryJoinOn(q, [foreignKeysFull[i], `${tableAs}.${primaryKeys[i]}`]);
       }
       return q;
     });
@@ -1193,9 +1225,12 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
           where[foreignKeysFull[i]] = params[primaryKeys[i]];
         }
         for (let i = 0; i < throughLen; i++) {
-          q._on(throughForeignKeysFull[i], throughPrimaryKeysFull[i]);
+          pqb._queryJoinOn(q, [
+            throughForeignKeysFull[i],
+            throughPrimaryKeysFull[i]
+          ]);
         }
-        return q._where(where);
+        return pqb._queryWhere(q, [where]);
       });
     },
     virtualColumn: new HasAndBelongsToManyVirtualColumn(
@@ -1217,7 +1252,7 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
     reverseJoin,
     modifyRelatedQuery(relationQuery) {
       const ref = {};
-      relationQuery._afterCreate([], async (result) => {
+      pqb._queryHookAfterCreate(relationQuery, [], async (result) => {
         if (result.length > 1) {
           throw new pqb.OrchidOrmInternalError(
             relationQuery,
@@ -1230,7 +1265,11 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
         for (let i = 0; i < throughLen; i++) {
           data[throughForeignKeys[i]] = result[0][throughPrimaryKeys[i]];
         }
-        const createdCount = await subQuery.count()._createFrom(baseQuery2, data);
+        const createdCount = await pqb._queryCreateFrom(
+          subQuery.count(),
+          baseQuery2,
+          data
+        );
         if (createdCount === 0) {
           throw new pqb.NotFoundError(baseQuery2);
         }
@@ -1249,12 +1288,17 @@ const queryJoinTable = (state, data, conditions) => {
     }
   });
   if (conditions) {
-    t._where({
-      IN: {
-        columns: state.throughForeignKeys,
-        values: state.relatedTableQuery.where(conditionsToWhereArg(conditions))._select(...state.throughPrimaryKeys)
+    pqb._queryWhere(t, [
+      {
+        IN: {
+          columns: state.throughForeignKeys,
+          values: pqb._querySelect(
+            state.relatedTableQuery.where(conditionsToWhereArg(conditions)),
+            state.throughPrimaryKeys
+          )
+        }
       }
-    });
+    ]);
   }
   return t;
 };
@@ -1302,7 +1346,7 @@ const nestedInsert = ({
       for (const [, { connect }] of items) {
         for (const item of connect) {
           queries.push(
-            t.select(...throughPrimaryKeys)._findBy(item)._take()
+            pqb._queryFindBy(t.select(...throughPrimaryKeys), [item])
           );
         }
       }
@@ -1322,7 +1366,9 @@ const nestedInsert = ({
       for (const [, { connectOrCreate }] of items) {
         for (const item of connectOrCreate) {
           queries.push(
-            t.select(...throughPrimaryKeys)._findBy(item.where)._takeOptional()
+            pqb._queryFindByOptional(t.select(...throughPrimaryKeys), [
+              item.where
+            ])
           );
         }
       }
@@ -1362,7 +1408,10 @@ const nestedInsert = ({
           }
         }
       }
-      created = await t.select(...throughPrimaryKeys)._createMany(records2);
+      created = await pqb._queryCreateMany(
+        t.select(...throughPrimaryKeys),
+        records2
+      );
     } else {
       created = [];
     }
@@ -1420,7 +1469,10 @@ const nestedUpdate = (state) => {
   const throughLen = state.throughPrimaryKeys.length;
   return async (_, data, params) => {
     if (params.create) {
-      const idsRows = await state.relatedTableQuery.select(...state.throughPrimaryKeys)._rows()._createMany(params.create);
+      const idsRows = await pqb._queryCreateMany(
+        pqb._queryRows(state.relatedTableQuery.select(...state.throughPrimaryKeys)),
+        params.create
+      );
       const records = [];
       for (const item of data) {
         const obj = {};
@@ -1438,41 +1490,58 @@ const nestedUpdate = (state) => {
       await state.joinTableQuery.createMany(records);
     }
     if (params.update) {
-      await state.relatedTableQuery.whereExists(state.joinTableQuery, (q) => {
-        for (let i = 0; i < throughLen; i++) {
-          q._on(
-            state.throughForeignKeysFull[i],
-            state.throughPrimaryKeysFull[i]
-          );
-        }
-        return q._where({
-          IN: {
-            columns: state.foreignKeysFull,
-            values: data.map(
-              (item) => state.primaryKeys.map((key) => item[key])
-            )
-          }
-        });
-      })._where(conditionsToWhereArg(params.update.where))._update(params.update.data);
+      await pqb._queryUpdate(
+        pqb._queryWhere(
+          state.relatedTableQuery.whereExists(state.joinTableQuery, (q) => {
+            for (let i = 0; i < throughLen; i++) {
+              pqb._queryJoinOn(q, [
+                state.throughForeignKeysFull[i],
+                state.throughPrimaryKeysFull[i]
+              ]);
+            }
+            return pqb._queryWhere(q, [
+              {
+                IN: {
+                  columns: state.foreignKeysFull,
+                  values: data.map(
+                    (item) => state.primaryKeys.map((key) => item[key])
+                  )
+                }
+              }
+            ]);
+          }),
+          [conditionsToWhereArg(params.update.where)]
+        ),
+        params.update.data
+      );
     }
     if (params.disconnect) {
-      await queryJoinTable(state, data, params.disconnect)._delete();
+      await pqb._queryDelete(queryJoinTable(state, data, params.disconnect));
     }
     if (params.delete) {
       const j = queryJoinTable(state, data, params.delete);
-      const idsRows = await j._select(...state.throughForeignKeys)._rows()._delete();
-      await state.relatedTableQuery.where({
-        IN: {
-          columns: state.throughPrimaryKeys,
-          values: idsRows
-        }
-      })._delete();
+      const idsRows = await pqb._queryDelete(
+        pqb._queryRows(pqb._querySelect(j, state.throughForeignKeys))
+      );
+      await pqb._queryDelete(
+        state.relatedTableQuery.where({
+          IN: {
+            columns: state.throughPrimaryKeys,
+            values: idsRows
+          }
+        })
+      );
     }
     if (params.set) {
       const j = queryJoinTable(state, data);
-      await j._delete();
+      await pqb._queryDelete(j);
       delete j.q[pqb.toSQLCacheKey];
-      const idsRows = await state.relatedTableQuery.where(conditionsToWhereArg(params.set))._select(...state.throughPrimaryKeys)._rows();
+      const idsRows = await pqb._queryRows(
+        pqb._querySelect(
+          state.relatedTableQuery.where(conditionsToWhereArg(params.set)),
+          state.throughPrimaryKeys
+        )
+      );
       await insertToJoinTable(state, j, data, idsRows);
     }
   };
@@ -1614,9 +1683,9 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
   }
   if (data.returns === "one") {
     if (relation.options.required) {
-      query._take();
+      pqb._queryTake(query);
     } else {
-      query._takeOptional();
+      pqb._queryTakeOptional(query);
     }
     query.q.returnsOne = true;
   }
@@ -1659,11 +1728,13 @@ const makeRelationQuery = (table, relationName, data, q) => {
         query = toTable;
         query.q.isSubQuery = true;
       } else {
-        query = toTable._all()._where({
-          EXISTS: {
-            args: [data.reverseJoin(this, toTable)]
+        query = pqb._queryWhere(pqb._queryAll(toTable), [
+          {
+            EXISTS: {
+              args: [data.reverseJoin(this, toTable)]
+            }
           }
-        });
+        ]);
       }
       if (this.q.relChain) {
         query.q.relChain = [...this.q.relChain, this];