adapt-authoring-core 1.9.0 → 1.9.2

package/docs/cover-manual.md

@@ -6,6 +6,6 @@
 
 > Handy guides and how-to information to help understand and make use of the Adapt authoring tool APIs in a practical way.
 
-[<i class="material-icons">download</i> Install](install)
+[<i class="material-icons">download</i> Install](install-update-run)
 [<i class="material-icons">settings</i> Configure](configuration)
 [<i class="material-icons">flight_takeoff</i> Run](run)

package/lib/AbstractModule.js

@@ -74,6 +74,7 @@ class AbstractModule {
     if (!error) {
       this._isReady = true
     }
+    /** @ignore */ this._initError = error
     this.initTime = Math.round((Date.now() - this._startTime))
     this.log('verbose', AbstractModule.MODULE_READY, this.initTime)
     await this.readyHook.invoke(error)
@@ -86,7 +87,10 @@ class AbstractModule {
   async onReady () {
     return new Promise((resolve, reject) => {
       if (this._isReady) {
-        return this._initError ? reject(this._initError) : resolve(this)
+        return resolve(this)
+      }
+      if (this._initError) {
+        return reject(this._initError)
       }
       this.readyHook.tap(error => {
         /** @ignore */this._initError = error

package/lib/Hook.js

@@ -58,7 +58,7 @@ class Hook {
    * @returns Promise
    */
   onInvoke () {
-    return new Promise((resolve, reject) => this._hookObservers.push([resolve, reject]))
+    return new Promise((resolve, reject) => this._promiseObservers.push([resolve, reject]))
   }
 
   /**

package/package.json

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

package/tests/DependencyLoader.spec.js

@@ -455,11 +455,6 @@ describe('DependencyLoader', () => {
       assert.equal(result, mockInstance)
     })
 
-    // TODO: Bug - Hook.onInvoke() pushes [resolve, reject] to _hookObservers where
-    // invoke() tries to call it as a function, causing TypeError. The _promiseObservers
-    // array that should handle these promises is never populated. This means
-    // waitForModule() hangs when called before configs are loaded.
-
     it('should resolve via moduleLoadedHook when module not yet loaded', async () => {
       const mockApp = { rootDir: '/test' }
       const loader = new DependencyLoader(mockApp)

package/tests/Hook.spec.js

@@ -342,12 +342,6 @@ describe('Hook', () => {
         assert.deepEqual(arr, [1, 2, 3])
       })
     })
-
-    // TODO: Bug - onInvoke() pushes a [resolve, reject] array to _hookObservers.
-    // When invoke() runs, it tries to call this array as a function, which throws
-    // TypeError. The promise returned by onInvoke() is never resolved or rejected
-    // because _promiseObservers is never populated. This makes onInvoke() unusable
-    // with invoke() - the onInvoke promise will hang forever.
   })
 
   describe('#onInvoke()', () => {
@@ -357,17 +351,17 @@ describe('Hook', () => {
       assert.ok(result instanceof Promise)
     })
 
-    it('should add an entry to hook observers', () => {
+    it('should add an entry to promise observers', () => {
       const hook = new Hook()
-      assert.equal(hook.hasObservers, false)
+      assert.equal(hook._promiseObservers.length, 0)
       hook.onInvoke()
-      assert.equal(hook.hasObservers, true)
+      assert.equal(hook._promiseObservers.length, 1)
     })
 
-    it('should add a resolve/reject pair as observer', () => {
+    it('should add a resolve/reject pair as promise observer', () => {
       const hook = new Hook()
       hook.onInvoke()
-      const observer = hook._hookObservers[0]
+      const observer = hook._promiseObservers[0]
       assert.ok(Array.isArray(observer))
       assert.equal(observer.length, 2)
     })