adapt-authoring-core 2.3.0 → 2.3.1

package/lib/Hook.js

@@ -96,13 +96,19 @@ class Hook {
    * @return {Promise}
    */
   async _invokeMiddleware (coreFn, ...args) {
-    let fn = coreFn
+    let coreResult
+    const wrappedCoreFn = async (...a) => {
+      coreResult = await coreFn(...a)
+      return coreResult
+    }
+    let fn = wrappedCoreFn
     for (let i = this._hookObservers.length - 1; i >= 0; i--) {
       const observer = this._hookObservers[i]
       const next = fn
       fn = (...a) => observer(next, ...a)
     }
-    return fn(...args)
+    const result = await fn(...args)
+    return result !== undefined ? result : coreResult
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-core",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "A bundle of reusable 'core' functionality",
   "homepage": "https://github.com/adapt-security/adapt-authoring-core",
   "license": "GPL-3.0",

package/tests/Hook.spec.js

@@ -483,6 +483,36 @@ describe('Hook', () => {
         const result = await hook.invoke(core, 1)
         assert.equal(result, 2)
       })
+
+      it('should fall back to core result when observer calls next() without returning', async () => {
+        const hook = new Hook({ type: Hook.Types.Middleware })
+        hook.tap(async (next, val) => {
+          await next(val) // calls next but doesn't return the result
+        })
+        const core = async (val) => val * 3
+        const result = await hook.invoke(core, 7)
+        assert.equal(result, 21)
+      })
+
+      it('should fall back to core result through multiple non-returning observers', async () => {
+        const hook = new Hook({ type: Hook.Types.Middleware })
+        hook.tap(async (next, val) => { await next(val) })
+        hook.tap(async (next, val) => { await next(val) })
+        const core = async (val) => ({ id: val })
+        const result = await hook.invoke(core, 42)
+        assert.deepEqual(result, { id: 42 })
+      })
+
+      it('should prefer explicit observer return over core result fallback', async () => {
+        const hook = new Hook({ type: Hook.Types.Middleware })
+        hook.tap(async (next, val) => {
+          await next(val)
+          return 'transformed'
+        })
+        const core = async (val) => val
+        const result = await hook.invoke(core, 'original')
+        assert.equal(result, 'transformed')
+      })
     })
   })