mm_dbs 1.0.0 → 1.0.1

package/example/index.js

@@ -0,0 +1,50 @@
+/**
+ * mm_dbs 数据库框架示例
+ * 演示 dbAdmin() 获取管理器、manager.add() 注册驱动（不连接真实数据库），
+ * 以及 Db.model() 字段模型生成与字段 SQL 模板生成。
+ * 运行：node example/index.js
+ */
+const { Db, Manager, dbAdmin } = require('../index.js');
+
+/**
+ * 主流程
+ */
+function main() {
+  // 方式1：通过工厂函数获取数据库管理器实例
+  const manager = dbAdmin('example');
+  console.log('工厂实例是 Manager 类型:', manager instanceof Manager);
+  console.log('admin 缓存同作用域实例:', dbAdmin('example') === manager);
+
+  // 方式2：注册一个数据库驱动（仅注册配置，不建立连接）
+  const drive = manager.add({
+    name: 'user',
+    title: '用户表',
+    table: 'user'
+  });
+  console.log('驱动是 Db 类型:', drive instanceof Db);
+  console.log('驱动表名:', drive.config.table);
+
+  // 通过字段描述生成字段模型
+  const idModel = drive.model({
+    name: 'id',
+    type: 'int(11)',
+    note: '编号:唯一标识',
+    pk: true,
+    auto: true,
+    notnull: true
+  });
+  const nameModel = drive.model({
+    name: 'name',
+    type: 'varchar(50)',
+    note: '姓名:长度[2,50]',
+    notnull: true
+  });
+  console.log('主键字段模型:', JSON.stringify(idModel, null, 2));
+  console.log('姓名字段模型:', JSON.stringify(nameModel, null, 2));
+
+  // 生成字段 SQL 模板（纯逻辑，无需数据库连接）
+  console.log('主键字段 SQL:', drive._generateFieldSql(idModel));
+  console.log('姓名字段 SQL:', drive._generateFieldSql(nameModel));
+}
+
+main();

package/index.js

@@ -5,7 +5,7 @@ const admin = new Admin();
 admin.setClass(Manager);
 
 module.exports = {
-  Drive: require('./lib/drive'),
+  Db: require('./lib/db'),
   Manager,
   admin,
   /**
@@ -19,6 +19,6 @@ module.exports = {
     if (!scope) {
       scope = 'os';
     }
-    return admin.get(scope, { name: scope, ...config }, os);
+    return admin.get(scope, config, os);
   }
 };

package/lib/{drive.js → db.js}

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
-const Item = require('mm_corejs').Base;
-const { string, array, file } = require('mm_helper');
+const Item = require('mm_mod').Base;
+const { string, array, object, file } = require('mm_helper');
 
 /** 关键词搜索默认SQL模板（用户表关联查询） */
 const KEYWORD_DEFAULT =
@@ -10,73 +10,6 @@ const KEYWORD_DEFAULT =
 /** 关键词搜索默认提示 */
 const KEYWORD_DEFAULT_TIP = '昵称、手机号、钱包地址';
 
-/**
- * 按目标类型转换源值（复刻 mm_expand 对象合并的类型转换规则）
- * @param {*} target_val 目标值
- * @param {*} source_val 源值
- * @returns {*} 转换后的值
- */
-function _convertValue(target_val, source_val) {
-  var target_type = typeof target_val;
-  if (target_type === 'number') {
-    var num = Number(source_val);
-    return isNaN(num) ? 0 : num;
-  } else if (target_type === 'boolean') {
-    if (source_val === '0' || source_val === 'false' || source_val === 'False') {
-      return false;
-    } else if (source_val === '1' || source_val === 'true' || source_val === 'True') {
-      return true;
-    }
-    return Boolean(source_val);
-  } else if (target_type === 'string') {
-    return String(source_val);
-  }
-  return source_val;
-}
-
-/**
- * 深度合并对象属性（替代原全局 push 深合并）
- * @param {object} target 被添加的对象
- * @param {object} source 用作添加的对象
- * @param {boolean} supplement 是否补充目标没有的属性
- * @returns {object} 修改后的目标对象
- */
-function _push(target, source, supplement) {
-  if (!target || !source || typeof target !== 'object' || typeof source !== 'object') {
-    return target;
-  }
-  for (var key in source) {
-    if (target.hasOwnProperty(key)) {
-      var target_val = target[key];
-      var source_val = source[key];
-      if (typeof target_val === 'object' && typeof source_val === 'object') {
-        _push(target_val, source_val, supplement);
-      } else if (typeof target_val === typeof source_val) {
-        target[key] = _convertValue(target_val, source_val);
-      }
-    } else if (supplement) {
-      target[key] = source[key];
-    }
-  }
-  return target;
-}
-
-/**
- * 补全文件路径（相对路径基于当前工作目录或指定基准目录）
- * @param {string} file 文件路径
- * @param {string} dir 基准目录（可选）
- * @returns {string} 完整路径
- */
-function _resolvePath(file, dir) {
-  if (!file || typeof file !== 'string') {
-    return process.cwd();
-  }
-  if (path.isAbsolute(file)) {
-    return file;
-  }
-  return path.resolve(dir || process.cwd(), file);
-}
-
 /**
  * 对LIKE查询中的关键词进行转义, 防止通配符注入和性能攻击
  * @param {string} keyword 原始关键词
@@ -97,7 +30,7 @@ var escapeLikeKeyword = function (keyword) {
  * @augments {Item}
  * @class
  */
-class Drive extends Item {
+class Db extends Item {
   static config = {
     // 库表名称（唯一标识）
     name: '',
@@ -127,7 +60,7 @@ class Drive extends Item {
    * @class
    */
   constructor(config, parent) {
-    super({ ...Drive.config, ...config });
+    super({ ...Db.config, ...config });
 
     // 父级管理器引用（用于配置回退与插件查找）
     this.parent = parent || null;
@@ -149,7 +82,7 @@ class Drive extends Item {
 /**
  * 重置配置参数
  */
-Drive.prototype._preset = function () {
+Db.prototype._preset = function () {
   this.query_string = [
     'name',
     'title',
@@ -180,7 +113,7 @@ Drive.prototype._preset = function () {
  * @param {string} type 字段类型
  * @returns {object} 解析结果
  */
-Drive.prototype._parseFieldType = function (type) {
+Db.prototype._parseFieldType = function (type) {
   var tp = string.left(type, '(', true);
   var len = string.between(type, '(', ')');
   var max = 0;
@@ -202,7 +135,7 @@ Drive.prototype._parseFieldType = function (type) {
  * @param {number} max_length 最大长度
  * @returns {object} 解析结果
  */
-Drive.prototype._parseFieldNote = function (note, tp, max_length) {
+Db.prototype._parseFieldNote = function (note, tp, max_length) {
   var proc_note = note.replace('：', ':').replace('（', '(').replace('）', ')');
   var title = string.left(proc_note, ':', true).trim();
   var desc = string.right(proc_note, ':');
@@ -256,7 +189,7 @@ Drive.prototype._parseFieldNote = function (note, tp, max_length) {
  * @param {number} max_length 最大长度
  * @returns {number} 计算后的最大值
  */
-Drive.prototype._calcMaxValue = function (tp, max, max_length) {
+Db.prototype._calcMaxValue = function (tp, max, max_length) {
   var local_max = max;
   if (local_max === 0) {
     switch (tp) {
@@ -295,7 +228,7 @@ Drive.prototype._calcMaxValue = function (tp, max, max_length) {
  * @param {*} default_val 默认值
  * @returns {*} 处理后的默认值
  */
-Drive.prototype._handleDefaultValue = function (tp, not_null, default_val) {
+Db.prototype._handleDefaultValue = function (tp, not_null, default_val) {
   if (not_null && !default_val) {
     if (tp === 'varchar' || tp === 'text') {
       return '';
@@ -327,7 +260,7 @@ Drive.prototype._handleDefaultValue = function (tp, not_null, default_val) {
  * @returns {object} 字段模型对象
  * @private
  */
-Drive.prototype._createFieldModel = function (
+Db.prototype._createFieldModel = function (
   name,
   title,
   description,
@@ -391,7 +324,7 @@ Drive.prototype._createFieldModel = function (
  * @param {object} fields.note 字段备注
  * @returns {object} 返回字段模型
  */
-Drive.prototype.model = function (fields) {
+Db.prototype.model = function (fields) {
   var { name, notnull, type, pk, note, auto } = fields;
 
   var { tp, max: max_length, decimal } = this._parseFieldType(type);
@@ -447,7 +380,7 @@ Drive.prototype.model = function (fields) {
  * @property {string} o.Manager_comment 索引备注
  * @returns {object} 返回索引模型
  */
-Drive.prototype.newIndexModel = function (o) {
+Db.prototype.newIndexModel = function (o) {
   return {
     name: o.Key_name,
     type: o.Non_unique ? 'unique' : 'index',
@@ -461,7 +394,7 @@ Drive.prototype.newIndexModel = function (o) {
  * @param {object} db 数据库管理器
  * @returns {Array} 索引列表
  */
-Drive.prototype._updateFile = async function (db) {
+Db.prototype._updateFile = async function (db) {
   var sql = 'SHOW INDEX FROM `' + this.config.table + '`';
   var rows = await db.run(sql);
   var dict = {};
@@ -490,7 +423,7 @@ Drive.prototype._updateFile = async function (db) {
  * @param {object} db 数据库管理器
  * @param {boolean} cover 是否覆盖文件
  */
-Drive.prototype.updateFile = async function (db, cover) {
+Db.prototype.updateFile = async function (db, cover) {
   var cg = this.config;
   var list = [];
 
@@ -534,7 +467,7 @@ Drive.prototype.updateFile = async function (db, cover) {
  * 更新索引
  * @param {object} db 数据库管理器
  */
-Drive.prototype._updateDb = async function (db) {
+Db.prototype._updateDb = async function (db) {
   var cg = this.config;
   let index = cg.index || [];
   // 更新索引
@@ -562,7 +495,7 @@ Drive.prototype._updateDb = async function (db) {
  * @param {Array} list 字段列表
  * @returns {Array} 字段列表
  */
-Drive.prototype._initTable = async function (db, cg, list) {
+Db.prototype._initTable = async function (db, cg, list) {
   var fields = await db.fields();
   if (fields.length === 0) {
     var k = cg.key;
@@ -599,7 +532,7 @@ Drive.prototype._initTable = async function (db, cg, list) {
  * @param {Array} fields 数据库字段列表
  * @param {Array} list 配置字段列表
  */
-Drive.prototype._deleteUnusedFields = async function (db, fields, list) {
+Db.prototype._deleteUnusedFields = async function (db, fields, list) {
   for (var i = 0; i < fields.length; i++) {
     var o = fields[i];
     var obj = array.getObj(list, {
@@ -617,7 +550,7 @@ Drive.prototype._deleteUnusedFields = async function (db, fields, list) {
  * @param {object} o 字段对象
  * @returns {string} 字段SQL
  */
-Drive.prototype._generateFieldSql = function (o) {
+Db.prototype._generateFieldSql = function (o) {
   var type = this._getTypeSql(o);
   var notnull = this._getNotNullSql(o);
   var value = this._getValueSql(o);
@@ -631,7 +564,7 @@ Drive.prototype._generateFieldSql = function (o) {
  * @returns {string} 类型SQL
  * @private
  */
-Drive.prototype._getTypeSql = function (o) {
+Db.prototype._getTypeSql = function (o) {
   var type = o.type;
   var max_len = o.max_length || 0;
 
@@ -672,7 +605,7 @@ Drive.prototype._getTypeSql = function (o) {
  * @returns {string} NOT NULL SQL
  * @private
  */
-Drive.prototype._getNotNullSql = function (o) {
+Db.prototype._getNotNullSql = function (o) {
   var notnull = '';
 
   if (this._isNotNullRequired(o)) {
@@ -692,7 +625,7 @@ Drive.prototype._getNotNullSql = function (o) {
  * @returns {boolean} 是否需要NOT NULL
  * @private
  */
-Drive.prototype._isNotNullRequired = function (o) {
+Db.prototype._isNotNullRequired = function (o) {
   return (
     o.not_null || this._isDateTimeType(o.type) || this._isNumericType(o.type)
   );
@@ -704,7 +637,7 @@ Drive.prototype._isNotNullRequired = function (o) {
  * @returns {boolean} 是否为日期时间类型
  * @private
  */
-Drive.prototype._isDateTimeType = function (type) {
+Db.prototype._isDateTimeType = function (type) {
   return (
     type === 'date' ||
     type === 'time' ||
@@ -719,7 +652,7 @@ Drive.prototype._isDateTimeType = function (type) {
  * @returns {boolean} 是否为数字类型
  * @private
  */
-Drive.prototype._isNumericType = function (type) {
+Db.prototype._isNumericType = function (type) {
   return (
     type !== 'varchar' &&
     type !== 'longtext' &&
@@ -734,7 +667,7 @@ Drive.prototype._isNumericType = function (type) {
  * @returns {boolean} 是否需要AUTO_INCREMENT
  * @private
  */
-Drive.prototype._isAutoInc = function (o) {
+Db.prototype._isAutoInc = function (o) {
   return !!o.auto && !this._isDateTimeType(o.type);
 };
 
@@ -744,7 +677,7 @@ Drive.prototype._isAutoInc = function (o) {
  * @returns {string} 默认值SQL
  * @private
  */
-Drive.prototype._getValueSql = function (o) {
+Db.prototype._getValueSql = function (o) {
   if (this._isAutoTime(o)) {
     return 'DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP';
   }
@@ -771,7 +704,7 @@ Drive.prototype._getValueSql = function (o) {
  * @returns {boolean} 是否为自动时间
  * @private
  */
-Drive.prototype._isAutoTime = function (o) {
+Db.prototype._isAutoTime = function (o) {
   return !!o.auto && this._isDateTimeType(o.type);
 };
 
@@ -781,7 +714,7 @@ Drive.prototype._isAutoTime = function (o) {
  * @returns {string} 默认值SQL
  * @private
  */
-Drive.prototype._getDefaultValueSql = function (o) {
+Db.prototype._getDefaultValueSql = function (o) {
   if (this._isCurrentDefault(o)) {
     return 'DEFAULT ' + o.default;
   } else if (this._isQuotableType(o.type)) {
@@ -797,7 +730,7 @@ Drive.prototype._getDefaultValueSql = function (o) {
  * @returns {boolean} 是否为当前时间默认值
  * @private
  */
-Drive.prototype._isCurrentDefault = function (o) {
+Db.prototype._isCurrentDefault = function (o) {
   return (
     this._isDateTimeType(o.type) &&
     o.default &&
@@ -811,7 +744,7 @@ Drive.prototype._isCurrentDefault = function (o) {
  * @returns {boolean} 需要引号返回true，否则返回false
  * @private
  */
-Drive.prototype._isQuotableType = function (type) {
+Db.prototype._isQuotableType = function (type) {
   return (
     type === 'varchar' ||
     type === 'longtext' ||
@@ -829,7 +762,7 @@ Drive.prototype._isQuotableType = function (type) {
  * @returns {string} 空默认值SQL
  * @private
  */
-Drive.prototype._getDefaultEmptySql = function (o) {
+Db.prototype._getDefaultEmptySql = function (o) {
   if (this._isStringType(o.type)) {
     return "DEFAULT ''";
   } else {
@@ -843,7 +776,7 @@ Drive.prototype._getDefaultEmptySql = function (o) {
  * @returns {string} 注释SQL
  * @private
  */
-Drive.prototype._getNoteSql = function (o) {
+Db.prototype._getNoteSql = function (o) {
   var note = (o.title || '') + '：';
 
   if (o.type === 'varchar' || o.type === 'text' || o.type === 'longtext') {
@@ -878,7 +811,7 @@ Drive.prototype._getNoteSql = function (o) {
  * @returns {string} 字段SQL
  * @private
  */
-Drive.prototype._buildFieldSql = function (name, type, notnull, value, note) {
+Db.prototype._buildFieldSql = function (name, type, notnull, value, note) {
   var sql = "`{1}` {2} {3} {4} COMMENT '{5}'";
   return sql
     .replace('{1}', name)
@@ -895,7 +828,7 @@ Drive.prototype._buildFieldSql = function (name, type, notnull, value, note) {
  * @param {object} o 字段对象
  * @param {Array} fields 数据库字段列表
  */
-Drive.prototype._addOrUpdateField = async function (db, table, o, fields) {
+Db.prototype._addOrUpdateField = async function (db, table, o, fields) {
   var arr = fields.filter((f) => {
     return f.name === o.name;
   });
@@ -919,7 +852,7 @@ Drive.prototype._addOrUpdateField = async function (db, table, o, fields) {
  * @param {object} db 数据库管理器
  * @returns {string} 更新成功返回空，否则返回错误提示
  */
-Drive.prototype.updateDb = async function (db) {
+Db.prototype.updateDb = async function (db) {
   var cg = this.config;
   var table = cg.table + '';
   var list = cg.fields;
@@ -947,14 +880,14 @@ Drive.prototype.updateDb = async function (db) {
  * @returns {object} 目录信息
  * @private
  */
-Drive.prototype._deteDir = function (cg) {
+Db.prototype._deteDir = function (cg) {
   var arr = cg.table.split('_');
   var scope = arr[0];
-  var p = _resolvePath('./app/');
-  var dir = _resolvePath('./' + scope, p);
-  var dir_api = _resolvePath('./plugin/server', dir);
-  var db_dir = _resolvePath('./db', dir_api);
-  var config_file = _resolvePath(
+  var p = file.fullname('./app/');
+  var dir = file.fullname('./' + scope, p);
+  var dir_api = file.fullname('./plugin/server', dir);
+  var db_dir = file.fullname('./db', dir_api);
+  var config_file = file.fullname(
     './' + cg.table.replace(scope + '_', '') + '.db.json',
     db_dir,
   );
@@ -973,7 +906,7 @@ Drive.prototype._deteDir = function (cg) {
  * @param {string} dir 目录路径
  * @private
  */
-Drive.prototype._ensureDir = function (dir) {
+Db.prototype._ensureDir = function (dir) {
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir);
   }
@@ -983,7 +916,7 @@ Drive.prototype._ensureDir = function (dir) {
  * 保存当前配置到配置文件（替代旧基类 save）
  * @returns {void}
  */
-Drive.prototype.save = function () {
+Db.prototype.save = function () {
   if (!this.config_file) {
     return;
   }
@@ -1014,7 +947,7 @@ Drive.prototype.save = function () {
  * 获取当前驱动目录（替代旧基类 getDir）
  * @returns {string} 目录路径
  */
-Drive.prototype.getDir = function () {
+Db.prototype.getDir = function () {
   if (this._dir) {
     return this._dir;
   }
@@ -1029,7 +962,7 @@ Drive.prototype.getDir = function () {
  * @returns {object|null} 事件接口管理器实例，未配置返回null
  * @private
  */
-Drive.prototype._getEventApi = function () {
+Db.prototype._getEventApi = function () {
   var getter = this.config.get_event_api;
   if (typeof getter !== 'function' && this.parent) {
     getter = this.parent.config.get_event_api;
@@ -1050,7 +983,7 @@ Drive.prototype._getEventApi = function () {
  * @param {boolean} cover 是否覆盖文件
  * @private
  */
-Drive.prototype._handleConfigFile = function (f, cover) {
+Db.prototype._handleConfigFile = function (f, cover) {
   if (!file.hasFile(f)) {
     this.save();
   } else if (cover) {
@@ -1062,7 +995,7 @@ Drive.prototype._handleConfigFile = function (f, cover) {
     if (!o.description) {
       delete o.description;
     }
-    _push(jobj, o, true);
+    object.push(jobj, o, true);
     file.saveText(f, JSON.stringify(jobj, null, 2));
   }
 };
@@ -1071,7 +1004,7 @@ Drive.prototype._handleConfigFile = function (f, cover) {
  * 更新应用，根据表生成目录结构和文件
  * @param {boolean} cover 是否覆盖文件
  */
-Drive.prototype.updateApp = async function (cover) {
+Db.prototype.updateApp = async function (cover) {
   var cg = this.config;
   var f;
   var dir_api;
@@ -1111,7 +1044,7 @@ Drive.prototype.updateApp = async function (cover) {
  * @param {string} dir 目录路径
  * @private
  */
-Drive.prototype._ensureApiDir = function (dir) {
+Db.prototype._ensureApiDir = function (dir) {
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir);
   }
@@ -1126,7 +1059,7 @@ Drive.prototype._ensureApiDir = function (dir) {
  * @returns {string} 完整目录路径
  * @private
  */
-Drive.prototype._getApiDir = function (dir, app, type, name) {
+Db.prototype._getApiDir = function (dir, app, type, name) {
   var l = path.sep;
   var event_api = this._getEventApi();
   var o =
@@ -1153,7 +1086,7 @@ Drive.prototype._getApiDir = function (dir, app, type, name) {
  * @param {string} dir API存放目录
  * @param {boolean} cover 是否覆盖文件
  */
-Drive.prototype.updateApi = async function (dir, cover) {
+Db.prototype.updateApi = async function (dir, cover) {
   var cg = this.config;
   var arr = cg.table.split('_');
 
@@ -1177,7 +1110,7 @@ Drive.prototype.updateApi = async function (dir, cover) {
  * @param {string} path 检索路径
  * @param {string} scope 接口域
  */
-Drive.prototype.newEvent = async function (dir, path, scope) {
+Db.prototype.newEvent = async function (dir, path, scope) {
   var f = dir + '/main.js';
   if (!file.hasFile(f)) {
     var code = file.loadText(__dirname + '/event_script.js');
@@ -1192,7 +1125,7 @@ Drive.prototype.newEvent = async function (dir, path, scope) {
  * @returns {Array} 处理后的列表
  * @private
  */
-Drive.prototype._handleCommaList = function (list) {
+Db.prototype._handleCommaList = function (list) {
   return list.map((o) => {
     var arr = o.split(',');
     var value = arr[0];
@@ -1217,7 +1150,7 @@ Drive.prototype._handleCommaList = function (list) {
  * @returns {Array} 处理后的列表
  * @private
  */
-Drive.prototype._handleNumberList = function (list, map) {
+Db.prototype._handleNumberList = function (list, map) {
   if (map.indexOf('0') !== 0) {
     list.unshift('');
   }
@@ -1232,7 +1165,7 @@ Drive.prototype._handleNumberList = function (list, map) {
  * @returns {Array} 处理后的列表
  * @private
  */
-Drive.prototype._handleSimpleList = function (list) {
+Db.prototype._handleSimpleList = function (list) {
   return list.map((value) => {
     return {
       name: value,
@@ -1248,7 +1181,7 @@ Drive.prototype._handleSimpleList = function (list) {
  * @returns {object} 处理后的格式对象
  * @private
  */
-Drive.prototype._handleDotMap = function (obj, map) {
+Db.prototype._handleDotMap = function (obj, map) {
   var arr = map.split('.');
   var format = {
     table: arr[0],
@@ -1269,7 +1202,7 @@ Drive.prototype._handleDotMap = function (obj, map) {
  * @returns {object} 处理后的格式对象
  * @private
  */
-Drive.prototype._handleSimpleMap = function (obj, map) {
+Db.prototype._handleSimpleMap = function (obj, map) {
   return {
     table: map,
     id: obj.name,
@@ -1282,7 +1215,7 @@ Drive.prototype._handleSimpleMap = function (obj, map) {
  * @param {object} obj 字段对象
  * @returns {object} 返回格式
  */
-Drive.prototype.getFormat = async function (obj) {
+Db.prototype.getFormat = async function (obj) {
   var map = obj.map;
   var format = {
     key: obj.name,
@@ -1316,7 +1249,7 @@ Drive.prototype.getFormat = async function (obj) {
  * @returns {object} 处理结果
  * @private
  */
-Drive.prototype._procFieldSel = function (field_name, field_type) {
+Db.prototype._procFieldSel = function (field_name, field_type) {
   var res = {
     field: '',
     field_obj: '',
@@ -1339,7 +1272,7 @@ Drive.prototype._procFieldSel = function (field_name, field_type) {
  * @returns {string} 更新后的关键词
  * @private
  */
-Drive.prototype._procStringQuery = function (query, field_name, keyword) {
+Db.prototype._procStringQuery = function (query, field_name, keyword) {
   var new_keyword = keyword;
   query[field_name] = '`' + field_name + "` like '%{0}%'";
   if (this.isSet(field_name, this.query_keyword)) {
@@ -1354,7 +1287,7 @@ Drive.prototype._procStringQuery = function (query, field_name, keyword) {
  * @param {string} field_name 字段名
  * @private
  */
-Drive.prototype._procDateTimeQuery = function (query, field_name) {
+Db.prototype._procDateTimeQuery = function (query, field_name) {
   query[field_name + '_min'] = '`' + field_name + "` >= '{0}'";
   query[field_name + '_max'] = '`' + field_name + "` <= '{0}'";
 };
@@ -1370,7 +1303,7 @@ Drive.prototype._procDateTimeQuery = function (query, field_name) {
  * @returns {object} 处理结果
  * @private
  */
-Drive.prototype._procNumberQuery = function (
+Db.prototype._procNumberQuery = function (
   query,
   update_obj,
   field_name,
@@ -1418,7 +1351,7 @@ Drive.prototype._procNumberQuery = function (
  * @returns {object} 处理结果
  * @private
  */
-Drive.prototype._procFieldType = function (
+Db.prototype._procFieldType = function (
   type,
   field_name,
   query,
@@ -1475,7 +1408,7 @@ Drive.prototype._procFieldType = function (
  * @returns {object} 处理结果
  * @private
  */
-Drive.prototype._procSingleField = async function (
+Db.prototype._procSingleField = async function (
   o,
   query,
   update_obj,
@@ -1531,7 +1464,7 @@ Drive.prototype._procSingleField = async function (
  * @returns {object} 处理结果
  * @private
  */
-Drive.prototype._procFields = async function (fields, table) {
+Db.prototype._procFields = async function (fields, table) {
   var query = {};
   var update_obj = {};
   var field = '';
@@ -1588,7 +1521,7 @@ Drive.prototype._procFields = async function (fields, table) {
  * @returns {object} 处理后的查询对象
  * @private
  */
-Drive.prototype._procKeyword = function (keyword, table) {
+Db.prototype._procKeyword = function (keyword, table) {
   var safe_keyword = escapeLikeKeyword(keyword);
   var new_keyword = safe_keyword;
   if (table.indexOf('user_') !== -1) {
@@ -1611,7 +1544,7 @@ Drive.prototype._procKeyword = function (keyword, table) {
  * @returns {object} 基础模型
  * @private
  */
-Drive.prototype._createSqlConfig = function (cg, processed, keyword_query) {
+Db.prototype._createSqlConfig = function (cg, processed, keyword_query) {
   return {
     name: cg.table,
     title: cg.title,
@@ -1638,7 +1571,7 @@ Drive.prototype._createSqlConfig = function (cg, processed, keyword_query) {
  * @param {string} table 表名
  * @private
  */
-Drive.prototype._saveClientConfig = function (
+Db.prototype._saveClientConfig = function (
   client,
   base_model,
   cover,
@@ -1676,7 +1609,7 @@ Drive.prototype._saveClientConfig = function (
  * @param {boolean} cover 是否覆盖文件
  * @private
  */
-Drive.prototype._saveManageConfig = function (manage, base_model, cover) {
+Db.prototype._saveManageConfig = function (manage, base_model, cover) {
   var m = { ...base_model };
   delete m.method;
   m.field_hide = [];
@@ -1696,7 +1629,7 @@ Drive.prototype._saveManageConfig = function (manage, base_model, cover) {
  * @param {string} manage 管理端配置保存路径
  * @param {boolean} cover 是否覆盖文件
  */
-Drive.prototype.newSql = async function (client, manage, cover) {
+Db.prototype.newSql = async function (client, manage, cover) {
   var cg = this.config;
   var uid = this.config.user_id;
 
@@ -1726,7 +1659,7 @@ Drive.prototype.newSql = async function (client, manage, cover) {
  * @param {object} model 配置模型
  * @param {boolean} cover 是否覆盖文件
  */
-Drive.prototype.saveFile = function (file, model, cover) {
+Db.prototype.saveFile = function (file, model, cover) {
   if (!file.hasFile(file)) {
     file.saveText(file, JSON.stringify(model, null, 2));
   } else if (cover) {
@@ -1737,7 +1670,7 @@ Drive.prototype.saveFile = function (file, model, cover) {
         model[k] = jobj[k];
       }
     }
-    _push(jobj, model, true);
+    object.push(jobj, model, true);
     file.saveText(file, JSON.stringify(jobj, null, 2));
   }
 };
@@ -1748,7 +1681,7 @@ Drive.prototype.saveFile = function (file, model, cover) {
  * @param {string} manage 管理端配置保存路径
  * @param {boolean} cover 是否覆盖文件
  */
-Drive.prototype.newParam = async function (client, manage, cover) {
+Db.prototype.newParam = async function (client, manage, cover) {
   var cg = this.config;
   var lt = cg.fields;
   var cm = this._initParamConfig(cg);
@@ -1779,7 +1712,7 @@ Drive.prototype.newParam = async function (client, manage, cover) {
  * @returns {object} 参数配置对象
  * @private
  */
-Drive.prototype._initParamConfig = function (cg) {
+Db.prototype._initParamConfig = function (cg) {
   return {
     name: cg.table,
     title: cg.title,
@@ -1817,7 +1750,7 @@ Drive.prototype._initParamConfig = function (cg) {
  * @returns {object} 参数模型对象
  * @private
  */
-Drive.prototype._createParamModel = function (field, type, name) {
+Db.prototype._createParamModel = function (field, type, name) {
   return {
     name: name,
     title: field.title,
@@ -1834,7 +1767,7 @@ Drive.prototype._createParamModel = function (field, type, name) {
  * @returns {boolean} 是否为字符串类型
  * @private
  */
-Drive.prototype._isStringType = function (type) {
+Db.prototype._isStringType = function (type) {
   return type === 'varchar' || type === 'text' || type === 'longtext';
 };
 
@@ -1848,7 +1781,7 @@ Drive.prototype._isStringType = function (type) {
  * @returns {string} 更新后的关键词
  * @private
  */
-Drive.prototype._processStringField = function (cm, m, o, n, keyword) {
+Db.prototype._processStringField = function (cm, m, o, n, keyword) {
   var new_keyword = keyword;
   m.type = 'string';
   m.default = o.default;
@@ -1881,7 +1814,7 @@ Drive.prototype._processStringField = function (cm, m, o, n, keyword) {
  * @param {object} o 字段对象
  * @private
  */
-Drive.prototype._addStringRange = function (m, o) {
+Db.prototype._addStringRange = function (m, o) {
   var range = o.min_length && o.max_length ? [o.min_length, o.max_length] : [];
   if (range.length > 0) {
     m.string.range = range;
@@ -1899,7 +1832,7 @@ Drive.prototype._addStringRange = function (m, o) {
  * @returns {boolean} 是否包含
  * @private
  */
-Drive.prototype._hasKeyword = function (field_name, keyword) {
+Db.prototype._hasKeyword = function (field_name, keyword) {
   return string.has(field_name, keyword);
 };
 
@@ -1910,7 +1843,7 @@ Drive.prototype._hasKeyword = function (field_name, keyword) {
  * @returns {boolean} 是否等于
  * @private
  */
-Drive.prototype._isEqual = function (field_name, values) {
+Db.prototype._isEqual = function (field_name, values) {
   return values.includes(field_name);
 };
 
@@ -1920,7 +1853,7 @@ Drive.prototype._isEqual = function (field_name, values) {
  * @param {string} n 字段名
  * @private
  */
-Drive.prototype._addStringFormat = function (m, n) {
+Db.prototype._addStringFormat = function (m, n) {
   if (this._hasKeyword(n, 'phone') || this._isEqual(n, ['tel'])) {
     m.string.format = 'phone';
   } else if (
@@ -1947,7 +1880,7 @@ Drive.prototype._addStringFormat = function (m, n) {
  * @param {string} n 字段名
  * @private
  */
-Drive.prototype._processDateTimeField = function (cm, m, o, n) {
+Db.prototype._processDateTimeField = function (cm, m, o, n) {
   var format = o.type === 'timestamp' ? 'datetime' : o.type;
   m.type = 'string';
   m.default = '';
@@ -1975,7 +1908,7 @@ Drive.prototype._processDateTimeField = function (cm, m, o, n) {
  * @param {string} n 字段名
  * @private
  */
-Drive.prototype._addDateTimeRange = function (cm, m, n) {
+Db.prototype._addDateTimeRange = function (cm, m, n) {
   var m_min = { ...m };
   m_min.name = n + '_min';
   m_min.title += '——开始时间';
@@ -1996,7 +1929,7 @@ Drive.prototype._addDateTimeRange = function (cm, m, n) {
  * @param {object} cg 配置对象
  * @private
  */
-Drive.prototype._processNumberField = function (cm, m, o, n, cg) {
+Db.prototype._processNumberField = function (cm, m, o, n, cg) {
   m.type = 'number';
   m.default = Number(o.default) + '';
   m.number = {};
@@ -2016,7 +1949,7 @@ Drive.prototype._processNumberField = function (cm, m, o, n, cg) {
  * @param {object} o 字段对象
  * @private
  */
-Drive.prototype._addNumberRange = function (m, o) {
+Db.prototype._addNumberRange = function (m, o) {
   var range = o.min && o.max ? [o.min, o.max] : [];
   if (range.length > 0) {
     m.number.range = range;
@@ -2034,7 +1967,7 @@ Drive.prototype._addNumberRange = function (m, o) {
  * @param {string} n 字段名
  * @private
  */
-Drive.prototype._processPrimaryKey = function (cm, m, n) {
+Db.prototype._processPrimaryKey = function (cm, m, n) {
   cm.del.query_required.push(n);
   cm.set.query.push(n);
   cm.get.query.push(n);
@@ -2049,7 +1982,7 @@ Drive.prototype._processPrimaryKey = function (cm, m, n) {
  * @param {string} n 字段名
  * @private
  */
-Drive.prototype._processNonPrimaryKey = function (cm, m, n) {
+Db.prototype._processNonPrimaryKey = function (cm, m, n) {
   cm.add.body.push(n);
   cm.set.body.push(n);
   cm.list.push(m);
@@ -2069,7 +2002,7 @@ Drive.prototype._processNonPrimaryKey = function (cm, m, n) {
  * @param {string} n 字段名
  * @private
  */
-Drive.prototype._processNonTinyInt = function (cm, m, n) {
+Db.prototype._processNonTinyInt = function (cm, m, n) {
   var ne = n;
   if (!ne.endsWith('id')) {
     this._addNumberRangeFields(cm, m, n);
@@ -2088,7 +2021,7 @@ Drive.prototype._processNonTinyInt = function (cm, m, n) {
  * @param {string} n 字段名
  * @private
  */
-Drive.prototype._addNumberRangeFields = function (cm, m, n) {
+Db.prototype._addNumberRangeFields = function (cm, m, n) {
   cm.get.query.push(n + '_min');
   cm.get.query.push(n + '_max');
   cm.set.query.push(n + '_min');
@@ -2113,7 +2046,7 @@ Drive.prototype._addNumberRangeFields = function (cm, m, n) {
  * @param {object} cg 配置对象
  * @private
  */
-Drive.prototype._addKeywordConfig = function (cm, keyword, cg) {
+Db.prototype._addKeywordConfig = function (cm, keyword, cg) {
   if (keyword) {
     cm.get.query.push('keyword');
     cm.set.query.push('keyword');
@@ -2140,7 +2073,7 @@ Drive.prototype._addKeywordConfig = function (cm, keyword, cg) {
  * @param {boolean} cover 是否覆盖文件
  * @private
  */
-Drive.prototype._saveParamFiles = function (cm, client, manage, cover) {
+Db.prototype._saveParamFiles = function (cm, client, manage, cover) {
   if (client) {
     this.saveFile(client + '/param.json', cm, cover);
   }
@@ -2158,7 +2091,7 @@ Drive.prototype._saveParamFiles = function (cm, client, manage, cover) {
  * @param {Array} arr 匹配的对象
  * @returns {boolean} 是否设置
  */
-Drive.prototype.isSet = function (name, arr) {
+Db.prototype.isSet = function (name, arr) {
   if (!arr) {
     return false;
   }
@@ -2179,7 +2112,7 @@ Drive.prototype.isSet = function (name, arr) {
  * @param {string} type 数据类型
  * @returns {boolean} 是否可以
  */
-Drive.prototype.isCan = function (name, arr, type) {
+Db.prototype.isCan = function (name, arr, type) {
   if (type === 'longtext') {
     return false;
   }
@@ -2202,7 +2135,7 @@ Drive.prototype.isCan = function (name, arr, type) {
  * @returns {string} API路径
  * @private
  */
-Drive.prototype._deteApiPath = function (cg) {
+Db.prototype._deteApiPath = function (cg) {
   var arr = cg.table.split('_');
   var p = '/api/';
   if (arr.length > 1) {
@@ -2220,7 +2153,7 @@ Drive.prototype._deteApiPath = function (cg) {
  * @returns {object} API配置
  * @private
  */
-Drive.prototype._createApiConfig = function (cg, path) {
+Db.prototype._createApiConfig = function (cg, path) {
   return {
     name: cg.table,
     title: cg.title,
@@ -2241,7 +2174,7 @@ Drive.prototype._createApiConfig = function (cg, path) {
  * @returns {boolean} 是否包含用户ID字段
  * @private
  */
-Drive.prototype._hasUserIdField = function (fields) {
+Db.prototype._hasUserIdField = function (fields) {
   for (var i = 0, item; (item = fields[i++]);) {
     var name = item.name;
     if (
@@ -2264,7 +2197,7 @@ Drive.prototype._hasUserIdField = function (fields) {
  * @param {boolean} cover 是否覆盖文件
  * @private
  */
-Drive.prototype._saveClientApiConfig = function (
+Db.prototype._saveClientApiConfig = function (
   client,
   base_config,
   cg,
@@ -2293,7 +2226,7 @@ Drive.prototype._saveClientApiConfig = function (
  * @param {boolean} cover 是否覆盖文件
  * @private
  */
-Drive.prototype._saveManageApiConfig = function (manage, base_config, cover) {
+Db.prototype._saveManageApiConfig = function (manage, base_config, cover) {
   var o = { ...base_config };
   o.oauth = {
     scope: true,
@@ -2312,7 +2245,7 @@ Drive.prototype._saveManageApiConfig = function (manage, base_config, cover) {
  * @param {string} manage 管理端配置保存路径
  * @param {boolean} cover 是否覆盖文件
  */
-Drive.prototype.newApi = async function (client, manage, cover) {
+Db.prototype.newApi = async function (client, manage, cover) {
   var cg = this.config;
   var path = this._deteApiPath(cg);
   var base_config = this._createApiConfig(cg, path);
@@ -2331,7 +2264,7 @@ Drive.prototype.newApi = async function (client, manage, cover) {
  * @param {string} type 模型类型
  * @returns {object} 返回获取到的模型
  */
-Drive.prototype.getModel = function (type) {
+Db.prototype.getModel = function (type) {
   let model = { ...this.config };
   let dir = this.getDir();
   let l = path.sep;
@@ -2344,4 +2277,4 @@ Drive.prototype.getModel = function (type) {
   return model;
 };
 
-module.exports = Drive;
+module.exports = Db;

package/lib/manager.js

@@ -1,12 +1,12 @@
-const Manager = require("mm_corejs").Manager;
-const Drive = require("./drive");
+const Manager = require("mm_mod").Manager;
+const Db = require("./db");
 
 /**
  * 数据库帮助类
  * @augments {Manager}
  * @class
  */
-class Db extends Manager {
+class DbManager extends Manager {
   /**
    * 配置参数
    * @type {object}
@@ -45,9 +45,7 @@ class Db extends Manager {
    * @param {object} parent 父级模块
    */
   constructor(config, parent) {
-    super({ ...Db.config, ...config }, parent);
-    // 插件注册表（方案B：手动注册，供驱动 plugin() 查找）
-    this.plugins = {};
+    super({ ...DbManager.config, ...config }, parent);
   }
 }
 
@@ -55,15 +53,15 @@ class Db extends Manager {
  * 数据库驱动类
  * @type {Drive}
  */
-Db.prototype.Drive = Drive;
+DbManager.prototype.Drive = Db;
 
 /**
  * 注册一个数据库驱动（方案B：手动注册，不扫描目录）
  * @param {object} config 驱动配置（必须包含 name）
  * @returns {object} 驱动实例
  */
-Db.prototype.add = function (config) {
-  var drive = new Drive({ host: this.config.host, ...config }, this);
+DbManager.prototype.add = function (config) {
+  var drive = new this.Drive({ host: this.config.host, ...config }, this);
   this.set(drive.config.name, drive);
   return drive;
 };
@@ -73,7 +71,7 @@ Db.prototype.add = function (config) {
  * @param {string} name 驱动名称
  * @returns {Promise<boolean>} 是否删除成功
  */
-Db.prototype.del = async function (name) {
+DbManager.prototype.del = async function (name) {
   return await Manager.prototype.del.call(this, name);
 };
 
@@ -82,7 +80,7 @@ Db.prototype.del = async function (name) {
  * @param {string} name 驱动名称
  * @returns {Promise<boolean>} 是否执行成功
  */
-Db.prototype.reload = async function (name) {
+DbManager.prototype.reload = async function (name) {
   var drive = this.get(name);
   if (!drive) {
     this.log("warn", "驱动不存在，无法重载", name);
@@ -94,23 +92,12 @@ Db.prototype.reload = async function (name) {
   return true;
 };
 
-/**
- * 注册插件集合（供驱动 plugin() 查找，替代原全局插件池）
- * @param {string} name 插件作用域名称（app 名）
- * @param {object} obj 插件集合对象（需含 get 方法）
- * @returns {object} 当前管理器实例
- */
-Db.prototype.usePlugin = function (name, obj) {
-  this.plugins[name] = obj;
-  return this;
-};
-
 /**
  * 获取所有驱动配置列表（方案B：来自注册表，替代旧基类 getInfos）
  * @returns {Array} 驱动配置数组
  * @private
  */
-Db.prototype._getInfos = function () {
+DbManager.prototype._getInfos = function () {
   return this.values().map((d) => d.config);
 };
 
@@ -119,7 +106,7 @@ Db.prototype._getInfos = function () {
  * @param {string} table 表
  * @returns {object} 返回驱动项
  */
-Db.prototype.getObj = function (table) {
+DbManager.prototype.getObj = function (table) {
   var obj;
   var mods = this.values();
   for (var i = 0; i < mods.length; i++) {
@@ -140,7 +127,7 @@ Db.prototype.getObj = function (table) {
  * @param {boolean} cover 是否覆盖文件
  * @returns {string} 更新成功返回null, 失败返回错误提示
  */
-Db.prototype.updateFile = async function (db, name, table, cover = true) {
+DbManager.prototype.updateFile = async function (db, name, table, cover = true) {
   if (name) {
     var o = this.get(name);
     if (o) {
@@ -179,12 +166,12 @@ Db.prototype.updateFile = async function (db, name, table, cover = true) {
  * @param {boolean} all 是否更新全部表，true为是，false为否
  * @returns {string} 更新成功返回null, 失败返回错误提示
  */
-Db.prototype.updateDb = async function (db, name, table, all) {
+DbManager.prototype.updateDbManager = async function (db, name, table, all) {
   var ret;
   if (name) {
     var o = this.get(name);
     if (o) {
-      ret = await o.updateDb(db);
+      ret = await o.updateDbManager(db);
     } else {
       ret = "该配置不存在";
     }
@@ -194,13 +181,13 @@ Db.prototype.updateDb = async function (db, name, table, all) {
       for (var i = 0; i < mods.length; i++) {
         var m = mods[i];
         if (m.config.table === table) {
-          ret = await m.updateDb(db);
+          ret = await m.updateDbManager(db);
           break;
         }
       }
     } else if (all) {
       for (var j = 0; j < mods.length; j++) {
-        await mods[j].updateDb(db);
+        await mods[j].updateDbManager(db);
       }
     }
   }
@@ -210,4 +197,4 @@ Db.prototype.updateDb = async function (db, name, table, all) {
 /**
  * @module 导出数据库管理器类
  */
-module.exports = Db;
+module.exports = DbManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_dbs",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "数据库框架，通过设计数据库生成sql模板，或通过db.json配置文件生成mysql数据表（基于 mm_corejs，内置管理器池，无全局/原型扩展依赖）",
   "main": "index.js",
   "keywords": [
@@ -16,8 +16,13 @@
   "group": "data",
   "author": "邱文武",
   "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitee.com/qiuwenwu91/mm_dbs.git"
+  },
   "dependencies": {
     "mm_corejs": "^1.1.4",
+    "mm_mod": "^1.0.1",
     "mm_helper": "^1.0.0"
   },
   "scripts": {