adapt-authoring-core 2.1.2 → 2.1.3

package/lib/DependencyLoader.js

@@ -93,27 +93,29 @@ class DependencyLoader {
       .map(d => d.replace(`${metadataFileName}`, ''))
       .sort((a, b) => a.length < b.length ? -1 : 1)
 
-    const configCache = {}
-    await Promise.all(deps.map(async d => {
+    // sort so that core is loaded first, as other modules may use its config values
+    const corePathSegment = `/${this.app.name}/`
+    deps.sort((a, b) => {
+      if (a.endsWith(corePathSegment)) return -1
+      if (b.endsWith(corePathSegment)) return 1
+      return 0
+    })
+    for (const d of deps) {
       try {
-        configCache[d] = await this.loadModuleConfig(d)
+        const c = await this.loadModuleConfig(d)
+        if (!this.configs[c.name]) {
+          this.configs[c.name] = c
+          if (c.peerDependencies) {
+            Object.keys(c.peerDependencies).forEach(p => {
+              this.peerDependencies[p] = [...(this.peerDependencies[p] || []), c.name]
+            })
+          }
+        }
       } catch (e) {
         this.logError(`Failed to load config for '${d}', module will not be loaded`)
         this.logError(e)
       }
-    }))
-    deps.forEach(d => {
-      const c = configCache[d]
-      if (this.configs[c.name]) {
-        return
-      }
-      this.configs[c.name] = c
-      if (c.peerDependencies) {
-        Object.keys(c.peerDependencies).forEach(p => {
-          this.peerDependencies[p] = [...(this.peerDependencies[p] || []), c.name]
-        })
-      }
-    })
+    }
     this._configsLoaded = true
     await this.configsLoadedHook.invoke()
   }

package/package.json

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

@@ -206,6 +206,39 @@ describe('DependencyLoader', () => {
     })
   })
 
+  describe('#loadConfigs()', () => {
+    let testRootDir
+
+    before(async () => {
+      testRootDir = path.join(__dirname, 'data', 'loadconfigs-root')
+      // create mock node_modules with core and modules that sort before it alphabetically
+      const authDir = path.join(testRootDir, 'node_modules', 'adapt-authoring-auth')
+      const configDir = path.join(testRootDir, 'node_modules', 'adapt-authoring-config')
+      const coreDir = path.join(testRootDir, 'node_modules', 'adapt-authoring-core')
+      await fs.ensureDir(authDir)
+      await fs.ensureDir(configDir)
+      await fs.ensureDir(coreDir)
+      await fs.writeJson(path.join(authDir, 'package.json'), { name: 'adapt-authoring-auth' })
+      await fs.writeJson(path.join(authDir, 'adapt-authoring.json'), { module: true })
+      await fs.writeJson(path.join(configDir, 'package.json'), { name: 'adapt-authoring-config' })
+      await fs.writeJson(path.join(configDir, 'adapt-authoring.json'), { module: true })
+      await fs.writeJson(path.join(coreDir, 'package.json'), { name: 'adapt-authoring-core' })
+      await fs.writeJson(path.join(coreDir, 'adapt-authoring.json'), { module: false })
+    })
+
+    after(async () => {
+      await fs.remove(testRootDir)
+    })
+
+    it('should load core config first', async () => {
+      const mockApp = { rootDir: testRootDir, name: 'adapt-authoring-core' }
+      const loader = new DependencyLoader(mockApp)
+      await loader.loadConfigs()
+      const names = Object.keys(loader.configs)
+      assert.equal(names[0], 'adapt-authoring-core')
+    })
+  })
+
   describe('#loadModuleConfig()', () => {
     let testModuleDir