Skip to content

fix: broken tests from middleware add #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dustintownsend merged 1 commit into from
Nov 24, 2025
Merged

fix: broken tests from middleware add #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/mizzle-orm/src/middlewares/__tests__/builtin.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ describe('Built-in Middlewares', () => {
dbName: 'test',
schema,
middlewares: [
onOperations(['create', 'update'], async (ctx, next) => {
onOperations(['create', 'updateById'], async (ctx, next) => {
executedOperations.push(ctx.operation);
return next();
}),
Expand Down
2 changes: 1 addition & 1 deletion packages/mizzle-orm/src/middlewares/__tests__/middleware.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ describe('Middleware System', () => {
// Delete
await db().users.deleteById(user._id);

expect(operations).toEqual(['create', 'findOne', 'findById', 'findMany', 'count', 'updateById', 'delete']);
expect(operations).toEqual(['create', 'findOne', 'findById', 'findMany', 'count', 'updateById', 'deleteById']);

await db.close();
});
Expand Down
214 changes: 120 additions & 94 deletions packages/mizzle-orm/src/query/collection-facade.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,13 @@ export class CollectionFacade<
*/
async updateById(id: string | ObjectId, data: TUpdate): Promise<TDoc | null> {
const filter = this.buildIdFilter(id);
return this.updateOne(filter, data);
return this.executeWithMiddlewares(
'updateById',
async () => {
return this.updateOneInternal(filter, data);
},
{ filter, data },
);
}

/**
Expand All @@ -351,73 +357,80 @@ export class CollectionFacade<
return this.executeWithMiddlewares(
'update',
async () => {
const finalFilter = this.applyPolicies(filter);

// Get old document for hooks and policies
const oldDoc = await this.collection.findOne(finalFilter, {
session: this.ctx.session,
});
if (!oldDoc) {
return null;
}

// Apply update timestamp
const updateData = this.applyUpdateTimestamps(data as any);
return this.updateOneInternal(filter, data);
},
{ filter, data, oldDoc: undefined }, // oldDoc will be fetched inside
);
}

// Run before hooks
let finalUpdate = updateData;
if (this.collectionDef._meta.hooks.beforeUpdate) {
finalUpdate = await this.collectionDef._meta.hooks.beforeUpdate(
this.ctx,
oldDoc as any,
updateData,
);
}
/**
* Internal update logic (shared by updateOne and updateById)
*/
private async updateOneInternal(filter: Filter<TDoc>, data: TUpdate): Promise<TDoc | null> {
const finalFilter = this.applyPolicies(filter);

// Check policies
if (this.collectionDef._meta.policies.canUpdate) {
const allowed = await this.collectionDef._meta.policies.canUpdate(
this.ctx,
oldDoc as any,
finalUpdate,
);
if (!allowed) {
throw new Error('Update not allowed by policy');
}
}
// Get old document for hooks and policies
const oldDoc = await this.collection.findOne(finalFilter, {
session: this.ctx.session,
});
if (!oldDoc) {
return null;
}

// Validate references
await this.relationHelper.validateReferences(finalUpdate as any);
// Apply update timestamp
const updateData = this.applyUpdateTimestamps(data as any);

// Process forward embeds (fetch and embed referenced data)
finalUpdate = (await this.relationHelper.processForwardEmbeds(finalUpdate as any)) as any;

// Update
const result = await this.collection.findOneAndUpdate(
finalFilter,
{ $set: finalUpdate } as any,
{
returnDocument: 'after',
session: this.ctx.session,
},
);
// Run before hooks
let finalUpdate = updateData;
if (this.collectionDef._meta.hooks.beforeUpdate) {
finalUpdate = await this.collectionDef._meta.hooks.beforeUpdate(
this.ctx,
oldDoc as any,
updateData,
);
}

if (!result) {
return null;
}
// Check policies
if (this.collectionDef._meta.policies.canUpdate) {
const allowed = await this.collectionDef._meta.policies.canUpdate(
this.ctx,
oldDoc as any,
finalUpdate,
);
if (!allowed) {
throw new Error('Update not allowed by policy');
}
}

// Run after hooks
if (this.collectionDef._meta.hooks.afterUpdate) {
await this.collectionDef._meta.hooks.afterUpdate(this.ctx, oldDoc as any, result as any);
}
// Validate references
await this.relationHelper.validateReferences(finalUpdate as any);

// Propagate reverse embeds if this collection is a source for any embeds
await this.propagateReverseEmbeds(result as TDoc, finalUpdate);
// Process forward embeds (fetch and embed referenced data)
finalUpdate = (await this.relationHelper.processForwardEmbeds(finalUpdate as any)) as any;

return result as TDoc;
// Update
const result = await this.collection.findOneAndUpdate(
finalFilter,
{ $set: finalUpdate } as any,
{
returnDocument: 'after',
session: this.ctx.session,
},
{ filter, data, oldDoc: undefined }, // oldDoc will be fetched inside
);

if (!result) {
return null;
}

// Run after hooks
if (this.collectionDef._meta.hooks.afterUpdate) {
await this.collectionDef._meta.hooks.afterUpdate(this.ctx, oldDoc as any, result as any);
}

// Propagate reverse embeds if this collection is a source for any embeds
await this.propagateReverseEmbeds(result as TDoc, finalUpdate);

return result as TDoc;
}

/**
Expand Down Expand Up @@ -445,7 +458,13 @@ export class CollectionFacade<
*/
async deleteById(id: string | ObjectId): Promise<boolean> {
const filter = this.buildIdFilter(id);
return this.deleteOne(filter);
return this.executeWithMiddlewares(
'deleteById',
async () => {
return this.deleteOneInternal(filter);
},
{ filter },
);
}

/**
Expand All @@ -455,48 +474,55 @@ export class CollectionFacade<
return this.executeWithMiddlewares(
'delete',
async () => {
const finalFilter = this.applyPolicies(filter);
return this.deleteOneInternal(filter);
},
{ filter },
);
}

// Get document for hooks and policies
const doc = await this.collection.findOne(finalFilter, {
session: this.ctx.session,
});
if (!doc) {
return false;
}
/**
* Internal delete logic (shared by deleteOne and deleteById)
*/
private async deleteOneInternal(filter: Filter<TDoc>): Promise<boolean> {
const finalFilter = this.applyPolicies(filter);

// Run before hooks
if (this.collectionDef._meta.hooks.beforeDelete) {
await this.collectionDef._meta.hooks.beforeDelete(this.ctx, doc as any);
}
// Get document for hooks and policies
const doc = await this.collection.findOne(finalFilter, {
session: this.ctx.session,
});
if (!doc) {
return false;
}

// Check policies
if (this.collectionDef._meta.policies.canDelete) {
const allowed = await this.collectionDef._meta.policies.canDelete(this.ctx, doc as any);
if (!allowed) {
throw new Error('Delete not allowed by policy');
}
}
// Run before hooks
if (this.collectionDef._meta.hooks.beforeDelete) {
await this.collectionDef._meta.hooks.beforeDelete(this.ctx, doc as any);
}

// Delete
const result = await this.collection.deleteOne(finalFilter, {
session: this.ctx.session,
});
// Check policies
if (this.collectionDef._meta.policies.canDelete) {
const allowed = await this.collectionDef._meta.policies.canDelete(this.ctx, doc as any);
if (!allowed) {
throw new Error('Delete not allowed by policy');
}
}

// Run after hooks
if (result.deletedCount > 0 && this.collectionDef._meta.hooks.afterDelete) {
await this.collectionDef._meta.hooks.afterDelete(this.ctx, doc as any);
}
// Delete
const result = await this.collection.deleteOne(finalFilter, {
session: this.ctx.session,
});

// Handle delete cascades
if (result.deletedCount > 0) {
await this.handleDeleteCascades(doc as TDoc);
}
// Run after hooks
if (result.deletedCount > 0 && this.collectionDef._meta.hooks.afterDelete) {
await this.collectionDef._meta.hooks.afterDelete(this.ctx, doc as any);
}

return result.deletedCount > 0;
},
{ filter },
);
// Handle delete cascades
if (result.deletedCount > 0) {
await this.handleDeleteCascades(doc as TDoc);
}

return result.deletedCount > 0;
}

/**
Expand Down