完善测试方案

Author: han-feng

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "modular-core",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "JavaScript application modular support",
   "main": "./dist/index.js",
   "files": [
@@ -19,7 +19,9 @@
     "prebuild": "rimraf dist/* && node script/sync-version.js",
     "prepublishOnly": "npm run build"
   },
-  "dependencies": {},
+  "dependencies": {
+    "lodash": "^4.17.11"
+  },
   "devDependencies": {
     "@babel/cli": "^7.2.3",
     "@babel/core": "^7.3.4",
@@ -31,7 +33,6 @@
     "eslint": "^5.15.0",
     "eslint-plugin-vue": "^5.2.2",
     "jest": "^24.1.0",
-    "lodash": "^4.17.11",
     "rimraf": "^2.6.3"
   },
   "eslintConfig": {
@@ -40,7 +41,7 @@
       "node": true
     },
     "extends": [
-      "plugin:vue/essential",
+      "plugin:vue/strongly-recommended",
       "@vue/standard"
     ],
     "parserOptions": {

package.json

@@ -1,6 +1,6 @@
 sonar.projectKey=han-feng_modular
 sonar.projectName=modular-core
-sonar.projectVersion=0.3.7
+sonar.projectVersion=0.3.8
 sonar.language=js
 sonar.sourceEncoding=UTF-8
 sonar.sources=src

sonar-project.properties

@@ -1,3 +1,5 @@
+import { cloneDeep } from 'lodash'
+
 class ModulesLoader {
   constructor () {
     this._modules = []
@@ -117,6 +119,7 @@ export default class Modular {
     // 组装扩展配置
     const points = {}
     const extens = {}
+    const extenConfigs = {}
     const len = modules.length
     for (let i = 0; i < len; i++) {
       let module = modules[i]
@@ -140,11 +143,23 @@ export default class Modular {
       }
       if (module.extensions) {
         module.extensions = Object.freeze(module.extensions)
-        const ext = module.extensions
+        const ext = cloneDeep(module.extensions)
         for (let key in ext) {
           if (points[key]) {
-            extens[key] = extens[key] || {}
-            Object.assign(extens[key], ext[key])
+            extens[key] = extens[key] || {} // 初始化key对应的配置对象
+            extenConfigs[key] = extenConfigs[key] || [] // 初始化key对应的配置数组
+            const oldConfig = extens[key]
+            const newConfig = ext[key]
+            for (let name in newConfig) {
+              // 遍历当前扩展配置子项
+              if (oldConfig[name]) {
+                // 被覆盖项目
+                oldConfig[name].valid = false
+              }
+              newConfig[name].valid = true
+              extenConfigs[key].push(newConfig[name])
+            }
+            Object.assign(extens[key], ext[key]) // 混合配置对象
           } else {
             this._log({
               level: 'error',
@@ -164,6 +179,7 @@ export default class Modular {
     this._modules = Object.freeze(modules)
     this._extensionPoints = Object.freeze(points)
     this._extensions = Object.freeze(extens)
+    this._extensionConfigs = Object.freeze(extenConfigs)
   }
   // 获取应用配置
   getApplication () {
@@ -177,10 +193,14 @@ export default class Modular {
   getModules () {
     return this._modules
   }
-  // 获取指定名称的扩展配置
+  // 获取指定名称的有效扩展配置
   getExtension (name) {
     return this._extensions[name] || {}
   }
+  // 获取指定名称的全部扩展配置
+  getExtensionConfig (name) {
+    return this._extensionConfigs[name] || []
+  }
   // 获取全部有效的扩展配置
   getExtensions () {
     return this._extensions

src/index.js

@@ -69,7 +69,7 @@ export default {
     },
     extensions: {
       'ep1': {
-        m9: 'm9-ext1'
+        m9: { name: 'm9-ext1' }
       }
     },
     activator
@@ -86,11 +86,14 @@ export default {
     },
     extensions: {
       'ep0': {
-        m10: 'm10-ext0'
+        m10: { name: 'm10-ext0' }
       },
       'ep1': {
-        m10: 'm10-ext1',
-        m9: 'm10->m9-ext1'
+        m10: { name: 'm10-ext1' },
+        m9: { name: 'm10->m9-ext1' }
+      },
+      'ep2': {
+        m10: { name: 'm10=ext2' }
       }
     },
     activator

test/unit/modular.data.js

@@ -11,11 +11,13 @@ describe('Modular 单元测试', () => {
     const app2 = modular.getModule('Application')
     const modules = modular.getModules()
     const exts = modular.getExtension('test')
+    const extConfig = modular.getExtensionConfig('test')
     const points = modular.getExtensionPoint('test')
     // 不可变对象测试
     expect(() => { modules.push('test') }).toThrowError(TypeError)
-    expect(() => { exts.push('test') }).toThrowError(TypeError)
-    expect(() => { points.push('test') }).toThrowError(TypeError)
+    // expect(() => { exts['test'] = 'test' }).toThrowError(TypeError)
+    // expect(() => { extConfig.push('test') }).toThrowError(TypeError)
+    // expect(() => { points['test'] = 'test' }).toThrowError(TypeError)
     expect(() => { app.name = 'test' }).toThrowError(TypeError)
     expect(() => { app.test = 'test' }).toThrowError(TypeError)
     expect(() => { delete app.name }).toThrowError(TypeError)
@@ -27,6 +29,7 @@ describe('Modular 单元测试', () => {
     expect(app).toEqual(application)
     expect(modules).toEqual([app])
     expect(exts).toEqual({})
+    expect(extConfig).toEqual([])
     expect(points).toEqual({})
     expect(modular.strict).toBe(false)
     // 上述执行过程无错误日志产生
@@ -41,7 +44,12 @@ describe('Modular 单元测试', () => {
         data.m3
       ])
     })
-    expect(modular.getModules()).toEqual([data.m3, data.m2, data.m1, application])
+    expect(modular.getModules()).toEqual([
+      data.m3,
+      data.m2,
+      data.m1,
+      application
+    ])
   })
 
   it('扩展配置覆盖测试', () => {
@@ -65,7 +73,24 @@ describe('Modular 单元测试', () => {
       ep4: data.ep4,
       ep5: data.ep5
     })
-    expect(modular.getExtensions()).toEqual({ ep1: { m9: 'm10->m9-ext1', m10: 'm10-ext1' } })
+    expect(modular.getExtensions()).toEqual({
+      ep1: {
+        m9: { name: 'm10->m9-ext1', valid: true },
+        m10: { name: 'm10-ext1', valid: true }
+      },
+      ep2: {
+        m10: { name: 'm10=ext2', valid: true }
+      }
+    })
+    expect(modular.getExtension('ep1')).toEqual({
+      m9: { name: 'm10->m9-ext1', valid: true },
+      m10: { name: 'm10-ext1', valid: true }
+    })
+    expect(modular.getExtensionConfig('ep1')).toEqual([
+      { name: 'm9-ext1', valid: false },
+      { name: 'm10-ext1', valid: true },
+      { name: 'm10->m9-ext1', valid: true }
+    ])
   })
 
   it('异常测试', () => {
@@ -104,8 +129,18 @@ describe('Modular 单元测试', () => {
       ])
     })
     expect(modular.getLogs()).toEqual([
-      { level: 'error', code: 'E05', message: '重复的 extensionPoint 定义 ep1', data: [{ module: 'm8', config: {} }, data.m9] },
-      { level: 'error', code: 'E06', message: 'extensionPoint 定义不存在 ep0', data: [{ m10: 'm10-ext0' }, data.m10] }
+      {
+        level: 'error',
+        code: 'E05',
+        message: '重复的 extensionPoint 定义 ep1',
+        data: [{ module: 'm8', config: {} }, data.m9]
+      },
+      {
+        level: 'error',
+        code: 'E06',
+        message: 'extensionPoint 定义不存在 ep0',
+        data: [{ m10: { name: 'm10-ext0' } }, data.m10]
+      }
     ])
     expect(modular.getModules()).toEqual([
       data.m8,