adapt-authoring-core 2.4.0 → 2.4.1

package/lib/DependencyLoader.js

@@ -131,6 +131,7 @@ class DependencyLoader {
       ...pkg,
       ...await fs.readJson(path.join(modDir, metadataFileName)),
       name: stripScope(pkg.name),
+      packageName: pkg.name,
       rootDir: modDir
     }
   }
@@ -150,7 +151,7 @@ class DependencyLoader {
     if (config.module === false) {
       return
     }
-    const { default: ModClass } = await import(modName)
+    const { default: ModClass } = await import(config.packageName)
 
     if (!_.isFunction(ModClass)) {
       throw new Error('Expected class to be exported')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-core",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "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

@@ -306,6 +306,36 @@ describe('DependencyLoader', () => {
 
       assert.equal(config.rootDir, testModuleDir)
     })
+
+    it('should store original package name as packageName', async () => {
+      const mockApp = { rootDir: '/test' }
+      const loader = new DependencyLoader(mockApp)
+
+      const config = await loader.loadModuleConfig(testModuleDir)
+
+      assert.equal(config.packageName, 'test-module')
+    })
+
+    it('should preserve scoped package name in packageName while stripping scope from name', async () => {
+      const scopedDir = path.join(__dirname, 'data', 'scoped-module')
+      await fs.ensureDir(scopedDir)
+      await fs.writeJson(path.join(scopedDir, 'package.json'), {
+        name: '@cgkineo/adapt-authoring-test',
+        version: '1.0.0'
+      })
+      await fs.writeJson(path.join(scopedDir, 'adapt-authoring.json'), {
+        module: true
+      })
+
+      const mockApp = { rootDir: '/test' }
+      const loader = new DependencyLoader(mockApp)
+      const config = await loader.loadModuleConfig(scopedDir)
+
+      assert.equal(config.name, 'adapt-authoring-test')
+      assert.equal(config.packageName, '@cgkineo/adapt-authoring-test')
+
+      await fs.remove(scopedDir)
+    })
   })
 
   describe('#loadModules()', () => {