adapt-authoring-core 2.3.0 → 2.4.0

package/docs/plugins/coremodules.js

@@ -11,7 +11,7 @@ export default class CoreModules {
 
   async getWorkflowBadges (homepage) {
     if (!homepage) return []
-    const workflows = ['tests', 'standardjs']
+    const workflows = ['tests', 'standardjs', 'releases']
     const results = await Promise.all(workflows.map(async w => {
       const url = `${homepage}/actions/workflows/${w}.yml`
       const badgeUrl = `${url}/badge.svg`

package/lib/DependencyLoader.js

@@ -4,7 +4,7 @@ import fs from 'fs-extra'
 import { glob } from 'glob'
 import path from 'path'
 import Hook from './Hook.js'
-import { metadataFileName, packageFileName } from './Utils.js'
+import { metadataFileName, packageFileName, stripScope } from './Utils.js'
 /**
  * Handles the loading of Adapt authoring tool module dependencies.
  * @memberof core
@@ -126,9 +126,11 @@ class DependencyLoader {
    * @return {Promise<Object>} Resolves with configuration object
    */
   async loadModuleConfig (modDir) {
+    const pkg = await fs.readJson(path.join(modDir, packageFileName))
     return {
-      ...await fs.readJson(path.join(modDir, packageFileName)),
+      ...pkg,
       ...await fs.readJson(path.join(modDir, metadataFileName)),
+      name: stripScope(pkg.name),
       rootDir: modDir
     }
   }

package/lib/Hook.js

@@ -96,13 +96,19 @@ class Hook {
    * @return {Promise}
    */
   async _invokeMiddleware (coreFn, ...args) {
-    let fn = coreFn
+    let coreResult
+    const wrappedCoreFn = async (...a) => {
+      coreResult = await coreFn(...a)
+      return coreResult
+    }
+    let fn = wrappedCoreFn
     for (let i = this._hookObservers.length - 1; i >= 0; i--) {
       const observer = this._hookObservers[i]
       const next = fn
       fn = (...a) => observer(next, ...a)
     }
-    return fn(...args)
+    const result = await fn(...args)
+    return result !== undefined ? result : coreResult
   }
 }
 

package/lib/Utils.js

@@ -8,4 +8,5 @@ export { toBoolean } from './utils/toBoolean.js'
 export { ensureDir } from './utils/ensureDir.js'
 export { escapeRegExp } from './utils/escapeRegExp.js'
 export { stringifyValues } from './utils/stringifyValues.js'
+export { stripScope } from './utils/stripScope.js'
 export { loadDependencyFiles } from './utils/loadDependencyFiles.js'

package/lib/utils/stripScope.js

@@ -0,0 +1,11 @@
+/**
+ * Strips the npm scope prefix from a package name (e.g. '@cgkineo/adapt-authoring-foo' becomes 'adapt-authoring-foo')
+ * @param {string} name - The package name
+ * @returns {string} The name without scope prefix
+ */
+export function stripScope (name) {
+  if (typeof name === 'string' && name.startsWith('@')) {
+    return name.replace(/^@[^/]+\//, '')
+  }
+  return name
+}

package/package.json

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

@@ -292,7 +292,7 @@ describe('DependencyLoader', () => {
       const loader = new DependencyLoader(mockApp)
       const config = await loader.loadModuleConfig(overrideDir)
 
-      assert.equal(config.name, 'adapt-name')
+      assert.equal(config.name, 'pkg-name')
       assert.equal(config.description, 'from adapt')
 
       await fs.remove(overrideDir)

package/tests/Hook.spec.js

@@ -483,6 +483,36 @@ describe('Hook', () => {
         const result = await hook.invoke(core, 1)
         assert.equal(result, 2)
       })
+
+      it('should fall back to core result when observer calls next() without returning', async () => {
+        const hook = new Hook({ type: Hook.Types.Middleware })
+        hook.tap(async (next, val) => {
+          await next(val) // calls next but doesn't return the result
+        })
+        const core = async (val) => val * 3
+        const result = await hook.invoke(core, 7)
+        assert.equal(result, 21)
+      })
+
+      it('should fall back to core result through multiple non-returning observers', async () => {
+        const hook = new Hook({ type: Hook.Types.Middleware })
+        hook.tap(async (next, val) => { await next(val) })
+        hook.tap(async (next, val) => { await next(val) })
+        const core = async (val) => ({ id: val })
+        const result = await hook.invoke(core, 42)
+        assert.deepEqual(result, { id: 42 })
+      })
+
+      it('should prefer explicit observer return over core result fallback', async () => {
+        const hook = new Hook({ type: Hook.Types.Middleware })
+        hook.tap(async (next, val) => {
+          await next(val)
+          return 'transformed'
+        })
+        const core = async (val) => val
+        const result = await hook.invoke(core, 'original')
+        assert.equal(result, 'transformed')
+      })
     })
   })
 

package/tests/utils-stripScope.spec.js

@@ -0,0 +1,54 @@
+import { describe, it } from 'node:test'
+import assert from 'node:assert/strict'
+
+import { stripScope } from '../lib/utils/stripScope.js'
+
+describe('stripScope()', () => {
+  it('should strip a single-word scope', () => {
+    assert.equal(stripScope('@myorg/my-package'), 'my-package')
+  })
+
+  it('should strip a hyphenated scope', () => {
+    assert.equal(stripScope('@my-org/my-package'), 'my-package')
+  })
+
+  it('should strip a scope containing a dot', () => {
+    assert.equal(stripScope('@my.org/my-package'), 'my-package')
+  })
+
+  it('should strip a scope containing an underscore', () => {
+    assert.equal(stripScope('@my_org/my-package'), 'my-package')
+  })
+
+  it('should strip a scope containing numbers', () => {
+    assert.equal(stripScope('@org123/my-package'), 'my-package')
+  })
+
+  it('should return an unscoped name unchanged', () => {
+    assert.equal(stripScope('my-package'), 'my-package')
+  })
+
+  it('should return a short name unchanged', () => {
+    assert.equal(stripScope('lodash'), 'lodash')
+  })
+
+  it('should return an empty string unchanged', () => {
+    assert.equal(stripScope(''), '')
+  })
+
+  it('should return undefined unchanged', () => {
+    assert.equal(stripScope(undefined), undefined)
+  })
+
+  it('should return null unchanged', () => {
+    assert.equal(stripScope(null), null)
+  })
+
+  it('should handle scope with nested slashes in package name', () => {
+    assert.equal(stripScope('@scope/name/extra'), 'name/extra')
+  })
+
+  it('should handle @ in the middle of a name', () => {
+    assert.equal(stripScope('name@2.0.0'), 'name@2.0.0')
+  })
+})