adapt-authoring-adaptframework 2.0.2 → 2.0.3

package/lib/AdaptFrameworkBuild.js

@@ -1,5 +1,6 @@
 import _ from 'lodash'
 import { App, Hook, ensureDir, writeJson } from 'adapt-authoring-core'
+import { parse as parseObjectId } from 'adapt-authoring-mongodb'
 import { createWriteStream } from 'fs'
 import AdaptCli from 'adapt-cli'
 import { log, logDir, logMemory, copyFrameworkSource } from './utils.js'
@@ -254,10 +255,10 @@ class AdaptFrameworkBuild {
    * @return {Promise}
    */
   async loadAssetData () {
-    const [assets, courseassets, mongodb, tags] = await App.instance.waitForModule('assets', 'courseassets', 'mongodb', 'tags')
+    const [assets, courseassets, tags] = await App.instance.waitForModule('assets', 'courseassets', 'tags')
 
     const caRecs = await courseassets.find({ courseId: this.courseId })
-    const uniqueAssetIds = new Set(caRecs.map(c => mongodb.ObjectId.parse(c.assetId)))
+    const uniqueAssetIds = new Set(caRecs.map(c => parseObjectId(c.assetId)))
     const usedAssets = await assets.find({ _id: { $in: [...uniqueAssetIds] } })
 
     const usedTagIds = new Set(usedAssets.reduce((m, a) => [...m, ...(a.tags ?? [])], []))

package/lib/AdaptFrameworkImport.js

@@ -1,4 +1,5 @@
 import { App, Hook, spawn, readJson, writeJson } from 'adapt-authoring-core'
+import { parse as parseObjectId } from 'adapt-authoring-mongodb'
 import fs from 'fs/promises'
 import { glob } from 'glob'
 import octopus from 'adapt-octopus'
@@ -877,8 +878,7 @@ class AdaptFrameworkImport {
         }
         let _courseId
         try {
-          const { ObjectId } = await App.instance.waitForModule('mongodb')
-          _courseId = ObjectId.parse(this.idMap[this.contentJson.course._id])
+          _courseId = parseObjectId(this.idMap[this.contentJson.course._id])
         } catch (e) {}
         if (_courseId) {
           tasks.push(

package/package.json

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