mm_machine 2.3.6 → 2.3.8

package/drive.js

@@ -52,7 +52,7 @@ class Drive extends Mod {
    * @class
    */
   constructor(config, parent) {
-    super(config, parent);
+    super({ ...Drive.config, ...config }, parent);
     // 当前配置文件路径
     this.config_file = '';
 
@@ -267,7 +267,7 @@ Drive.prototype._getScriptFile = function () {
  * @param {string} file 目标文件路径
  */
 Drive.prototype.newScript = function (file) {
-  this._createScriptFile(file, this.config);
+  this._createScriptFile(file);
 };
 
 /**
@@ -276,9 +276,9 @@ Drive.prototype.newScript = function (file) {
  * @param {object} model 模板数据
  * @returns {boolean} 创建是否成功
  */
-Drive.prototype._createScriptFile = function (file, model = {}) {
+Drive.prototype._createScriptFile = function (file) {
   var tpl = this._getScriptTpl();
-  var content = $.tpl.render(tpl, model);
+  var content = $.tpl.render(tpl, this.getModel('script'));
   if (!content) {
     return '';
   }
@@ -411,6 +411,15 @@ Drive.prototype.prettyCode = function (code, type = 'json5') {
   return new_code;
 };
 
+/**
+ * 获取模块模型
+ * @param {string} type 模型类型，可选"config"或"script"
+ * @returns {object} 模块模型
+ */
+Drive.prototype.getModel = function (type) {
+  return this.config;
+}
+
 /**
  * 创建配置文件
  * @param {string} file 目标文件路径
@@ -418,7 +427,7 @@ Drive.prototype.prettyCode = function (code, type = 'json5') {
  */
 Drive.prototype._createConfigFile = function (file) {
   var tpl = this._getConfigTpl();
-  var content = $.tpl.render(tpl, this.config);
+  var content = $.tpl.render(tpl, this.getModel('config'));
   let code = this.prettyCode(content, 'json');
   file.saveText(code);
   return file;
@@ -605,7 +614,7 @@ Drive.prototype._getName = function (file) {
 /**
  * 加载前处理
  */
-Drive.prototype.loadBefore = async function () {
+Drive.prototype.loadBefore = function () {
   try {
     let module = this.loadScript();
     if (module) {
@@ -620,9 +629,9 @@ Drive.prototype.loadBefore = async function () {
 /**
  * 加载处理
  */
-Drive.prototype._loadCore = async function () {
-  await this.loadConfig();
-  await this.loadScript();
+Drive.prototype._loadCore = function () {
+  this.loadConfig();
+  this.loadScript();
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_machine",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "description": "A flexible Node.js plugin mechanism system for dynamic loading, management and execution of modules. Supports hot reload, lifecycle management, and modern JavaScript features.",
   "main": "index.js",
   "scripts": {