adapt-authoring-adaptframework 2.3.0 → 2.3.2

package/lib/AdaptFrameworkBuild.js

@@ -1,5 +1,5 @@
 import _ from 'lodash'
-import { App, ensureDir, writeJson } from 'adapt-authoring-core'
+import { App, Hook, ensureDir, writeJson } from 'adapt-authoring-core'
 import { parseObjectId } from 'adapt-authoring-mongodb'
 import { createWriteStream } from 'node:fs'
 import AdaptCli from 'adapt-cli'
@@ -140,6 +140,16 @@ class AdaptFrameworkBuild {
      * @type {Array<Object>}
      */
     this.disabledPlugins = []
+    /**
+     * Invoked prior to a course being built.
+     * @type {Hook}
+     */
+    this.preBuildHook = new Hook({ mutable: true })
+    /**
+      * Invoked after a course has been built.
+      * @type {Hook}
+      */
+    this.postBuildHook = new Hook({ mutable: true })
   }
 
   /**
@@ -180,6 +190,8 @@ class AdaptFrameworkBuild {
         linkNodeModules: !this.isExport
       })
     ])
+    await this.preBuildHook.invoke(this)
+
     await this.writeContentJson()
 
     logDir('courseDir', this.courseDir)
@@ -206,6 +218,8 @@ class AdaptFrameworkBuild {
     } else {
       this.location = this.isPreview ? path.join(this.dir, 'build') : this.dir
     }
+    await this.postBuildHook.invoke(this)
+
     this.buildData = await this.recordBuildAttempt()
 
     return this

package/lib/AdaptFrameworkImport.js

@@ -1,4 +1,4 @@
-import { App, spawn, readJson, writeJson } from 'adapt-authoring-core'
+import { App, Hook, spawn, readJson, writeJson } from 'adapt-authoring-core'
 import { parseObjectId } from 'adapt-authoring-mongodb'
 import fs from 'node:fs/promises'
 import { glob } from 'glob'
@@ -194,6 +194,15 @@ class AdaptFrameworkImport {
       updatePlugins,
       removeSource
     }
+    /**
+     * Invoked before the import process has started
+     */
+    this.preImportHook = new Hook()
+    /**
+     * Invoked once the import process has completed
+     */
+    this.postImportHook = new Hook()
+
     /**
      * plugins on import that are of a lower version than the installed version
      * @type {Array}
@@ -255,6 +264,7 @@ class AdaptFrameworkImport {
         [this.prepare],
         [this.loadAssetData],
         [this.loadPluginData],
+        [() => this.preImportHook.invoke(this)],
         [this.importTags, importContent],
         [this.importCourseAssets, importContent],
         [this.importCoursePlugins, isDryRun && importPlugins],
@@ -268,6 +278,7 @@ class AdaptFrameworkImport {
       for (const task of tasks) {
         if (task.length < 2 || task[1]) await task[0].call(this)
       }
+      await this.postImportHook.invoke(this)
     } catch (e) {
       error = e
     }

package/lib/AdaptFrameworkModule.js

@@ -262,16 +262,12 @@ class AdaptFrameworkModule extends AbstractModule {
    */
   async buildCourse (options) {
     const builder = new AdaptFrameworkBuild(options)
-    const core = async () => {
-      await this.preBuildHook.invoke(builder)
-      await builder.build()
-      await this.postBuildHook.invoke(builder)
-      return builder
-    }
+    builder.preBuildHook.tap(() => this.preBuildHook.invoke(builder))
+    builder.postBuildHook.tap(() => this.postBuildHook.invoke(builder))
     if (this.buildHook.hasObservers) {
-      return this.buildHook.invoke(core, builder)
+      return this.buildHook.invoke(async () => builder.build(), builder)
     }
-    return core()
+    return builder.build()
   }
 
   /**
@@ -281,16 +277,12 @@ class AdaptFrameworkModule extends AbstractModule {
    */
   async importCourse (options) {
     const importer = new AdaptFrameworkImport(options)
-    const core = async () => {
-      await this.preImportHook.invoke(importer)
-      await importer.import()
-      await this.postImportHook.invoke(importer)
-      return importer
-    }
+    importer.preImportHook.tap(() => this.preImportHook.invoke(importer))
+    importer.postImportHook.tap(() => this.postImportHook.invoke(importer))
     if (this.importHook.hasObservers) {
-      return this.importHook.invoke(core, importer)
+      return this.importHook.invoke(async () => importer.import(), importer)
     }
-    return core()
+    return importer.import()
   }
 }
 

package/lib/utils/slugifyTitle.js

@@ -7,7 +7,7 @@ import { App } from 'adapt-authoring-core'
  */
 export async function slugifyTitle (buildData) {
   const content = await App.instance.waitForModule('content')
-  const [course] = await content.find({ _id: buildData.courseId })
+  const course = await content.findOne({ _id: buildData.courseId })
   const sanitisedTitle = course.title
     .toLowerCase()
     .trim()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-adaptframework",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Adapt framework integration for the Adapt authoring tool",
   "homepage": "https://github.com/adapt-security/adapt-authoring-adaptframework",
   "license": "GPL-3.0",