enhance: plugin config

Author: zyao89

package.json

@@ -55,7 +55,7 @@
         "jest": "^24.9.0"
     },
     "dependencies": {
-        "@micro-app/shared-utils": "^0.1.22",
+        "@micro-app/shared-utils": "^0.1.24",
         "dotenv": "^8.2.0",
         "dotenv-expand": "^5.1.0"
     },

src/core/MicroAppConfig/libs/BaseConfig.js

@@ -3,6 +3,7 @@
 const { _, loadFile, logger, stringifyObject, path, pluginResolution } = require('@micro-app/shared-utils');
 const CONSTANTS = require('../../Constants');
 const validateSchema = require('../../../utils/validateSchema');
+const parsePlugin = require('../../../utils/parsePlugin');
 
 const SCHEMA = require('./configSchema');
 
@@ -331,35 +332,7 @@ class BaseConfig {
                 pkg.devDependencies || {});
             _plugins = Object.keys(deps).filter(pluginResolution.isPlugin);
         }
-        return _plugins.map(p => {
-            let opts;
-            let id;
-            let others;
-            if (Array.isArray(p)) {
-                opts = p[1];
-                if (_.isPlainObject(p[0])) {
-                    others = p[0];
-                    id = p[0].id;
-                    p = p[0].link;
-                } else {
-                    p = id = p[0];
-                }
-            } else if (_.isPlainObject(p)) {
-                others = p;
-                id = p.id;
-                p = p.link;
-            }
-            id = id || p;
-            if (p && id === p) {
-                p = null; // 不希望相等
-            }
-            return {
-                ...(others || {}),
-                id,
-                link: p,
-                opts: opts || {},
-            };
-        });
+        return _plugins.map(item => parsePlugin(item));
     }
 
     // 这是一个参与合并，不进行校验的对象（提供参数扩展使用）

src/core/Service/libs/PluginService.js

@@ -7,6 +7,8 @@ const PluginAPI = require('../../PluginAPI');
 const DEFAULT_METHODS = require('../methods');
 const PreLoadPlugins = require('../../../plugins/register');
 const { API_TYPE, SHARED_PROPS: { BEFORE_INIT_METHODS } } = require('../../Constants');
+const parsePlugin = require('../../../utils/parsePlugin');
+
 const SYMBOL_BEFORE_INIT_METHODS = Symbol('$$beforeInitMethods$$');
 
 class PluginService extends MethodService {
@@ -31,14 +33,18 @@ class PluginService extends MethodService {
         const allplugins = micros.map(key => {
             return this.microsConfig[key].plugins || [];
         }).concat(plugins);
-        const pluginsObj = allplugins.reduce((arr, item) => {
-            if (Array.isArray(item)) {
-                return arr.concat(item.reduce((_arr, _item) => {
-                    return _arr.concat(this.resolvePlugin(_item));
-                }, []));
+        const pluginsObj = [];
+        while (allplugins.length) {
+            const item = allplugins.shift();
+            if (Array.isArray(item)) { // presets
+                allplugins.unshift(...item);
+            } else {
+                const res = this.resolvePlugin(item);
+                if (res) {
+                    pluginsObj.push(...[].concat(res));
+                }
             }
-            return arr.concat(this.resolvePlugin(item));
-        }, []).filter(item => !!item);
+        }
         const collection = new Set();
         const result = pluginsObj.filter(item => {
             // 去除已经注册的插件
@@ -578,12 +584,17 @@ class PluginService extends MethodService {
         if (apply) {
             const _apply = apply.default || apply;
             if (Array.isArray(_apply)) { // 支持数组模式
-                return _apply.map(_applyItem => {
-                    if (_applyItem) {
-                        return this._resolvePluginResult(item, { apply: _applyItem, link, opts });
+                return _apply.reduce((arr, _applyItem) => {
+                    if (_.isFunction(_applyItem)) {
+                        const res = this._resolvePluginResult(item, { apply: _applyItem, link, opts });
+                        return arr.concat(res || []);
+                    } else if (_applyItem) {
+                        const _parsePlugin = parsePlugin(_applyItem);
+                        const res = this.resolvePlugin(Object.assign(item, _parsePlugin));
+                        return arr.concat(res || []);
                     }
-                    return false;
-                }).filter(_it => !!_it);
+                    return arr;
+                }, []).filter(_it => !!_it);
             }
             return this._resolvePluginResult(item, { apply, link, opts });
         }

src/utils/parsePlugin/index.js

@@ -0,0 +1,34 @@
+'use strict';
+
+const { _ } = require('@micro-app/shared-utils');
+
+module.exports = function parsePlugin(p) {
+    let opts;
+    let id;
+    let others;
+    if (Array.isArray(p)) {
+        opts = p[1];
+        if (_.isPlainObject(p[0])) {
+            others = p[0];
+            id = p[0].id;
+            p = p[0].link;
+        } else {
+            p = id = p[0];
+        }
+    } else if (_.isPlainObject(p)) {
+        others = p;
+        id = p.id;
+        p = p.link;
+    }
+    id = id || p;
+    if (p && id === p) {
+        p = null; // 不希望相等
+    }
+    return {
+        ...(others || {}),
+        id,
+        link: p,
+        opts: opts || {},
+    };
+};
+