Revert .find hook changes

Author: harryadel

packages/meteor-collection-hooks/find.js

@@ -6,8 +6,8 @@ const ASYNC_METHODS = ['countAsync', 'fetchAsync', 'forEachAsync', 'mapAsync']
  * With Meteor v3 this behaves differently than with Meteor v2.
  * We cannot use async hooks on find() directly because in Meteor it is a sync method that returns cursor instance.
  *
- * Modified to preserve v2 behavior: after.find hooks fire immediately when find() is called,
- * while also maintaining async method wrapping for backward compatibility.
+ * That's why we need to wrap all async methods of cursor instance. We're doing this by creating another cursor
+ * within these wrapped methods with selector and options updated by before hooks.
  */
 CollectionHooks.defineWrapper('find', function (userId, _super, instance, hooks, getTransform, args, suppressHooks) {
   const selector = CollectionHooks.normalizeSelector(instance._getFindSelector(args))
@@ -24,35 +24,19 @@ CollectionHooks.defineWrapper('find', function (userId, _super, instance, hooks,
 
   const cursor = _super.call(this, selector, options)
 
-  // PRESERVE V2 BEHAVIOR: Apply synchronous after hooks immediately
-  hooks.after.forEach(hook => {
-    if (!hook.hook.constructor.name.includes('Async')) {
-      hook.hook.call(this, userId, selector, options, cursor)
-    }
-  })
-
-  // Track which hooks have been called to avoid double execution
-  const immediateHooksExecuted = new Set()
-  hooks.after.forEach((hook, index) => {
-    if (!hook.hook.constructor.name.includes('Async')) {
-      immediateHooksExecuted.add(index)
-    }
-  })
-
-  // Wrap async cursor methods (for backward compatibility and async hooks)
+  // Wrap async cursor methods
   ASYNC_METHODS.forEach((method) => {
     if (cursor[method]) {
       const originalMethod = cursor[method]
       cursor[method] = async function (...args) {
         // Do not try to apply asynchronous before hooks here because they act on the cursor which is already defined
         const result = await originalMethod.apply(this, args)
 
-        // Apply after hooks (skip already executed synchronous hooks)
-        for (const [index, hook] of hooks.after.entries()) {
+        // Apply after hooks
+        for (const hook of hooks.after) {
           if (hook.hook.constructor.name.includes('Async')) {
             await hook.hook.call(this, userId, selector, options, this)
-          } else if (!immediateHooksExecuted.has(index)) {
-            // Only call sync hooks that weren't already executed immediately
+          } else {
             hook.hook.call(this, userId, selector, options, this)
           }
         }
@@ -63,4 +47,4 @@ CollectionHooks.defineWrapper('find', function (userId, _super, instance, hooks,
   })
 
   return cursor
-})
+})