orchid-orm 1.10.6 → 1.11.1

package/dist/index.js

@@ -4,15 +4,6 @@ var pqb = require('pqb');
 var orchidCore = require('orchid-core');
 var node_async_hooks = require('node:async_hooks');
 
-const addTableHooks = (table, hooks) => {
-  for (const key in hooks) {
-    pqb.addQueryHook(
-      table.baseQuery,
-      key,
-      hooks[key]
-    );
-  }
-};
 const createBaseTable = ({
   columnTypes,
   snakeCase,
@@ -21,40 +12,52 @@ const createBaseTable = ({
   exportAs
 } = { columnTypes: pqb.columnTypes }) => {
   const ct = typeof columnTypes === "function" ? columnTypes(pqb.columnTypes) : columnTypes || pqb.columnTypes;
-  filePath != null ? filePath : filePath = orchidCore.getCallerFilePath();
-  if (!filePath) {
-    throw new Error(
-      `Failed to determine file path of a base table. Please set the \`filePath\` option of \`createBaseTable\` manually.`
-    );
-  }
   return create(
     ct,
-    filePath,
+    // stack is needed only if filePath wasn't given
+    filePath || orchidCore.getStackTrace(),
     snakeCase,
     nowSQL,
     exportAs
   );
 };
-const create = (columnTypes, filePath, snakeCase, nowSQL, exportAs = "BaseTable") => {
+const create = (columnTypes, filePathOrStack, snakeCase, nowSQL, exportAs = "BaseTable") => {
   var _a;
+  let filePath;
   const base = (_a = class {
     constructor() {
       this.snakeCase = snakeCase;
       this.columnTypes = columnTypes;
+      this.query = {};
     }
-    setHooks(callbacks) {
-      return callbacks;
+    static getFilePath() {
+      if (filePath)
+        return filePath;
+      if (typeof filePathOrStack === "string")
+        return filePath = filePathOrStack;
+      filePath = orchidCore.getCallerFilePath(filePathOrStack);
+      if (filePath)
+        return filePath;
+      throw new Error(
+        `Failed to determine file path of a base table. Please set the \`filePath\` option of \`createBaseTable\` manually.`
+      );
+    }
+    clone() {
+      return this;
+    }
+    getFilePath() {
+      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;
+      throw new Error(
+        `Failed to determine file path for table ${this.constructor.name}. Please set \`filePath\` property manually`
+      );
     }
     setColumns(fn) {
-      if (!this.filePath) {
-        const filePath2 = orchidCore.getCallerFilePath();
-        if (!filePath2) {
-          throw new Error(
-            `Failed to determine file path for table ${this.constructor.name}. Please set \`filePath\` property manually`
-          );
-        }
-        this.filePath = filePath2;
-      }
       columnTypes[orchidCore.snakeCaseKey] = this.snakeCase;
       const shape = pqb.getColumnTypes(columnTypes, fn, nowSQL);
       if (this.snakeCase) {
@@ -105,7 +108,8 @@ const create = (columnTypes, filePath, snakeCase, nowSQL, exportAs = "BaseTable"
         options
       };
     }
-  }, _a.filePath = filePath, _a.nowSQL = nowSQL, _a.exportAs = exportAs, _a);
+  }, _a.nowSQL = nowSQL, _a.exportAs = exportAs, _a);
+  orchidCore.applyMixins(base, [pqb.QueryHooks]);
   base.prototype.columnTypes = columnTypes;
   return base;
 };
@@ -225,9 +229,9 @@ const nestedInsert$3 = ({ query, primaryKey }) => {
     let createdI = 0;
     let connectedI = 0;
     connectOrCreatedI = 0;
-    return data.map(
-      (item) => item.connectOrCreate ? connectOrCreated[connectOrCreatedI++] || created[createdI++] : item.connect ? connected[connectedI++] : created[createdI++]
-    );
+    return data.map((item) => {
+      return item.connectOrCreate ? connectOrCreated[connectOrCreatedI++] || created[createdI++] : item.connect ? connected[connectedI++] : created[createdI++];
+    });
   };
 };
 const nestedUpdate$3 = ({ query, primaryKey, foreignKey }) => {
@@ -236,7 +240,7 @@ const nestedUpdate$3 = ({ query, primaryKey, foreignKey }) => {
     if (params.upsert && pqb.isQueryReturnsAll(q)) {
       throw new Error("`upsert` option is not allowed in a batch update");
     }
-    let idForDelete;
+    let idsForDelete;
     q._beforeUpdate(async (q2) => {
       if (params.disconnect) {
         update[foreignKey] = null;
@@ -251,7 +255,7 @@ const nestedUpdate$3 = ({ query, primaryKey, foreignKey }) => {
       } else if (params.delete) {
         const selectQuery = q2.clone();
         selectQuery.query.type = void 0;
-        idForDelete = await selectQuery._getOptional(foreignKey);
+        idsForDelete = await selectQuery._pluck(foreignKey);
         update[foreignKey] = null;
       }
     });
@@ -274,12 +278,12 @@ const nestedUpdate$3 = ({ query, primaryKey, foreignKey }) => {
         }
       });
     } else if (params.delete || params.update) {
-      q._afterQuery(async (_, data) => {
-        const id = params.delete ? idForDelete : Array.isArray(data) ? data.length === 0 ? null : {
+      q._afterUpdate([], async (data) => {
+        const id = params.delete ? { in: idsForDelete } : Array.isArray(data) ? data.length === 0 ? null : {
           in: data.map((item) => item[foreignKey]).filter((id2) => id2 !== null)
         } : data[foreignKey];
         if (id !== void 0 && id !== null) {
-          const t = query.findBy({
+          const t = query.where({
             [primaryKey]: id
           });
           if (params.delete) {
@@ -313,22 +317,20 @@ const hasRelationHandleCreate = (q, ctx, item, rowIndex, key, primaryKey, nested
     return;
   }
   q.query.wrapInTransaction = true;
-  ctx.returnTypeAll = true;
-  ctx.requiredReturning[primaryKey] = true;
   const relationData = [values];
   store.hasRelation[key] = relationData;
-  pqb.pushQueryValue(q, "afterCreate", async (q2) => {
-    const { resultAll } = ctx;
-    return nestedInsert(
+  q._afterCreate(
+    [primaryKey],
+    (rows, q2) => nestedInsert(
       q2,
       relationData.map(([rowIndex2, data]) => [
-        resultAll[rowIndex2],
+        rows[rowIndex2],
         data
       ])
-    );
-  });
+    )
+  );
 };
-const hasRelationHandleUpdate = (q, ctx, set, key, primaryKey, nestedUpdate) => {
+const hasRelationHandleUpdate = (q, set, key, primaryKey, nestedUpdate) => {
   var _a, _b;
   const value = set[key];
   if (!value.set && !("upsert" in value) && (!value.disconnect || Array.isArray(value.disconnect) && value.disconnect.length === 0) && (!value.delete || Array.isArray(value.delete) && value.delete.length === 0) && (!value.update || Array.isArray(value.update.where) && value.update.where.length === 0) && (!value.create || Array.isArray(value.create) && value.create.length === 0))
@@ -337,11 +339,10 @@ const hasRelationHandleUpdate = (q, ctx, set, key, primaryKey, nestedUpdate) =>
     q._select(primaryKey);
   }
   q.query.wrapInTransaction = true;
-  ctx.returnTypeAll = true;
-  pqb.pushQueryValue(q, "afterUpdate", (q2) => {
+  q._afterUpdate(q.primaryKeys, (rows, q2) => {
     return nestedUpdate(
       q2,
-      ctx.resultAll,
+      rows,
       value
     );
   });
@@ -385,10 +386,14 @@ class HasOneVirtualColumn extends pqb.VirtualColumn {
       this.nestedInsert
     );
   }
-  update(q, ctx, set) {
+  update(q, _, set) {
+    const params = set[this.key];
+    if ((params.set || params.create || params.upsert) && pqb.isQueryReturnsAll(q)) {
+      const key = params.set ? "set" : params.create ? "create" : "upsert";
+      throw new Error(`\`${key}\` option is not allowed in a batch update`);
+    }
     hasRelationHandleUpdate(
       q,
-      ctx,
       set,
       this.key,
       this.state.primaryKey,
@@ -501,11 +506,7 @@ const nestedInsert$2 = ({ query, primaryKey, foreignKey }) => {
   };
 };
 const nestedUpdate$2 = ({ query, primaryKey, foreignKey }) => {
-  return async (q, data, params) => {
-    if ((params.set || params.create || params.upsert) && pqb.isQueryReturnsAll(q)) {
-      const key = params.set ? "set" : params.create ? "create" : "upsert";
-      throw new Error(`\`${key}\` option is not allowed in a batch update`);
-    }
+  return async (_, data, params) => {
     const t = query.clone();
     const ids = data.map((item) => item[primaryKey]);
     const currentRelationsQuery = t.where({
@@ -578,10 +579,14 @@ class HasManyVirtualColumn extends pqb.VirtualColumn {
       this.nestedInsert
     );
   }
-  update(q, ctx, set) {
+  update(q, _, set) {
+    const params = set[this.key];
+    if ((params.set || params.create) && pqb.isQueryReturnsAll(q)) {
+      const key = params.set ? "set" : "create";
+      throw new Error(`\`${key}\` option is not allowed in a batch update`);
+    }
     hasRelationHandleUpdate(
       q,
-      ctx,
       set,
       this.key,
       this.state.primaryKey,
@@ -737,12 +742,8 @@ const nestedInsert$1 = ({ query, primaryKey, foreignKey }) => {
   };
 };
 const nestedUpdate$1 = ({ query, primaryKey, foreignKey }) => {
-  return async (q, data, params) => {
+  return async (_, data, params) => {
     var _a;
-    if ((params.set || params.create) && pqb.isQueryReturnsAll(q)) {
-      const key = params.set ? "set" : "create";
-      throw new Error(`\`${key}\` option is not allowed in a batch update`);
-    }
     const t = query.clone();
     if (params.create) {
       await t._count()._createMany(
@@ -772,7 +773,7 @@ const nestedUpdate$1 = ({ query, primaryKey, foreignKey }) => {
     }
     if (params.delete || params.update) {
       delete t.query[pqb.toSqlCacheKey];
-      const q2 = t._where(
+      const q = t._where(
         getWhereForNestedUpdate(
           data,
           params.delete || ((_a = params.update) == null ? void 0 : _a.where),
@@ -781,9 +782,9 @@ const nestedUpdate$1 = ({ query, primaryKey, foreignKey }) => {
         )
       );
       if (params.delete) {
-        await q2._delete();
+        await q._delete();
       } else if (params.update) {
-        await q2._update(params.update.data);
+        await q._update(params.update.data);
       }
     }
   };
@@ -827,10 +828,9 @@ class HasAndBelongsToManyVirtualColumn extends pqb.VirtualColumn {
       this.nestedInsert
     );
   }
-  update(q, ctx, set) {
+  update(q, _, set) {
     hasRelationHandleUpdate(
       q,
-      ctx,
       set,
       this.key,
       this.state.primaryKey,
@@ -910,24 +910,26 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
     primaryKey: pk,
     modifyRelatedQuery(relationQuery) {
       const ref = {};
-      pqb.pushQueryValue(
-        relationQuery,
-        "afterCreate",
-        async (_, result) => {
-          const fromQuery = ref.query.clone();
-          fromQuery.query.select = [{ selectAs: { [fk]: pk } }];
-          const createdCount = await subQuery.count()._createFrom(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            fromQuery,
-            {
-              [afk]: result[apk]
-            }
+      relationQuery._afterCreate([], async (result) => {
+        if (result.length > 1) {
+          throw new pqb.OrchidOrmInternalError(
+            relationQuery,
+            "Creating multiple `hasAndBelongsToMany` records is not yet supported"
           );
-          if (createdCount === 0) {
-            throw new pqb.NotFoundError(fromQuery);
+        }
+        const fromQuery = ref.query.clone();
+        fromQuery.query.select = [{ selectAs: { [fk]: pk } }];
+        const createdCount = await subQuery.count()._createFrom(
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          fromQuery,
+          {
+            [afk]: result[0][apk]
           }
+        );
+        if (createdCount === 0) {
+          throw new pqb.NotFoundError(fromQuery);
         }
-      );
+      });
       return (q) => {
         ref.query = q;
       };
@@ -1438,11 +1440,16 @@ const orchidORM = (_a, tables) => {
     dbTable.db = result;
     dbTable.filePath = table.filePath;
     dbTable.name = table.constructor.name;
-    if (table.hooks)
-      addTableHooks(dbTable, table.hooks);
     result[key] = dbTable;
   }
   applyRelations(qb, tableInstances, result);
+  for (const key in tables) {
+    const table = tableInstances[key];
+    if (table.init) {
+      table.init(result);
+      Object.assign(result[key].baseQuery.query, table.query);
+    }
+  }
   return result;
 };
 
@@ -1505,7 +1512,6 @@ Object.defineProperty(exports, 'testTransaction', {
   enumerable: true,
   get: function () { return pqb.testTransaction; }
 });
-exports.addTableHooks = addTableHooks;
 exports.createBaseTable = createBaseTable;
 exports.createRepo = createRepo;
 exports.orchidORM = orchidORM;