metal-orm 1.1.20 → 1.1.22

package/dist/index.cjs

@@ -477,7 +477,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/schema/table.ts
-var defineTable = (name, columns, relations = {}, hooks, options = {}) => {
+var defineTable = (name, columns, relations = {}, options = {}) => {
   const colsWithNames = Object.entries(columns).reduce((acc, [key, def]) => {
     const colDef = { ...def, name: key, table: name };
     acc[key] = colDef;
@@ -488,7 +488,6 @@ var defineTable = (name, columns, relations = {}, hooks, options = {}) => {
     schema: options.schema,
     columns: colsWithNames,
     relations,
-    hooks,
     primaryKey: options.primaryKey,
     indexes: options.indexes,
     checks: options.checks,
@@ -8404,14 +8403,11 @@ var addTransformerMetadata = (target, propertyKey, transformer) => {
   const meta = ensureEntityMetadata(target);
   meta.transformers[propertyKey] = transformer;
 };
-var setEntityTableName = (target, tableName, hooks, type) => {
+var setEntityTableName = (target, tableName, type) => {
   const meta = ensureEntityMetadata(target);
   if (tableName && tableName.length > 0) {
     meta.tableName = tableName;
   }
-  if (hooks) {
-    meta.hooks = hooks;
-  }
   if (type) {
     meta.type = type;
   }
@@ -8428,7 +8424,7 @@ var buildTableDef = (meta) => {
       table: meta.tableName
     };
   }
-  const table = defineTable(meta.tableName, columns, {}, meta.hooks);
+  const table = defineTable(meta.tableName, columns);
   meta.table = table;
   return table;
 };
@@ -11850,7 +11846,6 @@ var PgInformationSchemaColumns = defineTable(
     ordinal_position: col.int()
   },
   {},
-  void 0,
   { schema: "information_schema" }
 );
 var PgClass = defineTable(
@@ -11862,7 +11857,6 @@ var PgClass = defineTable(
     relkind: col.varchar(1)
   },
   {},
-  void 0,
   { schema: "pg_catalog" }
 );
 var PgNamespace = defineTable(
@@ -11872,7 +11866,6 @@ var PgNamespace = defineTable(
     nspname: col.varchar(255)
   },
   {},
-  void 0,
   { schema: "pg_catalog" }
 );
 var PgIndex = defineTable(
@@ -11885,7 +11878,6 @@ var PgIndex = defineTable(
     indpred: col.varchar(1024)
   },
   {},
-  void 0,
   { schema: "pg_catalog" }
 );
 var PgAttribute = defineTable(
@@ -11896,7 +11888,6 @@ var PgAttribute = defineTable(
     attnum: col.int()
   },
   {},
-  void 0,
   { schema: "pg_catalog" }
 );
 var PgTableConstraints = defineTable(
@@ -11911,7 +11902,6 @@ var PgTableConstraints = defineTable(
     constraint_type: col.varchar(255)
   },
   {},
-  void 0,
   { schema: "information_schema" }
 );
 var PgKeyColumnUsage = defineTable(
@@ -11927,7 +11917,6 @@ var PgKeyColumnUsage = defineTable(
     ordinal_position: col.int()
   },
   {},
-  void 0,
   { schema: "information_schema" }
 );
 var PgConstraintColumnUsage = defineTable(
@@ -11942,7 +11931,6 @@ var PgConstraintColumnUsage = defineTable(
     column_name: col.varchar(255)
   },
   {},
-  void 0,
   { schema: "information_schema" }
 );
 var PgReferentialConstraints = defineTable(
@@ -11959,7 +11947,6 @@ var PgReferentialConstraints = defineTable(
     delete_rule: col.varchar(64)
   },
   {},
-  void 0,
   { schema: "information_schema" }
 );
 
@@ -12341,7 +12328,6 @@ var InformationSchemaTables = defineTable(
     table_comment: col.varchar(1024)
   },
   {},
-  void 0,
   { schema: INFORMATION_SCHEMA }
 );
 var InformationSchemaColumns = defineTable(
@@ -12359,7 +12345,6 @@ var InformationSchemaColumns = defineTable(
     ordinal_position: col.int()
   },
   {},
-  void 0,
   { schema: INFORMATION_SCHEMA }
 );
 var InformationSchemaKeyColumnUsage = defineTable(
@@ -12376,7 +12361,6 @@ var InformationSchemaKeyColumnUsage = defineTable(
     referenced_column_name: col.varchar(255)
   },
   {},
-  void 0,
   { schema: INFORMATION_SCHEMA }
 );
 var InformationSchemaReferentialConstraints = defineTable(
@@ -12388,7 +12372,6 @@ var InformationSchemaReferentialConstraints = defineTable(
     update_rule: col.varchar(255)
   },
   {},
-  void 0,
   { schema: INFORMATION_SCHEMA }
 );
 var InformationSchemaStatistics = defineTable(
@@ -12402,7 +12385,6 @@ var InformationSchemaStatistics = defineTable(
     seq_in_index: col.int()
   },
   {},
-  void 0,
   { schema: INFORMATION_SCHEMA }
 );
 
@@ -13023,7 +13005,6 @@ var SysColumns = defineTable(
     user_type_id: col.int()
   },
   {},
-  void 0,
   { schema: "sys" }
 );
 var SysTables = defineTable(
@@ -13035,7 +13016,6 @@ var SysTables = defineTable(
     is_ms_shipped: col.boolean()
   },
   {},
-  void 0,
   { schema: "sys" }
 );
 var SysSchemas = defineTable(
@@ -13045,7 +13025,6 @@ var SysSchemas = defineTable(
     name: col.varchar(255)
   },
   {},
-  void 0,
   { schema: "sys" }
 );
 var SysTypes = defineTable(
@@ -13055,7 +13034,6 @@ var SysTypes = defineTable(
     name: col.varchar(255)
   },
   {},
-  void 0,
   { schema: "sys" }
 );
 var SysIndexes = defineTable(
@@ -13071,7 +13049,6 @@ var SysIndexes = defineTable(
     is_hypothetical: col.boolean()
   },
   {},
-  void 0,
   { schema: "sys" }
 );
 var SysIndexColumns = defineTable(
@@ -13083,7 +13060,6 @@ var SysIndexColumns = defineTable(
     key_ordinal: col.int()
   },
   {},
-  void 0,
   { schema: "sys" }
 );
 var SysForeignKeys = defineTable(
@@ -13095,7 +13071,6 @@ var SysForeignKeys = defineTable(
     update_referential_action_desc: col.varchar(64)
   },
   {},
-  void 0,
   { schema: "sys" }
 );
 var SysForeignKeyColumns = defineTable(
@@ -13109,7 +13084,6 @@ var SysForeignKeyColumns = defineTable(
     constraint_column_id: col.int()
   },
   {},
-  void 0,
   { schema: "sys" }
 );
 
@@ -14534,12 +14508,14 @@ var UnitOfWork = class {
    * @param executor - The database executor
    * @param identityMap - The identity map
    * @param hookContext - Function to get the hook context
+   * @param resolveTableHooks - Session/runtime lifecycle hook resolver
    */
-  constructor(dialect, executor, identityMap, hookContext) {
+  constructor(dialect, executor, identityMap, hookContext, resolveTableHooks = () => void 0) {
     this.dialect = dialect;
     this.executor = executor;
     this.identityMap = identityMap;
     this.hookContext = hookContext;
+    this.resolveTableHooks = resolveTableHooks;
   }
   trackedEntities = /* @__PURE__ */ new Map();
   /**
@@ -14691,7 +14667,8 @@ var UnitOfWork = class {
    * @param tracked - The tracked entity to insert
    */
   async flushInsert(tracked) {
-    await this.runHook(tracked.table.hooks?.beforeInsert, tracked);
+    const hooks = this.resolveTableHooks(tracked.table);
+    await this.runHook(hooks?.beforeInsert, tracked);
     const payload = this.extractColumns(tracked.table, tracked.entity);
     let builder = new InsertQueryBuilder(tracked.table).values(payload);
     if (this.dialect.supportsDmlReturningClause()) {
@@ -14705,7 +14682,7 @@ var UnitOfWork = class {
     tracked.original = this.createSnapshot(tracked.table, tracked.entity);
     tracked.pk = this.getPrimaryKeyValue(tracked);
     this.registerIdentity(tracked);
-    await this.runHook(tracked.table.hooks?.afterInsert, tracked);
+    await this.runHook(hooks?.afterInsert, tracked);
   }
   /**
    * Flushes an update operation for a modified entity.
@@ -14718,7 +14695,8 @@ var UnitOfWork = class {
       tracked.status = "managed" /* Managed */;
       return;
     }
-    await this.runHook(tracked.table.hooks?.beforeUpdate, tracked);
+    const hooks = this.resolveTableHooks(tracked.table);
+    await this.runHook(hooks?.beforeUpdate, tracked);
     const pkColumn = tracked.table.columns[findPrimaryKey(tracked.table)];
     if (!pkColumn) return;
     let builder = new UpdateQueryBuilder(tracked.table).set(changes).where(eq(pkColumn, tracked.pk));
@@ -14731,7 +14709,7 @@ var UnitOfWork = class {
     tracked.status = "managed" /* Managed */;
     tracked.original = this.createSnapshot(tracked.table, tracked.entity);
     this.registerIdentity(tracked);
-    await this.runHook(tracked.table.hooks?.afterUpdate, tracked);
+    await this.runHook(hooks?.afterUpdate, tracked);
   }
   /**
    * Flushes a delete operation for a removed entity.
@@ -14739,7 +14717,8 @@ var UnitOfWork = class {
    */
   async flushDelete(tracked) {
     if (tracked.pk == null) return;
-    await this.runHook(tracked.table.hooks?.beforeDelete, tracked);
+    const hooks = this.resolveTableHooks(tracked.table);
+    await this.runHook(hooks?.beforeDelete, tracked);
     const pkColumn = tracked.table.columns[findPrimaryKey(tracked.table)];
     if (!pkColumn) return;
     const builder = new DeleteQueryBuilder(tracked.table).where(eq(pkColumn, tracked.pk));
@@ -14748,10 +14727,10 @@ var UnitOfWork = class {
     tracked.status = "detached" /* Detached */;
     this.trackedEntities.delete(tracked.entity);
     this.identityMap.remove(tracked);
-    await this.runHook(tracked.table.hooks?.afterDelete, tracked);
+    await this.runHook(hooks?.afterDelete, tracked);
   }
   /**
-   * Runs a table hook if defined.
+   * Runs a lifecycle hook if defined.
    * @param hook - The hook function
    * @param tracked - The tracked entity
    */
@@ -15070,7 +15049,10 @@ var RelationChangeProcessor = class {
     const rootKey = relation.localKey || findPrimaryKey(entry.rootTable);
     const rootId = entry.root[rootKey];
     if (rootId === void 0 || rootId === null) return;
-    const targetId = this.resolvePrimaryKeyValue(entry.change.entity, relation.target);
+    const targetId = this.resolveBelongsToManyTargetValue(
+      entry.change.entity,
+      relation
+    );
     if (targetId === null) return;
     const pivotPayload = this.buildPivotPayload(relation, entry.change.pivot);
     if (entry.change.kind === "update") {
@@ -15142,7 +15124,7 @@ var RelationChangeProcessor = class {
    * Inserts a pivot row for belongs-to-many relations.
    * @param relation - The belongs-to-many relation
    * @param rootId - The root entity's primary key value
-   * @param targetId - The target entity's primary key value
+   * @param targetId - The target entity's relation key value
    */
   async insertPivotRow(relation, rootId, targetId, pivotPayload) {
     const payload = {
@@ -15158,7 +15140,7 @@ var RelationChangeProcessor = class {
    * Updates a pivot row for belongs-to-many relations.
    * @param relation - The belongs-to-many relation
    * @param rootId - The root entity's primary key value
-   * @param targetId - The target entity's primary key value
+   * @param targetId - The target entity's relation key value
    * @param pivotPayload - The pivot columns to update
    */
   async updatePivotRow(relation, rootId, targetId, pivotPayload) {
@@ -15173,7 +15155,7 @@ var RelationChangeProcessor = class {
    * Deletes a pivot row for belongs-to-many relations.
    * @param relation - The belongs-to-many relation
    * @param rootId - The root entity's primary key value
-   * @param targetId - The target entity's primary key value
+   * @param targetId - The target entity's relation key value
    */
   async deletePivotRow(relation, rootId, targetId) {
     const rootCol = relation.pivotTable.columns[relation.pivotForeignKeyToRoot];
@@ -15186,14 +15168,13 @@ var RelationChangeProcessor = class {
     await this.executor.executeSql(compiled.sql, compiled.params);
   }
   /**
-   * Resolves the primary key value from an entity.
-   * @param entity - The entity
-   * @param table - The table definition
-   * @returns The primary key value or null
+   * Resolves the target-side key value used by a belongs-to-many relation.
+   * The declared targetKey is part of the relation contract and takes
+   * precedence over the target table primary key.
    */
-  resolvePrimaryKeyValue(entity, table) {
+  resolveBelongsToManyTargetValue(entity, relation) {
     if (!entity) return null;
-    const key = findPrimaryKey(table);
+    const key = relation.targetKey || findPrimaryKey(relation.target);
     const value = entity[key];
     if (value === void 0 || value === null) return null;
     return value ?? null;
@@ -15654,6 +15635,7 @@ var OrmSession = class {
   /** The tenant ID for multi-tenancy support */
   tenantId;
   interceptors;
+  tableHooks = /* @__PURE__ */ new WeakMap();
   saveGraphDefaults;
   transactionDepth = 0;
   savepointCounter = 0;
@@ -15667,7 +15649,13 @@ var OrmSession = class {
     this.executor = createQueryLoggingExecutor(opts.executor, opts.queryLogger);
     this.interceptors = [...opts.interceptors ?? []];
     this.identityMap = new IdentityMap();
-    this.unitOfWork = new UnitOfWork(this.orm.dialect, this.executor, this.identityMap, () => this);
+    this.unitOfWork = new UnitOfWork(
+      this.orm.dialect,
+      this.executor,
+      this.identityMap,
+      () => this,
+      (table) => this.tableHooks.get(table)
+    );
     this.relationChanges = new RelationChangeProcessor(this.unitOfWork, this.orm.dialect, this.executor);
     this.domainEvents = new DomainEventBus(opts.domainEventHandlers);
     this.cacheManager = opts.cacheManager;
@@ -15775,6 +15763,18 @@ var OrmSession = class {
   getEntitiesForTable(table) {
     return this.unitOfWork.getEntitiesForTable(table);
   }
+  /**
+   * Registers INSERT/UPDATE/DELETE lifecycle hooks for this Session only.
+   * The target can be a TableDef or a decorated entity constructor.
+   * Registering again for the same table replaces the previous hook set.
+   */
+  registerTableHooks(target, hooks) {
+    const table = typeof target === "function" ? getTableDefFromEntity(target) : target;
+    if (!table) {
+      throw new Error("Entity metadata has not been bootstrapped");
+    }
+    this.tableHooks.set(table, hooks);
+  }
   /**
    * Registers an interceptor for flush lifecycle hooks.
    * @param interceptor - The interceptor to register
@@ -15785,7 +15785,7 @@ var OrmSession = class {
   /**
    * Registers a domain event handler.
    * @param type - The event type
-   * @param handler - The event handler
+   * @param handler - The domain event handler
    */
   registerDomainEventHandler(type, handler) {
     this.domainEvents.on(type, handler);
@@ -15959,7 +15959,9 @@ var OrmSession = class {
     this.markRemoved(entity);
   }
   /**
-   * Flushes pending changes to the database without session hooks, relation processing, or domain events.
+   * Flushes pending changes to the database without session interceptors,
+   * relation processing, or domain events. Table lifecycle hooks still run
+   * because they are part of the Unit of Work.
    */
   async flush() {
     await this.unitOfWork.flush();
@@ -16854,7 +16856,7 @@ function Entity(options = {}) {
   return function(value, context) {
     const ctor = value;
     const tableName = options.tableName ?? deriveTableNameFromConstructor(ctor);
-    setEntityTableName(ctor, tableName, options.hooks, options.type);
+    setEntityTableName(ctor, tableName, options.type);
     const bag = context ? readMetadataBag(context) : readMetadataBagFromConstructor(ctor);
     if (bag) {
       const meta = ensureEntityMetadata(ctor);
@@ -21074,7 +21076,7 @@ var TreeManager = class _TreeManager {
    * Moves a node to be the last child of a new parent.
    */
   async moveTo(node, newParentId) {
-    NestedSetStrategy.subtreeWidth(node.lft, node.rght);
+    const width = NestedSetStrategy.subtreeWidth(node.lft, node.rght);
     let newPos;
     if (newParentId === null) {
       const maxRght = await this.getMaxRght();
@@ -21089,7 +21091,8 @@ var TreeManager = class _TreeManager {
         newParent.depth ?? await this.getLevel(newParent)
       );
     }
-    await this.moveSubtree(node, newPos.lft, newParentId, newPos.depth);
+    const targetLft = newPos.lft > node.rght ? newPos.lft - width : newPos.lft;
+    await this.moveSubtree(node, targetLft, newParentId, newPos.depth);
   }
   /**
    * Inserts a new node as a child of a parent.
@@ -21128,7 +21131,10 @@ var TreeManager = class _TreeManager {
     if (insertData[this.pkName] !== void 0) {
       return insertData[this.pkName];
     }
-    const findQuery = selectFrom(this.table).where(eq(this.table.columns[this.config.leftKey], insertPos.lft));
+    const scopeExpressions = this.getScopeExpressions();
+    const lftCondition = eq(this.table.columns[this.config.leftKey], insertPos.lft);
+    const findCondition = scopeExpressions.length > 0 ? and(lftCondition, ...scopeExpressions) : lftCondition;
+    const findQuery = selectFrom(this.table).where(findCondition);
     const { sql: findSql, params: findParams } = findQuery.compile(this.dialect);
     const results = await this.executor.executeSql(findSql, findParams);
     const rows = queryResultsToRows(results);
@@ -21138,23 +21144,37 @@ var TreeManager = class _TreeManager {
     return void 0;
   }
   /**
-   * Removes a node and re-parents its children to the node's parent.
+   * Removes a node from its current tree position, promotes its direct children
+   * to the removed node's parent, and retains the removed row as a standalone root.
    */
   async removeFromTree(node) {
     const nodeId = node.data[this.pkName];
+    const originalMaxRght = await this.getMaxRght();
     await this.executeUpdate(
       eq(this.table.columns[this.config.parentKey], nodeId),
       { [this.config.parentKey]: node.parentId }
     );
-    const gap = NestedSetStrategy.calculateDeleteGap(node.lft, node.rght);
+    if (node.rght - node.lft > 1) {
+      let sql = `UPDATE ${this.quoteTable()} SET ${this.quoteCol(this.config.leftKey)} = ${this.quoteCol(this.config.leftKey)} - 1, ${this.quoteCol(this.config.rightKey)} = ${this.quoteCol(this.config.rightKey)} - 1`;
+      if (this.config.depthKey) {
+        sql += `, ${this.quoteCol(this.config.depthKey)} = ${this.quoteCol(this.config.depthKey)} - 1`;
+      }
+      sql += ` WHERE ${this.quoteCol(this.config.leftKey)} > ? AND ${this.quoteCol(this.config.rightKey)} < ?`;
+      await this.executeRawUpdate(sql, [node.lft, node.rght]);
+    }
     await this.shiftForDelete(node.rght, 2);
-    NestedSetStrategy.calculateShiftForDelete(node.lft + 1, gap.width - 2);
-    if (gap.width > 2) {
-      await this.executeRawUpdate(
-        `UPDATE ${this.quoteTable()} SET ${this.quoteCol(this.config.leftKey)} = ${this.quoteCol(this.config.leftKey)} - 1, ${this.quoteCol(this.config.rightKey)} = ${this.quoteCol(this.config.rightKey)} - 1 WHERE ${this.quoteCol(this.config.leftKey)} > ? AND ${this.quoteCol(this.config.rightKey)} < ?`,
-        [node.lft, node.rght]
-      );
+    const detachedData = {
+      [this.config.parentKey]: null,
+      [this.config.leftKey]: originalMaxRght - 1,
+      [this.config.rightKey]: originalMaxRght
+    };
+    if (this.config.depthKey) {
+      detachedData[this.config.depthKey] = 0;
     }
+    await this.executeUpdate(
+      eq(this.table.columns[this.pkName], nodeId),
+      detachedData
+    );
   }
   /**
    * Deletes a node and all its descendants.
@@ -21279,22 +21299,32 @@ var TreeManager = class _TreeManager {
     }
     return "id";
   }
+  getScopeEntries() {
+    return Object.entries(buildScopeConditions(this.config.scope, this.scopeValues));
+  }
+  getScopeExpressions() {
+    return this.getScopeEntries().map(
+      ([key, value]) => eq(this.table.columns[key], value)
+    );
+  }
   async getMaxRght() {
     const query = selectFrom(this.table).selectRaw(`MAX(${this.config.rightKey}) as max_rght`);
-    const { sql, params } = query.compile(this.dialect);
+    const scopeExpressions = this.getScopeExpressions();
+    const finalQuery = scopeExpressions.length > 0 ? query.where(and(...scopeExpressions)) : query;
+    const { sql, params } = finalQuery.compile(this.dialect);
     const queryResults = await this.executor.executeSql(sql, params);
     const rows = queryResultsToRows(queryResults);
     const maxRght = rows[0]?.max_rght;
     return typeof maxRght === "number" ? maxRght : 0;
   }
-  async shiftForInsert(insertPoint) {
+  async shiftForInsert(insertPoint, width = 2) {
     await this.executeRawUpdate(
-      `UPDATE ${this.quoteTable()} SET ${this.quoteCol(this.config.rightKey)} = ${this.quoteCol(this.config.rightKey)} + 2 WHERE ${this.quoteCol(this.config.rightKey)} >= ?`,
-      [insertPoint]
+      `UPDATE ${this.quoteTable()} SET ${this.quoteCol(this.config.rightKey)} = ${this.quoteCol(this.config.rightKey)} + ? WHERE ${this.quoteCol(this.config.rightKey)} >= ?`,
+      [width, insertPoint]
     );
     await this.executeRawUpdate(
-      `UPDATE ${this.quoteTable()} SET ${this.quoteCol(this.config.leftKey)} = ${this.quoteCol(this.config.leftKey)} + 2 WHERE ${this.quoteCol(this.config.leftKey)} > ?`,
-      [insertPoint]
+      `UPDATE ${this.quoteTable()} SET ${this.quoteCol(this.config.leftKey)} = ${this.quoteCol(this.config.leftKey)} + ? WHERE ${this.quoteCol(this.config.leftKey)} > ?`,
+      [width, insertPoint]
     );
   }
   async shiftForDelete(deletedRght, width) {
@@ -21330,28 +21360,27 @@ var TreeManager = class _TreeManager {
   }
   async moveSubtree(node, newLft, newParentId, newDepth) {
     const width = NestedSetStrategy.subtreeWidth(node.lft, node.rght);
-    const delta = newLft - node.lft;
-    const depthDelta = this.config.depthKey ? newDepth - (node.depth ?? 0) : 0;
+    const oldDepth = this.config.depthKey ? node.depth ?? await this.getLevel(node) : 0;
+    const depthDelta = this.config.depthKey ? newDepth - oldDepth : 0;
     const nodeId = node.data[this.pkName];
-    const tempOffset = 1e7;
+    const isolateDelta = -1e7 - node.rght;
+    const isolatedLft = node.lft + isolateDelta;
+    const isolatedRght = node.rght + isolateDelta;
     await this.executeRawUpdate(
-      `UPDATE ${this.quoteTable()} SET ${this.quoteCol(this.config.leftKey)} = ${this.quoteCol(this.config.leftKey)} + ? WHERE ${this.quoteCol(this.config.leftKey)} >= ? AND ${this.quoteCol(this.config.rightKey)} <= ?`,
-      [tempOffset, node.lft, node.rght]
-    );
-    await this.executeRawUpdate(
-      `UPDATE ${this.quoteTable()} SET ${this.quoteCol(this.config.rightKey)} = ${this.quoteCol(this.config.rightKey)} + ? WHERE ${this.quoteCol(this.config.leftKey)} >= ? AND ${this.quoteCol(this.config.rightKey)} <= ?`,
-      [tempOffset, node.lft + tempOffset, node.rght]
+      `UPDATE ${this.quoteTable()} SET ${this.quoteCol(this.config.leftKey)} = ${this.quoteCol(this.config.leftKey)} + ?, ${this.quoteCol(this.config.rightKey)} = ${this.quoteCol(this.config.rightKey)} + ? WHERE ${this.quoteCol(this.config.leftKey)} >= ? AND ${this.quoteCol(this.config.rightKey)} <= ?`,
+      [isolateDelta, isolateDelta, node.lft, node.rght]
     );
     await this.shiftForDelete(node.rght, width);
-    await this.shiftForInsert(newLft);
-    let updateSql = `UPDATE ${this.quoteTable()} SET ${this.quoteCol(this.config.leftKey)} = ${this.quoteCol(this.config.leftKey)} - ? + ?, ${this.quoteCol(this.config.rightKey)} = ${this.quoteCol(this.config.rightKey)} - ? + ?`;
-    const updateParams = [tempOffset, delta, tempOffset, delta];
+    await this.shiftForInsert(newLft, width);
+    const restoreDelta = newLft - node.lft - isolateDelta;
+    let updateSql = `UPDATE ${this.quoteTable()} SET ${this.quoteCol(this.config.leftKey)} = ${this.quoteCol(this.config.leftKey)} + ?, ${this.quoteCol(this.config.rightKey)} = ${this.quoteCol(this.config.rightKey)} + ?`;
+    const updateParams = [restoreDelta, restoreDelta];
     if (this.config.depthKey && depthDelta !== 0) {
       updateSql += `, ${this.quoteCol(this.config.depthKey)} = ${this.quoteCol(this.config.depthKey)} + ?`;
       updateParams.push(depthDelta);
     }
-    updateSql += ` WHERE ${this.quoteCol(this.config.leftKey)} >= ?`;
-    updateParams.push(node.lft + tempOffset);
+    updateSql += ` WHERE ${this.quoteCol(this.config.leftKey)} >= ? AND ${this.quoteCol(this.config.rightKey)} <= ?`;
+    updateParams.push(isolatedLft, isolatedRght);
     await this.executeRawUpdate(updateSql, updateParams);
     await this.executeUpdate(
       eq(this.table.columns[this.pkName], nodeId),
@@ -21376,12 +21405,23 @@ var TreeManager = class _TreeManager {
     }));
   }
   async executeUpdate(condition, data) {
-    const query = update(this.table).set(data).where(condition);
+    const scopeExpressions = this.getScopeExpressions();
+    const finalCondition = scopeExpressions.length > 0 ? and(condition, ...scopeExpressions) : condition;
+    const query = update(this.table).set(data).where(finalCondition);
     const { sql, params } = query.compile(this.dialect);
     await this.executor.executeSql(sql, params);
   }
   async executeRawUpdate(sql, params) {
-    await this.executor.executeSql(sql, params);
+    let scopedSql = sql;
+    const scopedParams = [...params];
+    let hasWhere = /\bWHERE\b/i.test(scopedSql);
+    for (const [key, value] of this.getScopeEntries()) {
+      scopedSql += hasWhere ? " AND " : " WHERE ";
+      scopedSql += `${this.quoteCol(key)} = ?`;
+      scopedParams.push(value);
+      hasWhere = true;
+    }
+    await this.executor.executeSql(scopedSql, scopedParams);
   }
   quoteTable() {
     const quote = this.getQuoteChar();