mm_machine 2.5.7 → 2.5.9

package/drive.js

@@ -163,6 +163,12 @@ Drive.prototype._getDir = function () {
       dir = this.config_file.dirname();
       this._dir = dir;
     }
+    else if (this.getParent) {
+      let parent_dir = this.getParent()?.getDir() || '';
+      if (parent_dir) {
+        dir = this.config.name.fullname(parent_dir);
+      }
+    }
   }
   return dir;
 };
@@ -172,7 +178,7 @@ Drive.prototype._getDir = function () {
  * @returns {string} 模板目录
  */
 Drive.prototype._getTplDir = function () {
-  return this.getParent().getTplDir();
+  return this.getParent()?.getTplDir() || '';
 };
 
 /**

package/index.js

@@ -597,12 +597,29 @@ Manager.prototype._initManager = function () {
 
 };
 
+/**
+ * 获取公共模块目录
+ * @returns {string} 公共模块目录
+ */
+Manager.prototype.getBaseDir = function () {
+  return this.config.base_dir;
+};
+
+/**
+ * 获取二次开发模块目录
+ * @returns {string} 二次开发模块目录
+ */
+Manager.prototype.getDir = function () {
+  return this.config.dir || this._getDir();
+};
+
 /**
  * 加载资源
  */
 Manager.prototype._loadSources = async function () {
   // 通过更新函数加载资源信息
-  let { base_dir, dir } = this.config;
+  let base_dir = this.getBaseDir();
+  let dir = this.getDir();
   if (base_dir) {
     await this.call('update', base_dir);
     await this.call('update', dir, false);
@@ -902,12 +919,46 @@ Manager.prototype.offEvent = function (event) {
 
 /**
  * 创建模块
- * @param {Object} config 模块配置
+ * @param {object} config 模块配置
+ * @param {string} file 模块文件路径
+ * @returns {string} 创建的模块文件路径
  */
-Manager.prototype.createFile = function (config) {
+Manager.prototype.createFile = function (config, file) {
+  if (!config.name) {
+    throw new TypeError('模块名称不能为空');
+  }
+  if (!config.title) {
+    throw new TypeError('模块标题不能为空');
+  }
+  if (!config.description) {
+    throw new TypeError('模块描述不能为空');
+  }
+  if (this.getMod(config.name)) {
+    throw new Error(`创建失败，原因：模块${config.name}已存在`);
+  }
   let mod = new this.Drive(config, this);
-  let file = `${config.name}/${this.config.filename}`.fullname(this.config.dir);
-  mod.createConfigFile(file, config);
+  let f = file;
+  if (!f) {
+    f = `${config.name}/${this.config.filename}`;
+    if (this.config.search_way === 'dir') {
+      let dir_name = this._getDirName();
+      f = `${dir_name}/${f}`;
+    }
+  }
+  f = f.fullname(this.config.dir);
+  mod.createConfigFile(f, config);
+  return f;
+};
+
+/**
+ * 创建模块
+ * @param {object} config 模块配置
+ * @param {string} file 模块文件路径
+ * @returns {object} 创建的模块实例
+ */
+Manager.prototype.create = function (config, file = '') {
+  let f = this.createFile(config, file);
+  let mod = this.registerMod(f, config);
   return mod;
 };
 

package/mod.js

@@ -660,6 +660,15 @@ Mod.prototype._destroyCore = async function () {
   this._methods = {};
 };
 
+/**
+ * 获取模块目录
+ * @returns {string} 模块目录
+ */
+Mod.prototype._getDir = function () {
+  if (!this.getParent) return '';
+  return this.getParent()?.getDir() || '';
+};
+
 module.exports = {
   Mod
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_machine",
-  "version": "2.5.7",
+  "version": "2.5.9",
   "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": {