@rdyl/node-mysql 0.0.7 → 0.0.9

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.0.7 (2025-04-10)
+## 0.0.9 (2025-04-11)
 
 
 

package/dist/helper.js

@@ -75,7 +75,7 @@ exports.MysqlUpdater = exports.MysqlDeleter = exports.MysqlInserter = exports.My
 var interface_1 = require("./interface");
 var utils_1 = require("./utils");
 var BaseHelper = /** @class */ (function () {
-    function BaseHelper(_tableName) {
+    function BaseHelper(db, _tableName) {
         this._tableName = _tableName;
         this.selects = [];
         this.options = {
@@ -83,6 +83,8 @@ var BaseHelper = /** @class */ (function () {
             skip: 0,
             sort: {},
         };
+        // @ts-ignore
+        this.pool = global.$MysqlDb[db];
     }
     Object.defineProperty(BaseHelper.prototype, "selectStat", {
         get: function () {
@@ -159,9 +161,9 @@ var BaseHelper = /** @class */ (function () {
 /** @description 查询数据 */
 var MysqlSelector = /** @class */ (function (_super) {
     __extends(MysqlSelector, _super);
-    function MysqlSelector(t, exFields) {
+    function MysqlSelector(d, t, exFields) {
         if (exFields === void 0) { exFields = []; }
-        var _this = _super.call(this, t) || this;
+        var _this = _super.call(this, d, t) || this;
         _this.exFields = exFields;
         return _this;
     }
@@ -200,7 +202,7 @@ var MysqlSelector = /** @class */ (function (_super) {
                     case 0:
                         _c.trys.push([0, 2, , 3]);
                         _a = this, selectStat = _a.selectStat, countSql = _a.countSql;
-                        return [4 /*yield*/, global.mysqlPool.execute(countSql, selectStat.values)];
+                        return [4 /*yield*/, this.pool.execute(countSql, selectStat.values)];
                     case 1:
                         res = (_c.sent())[0];
                         //@ts-ignore
@@ -222,7 +224,7 @@ var MysqlSelector = /** @class */ (function (_super) {
                     case 0:
                         _c.trys.push([0, 2, , 3]);
                         _a = this, selectStat = _a.selectStat, sql = _a.sql;
-                        return [4 /*yield*/, global.mysqlPool.execute(sql, selectStat.values)];
+                        return [4 /*yield*/, this.pool.execute(sql, selectStat.values)];
                     case 1:
                         res = (_c.sent())[0];
                         exFields_1 = this.exFields;
@@ -299,9 +301,9 @@ exports.MysqlSelector = MysqlSelector;
 /** @description 插入数据 */
 var MysqlInserter = /** @class */ (function (_super) {
     __extends(MysqlInserter, _super);
-    function MysqlInserter(t, fields) {
+    function MysqlInserter(d, t, fields) {
         if (fields === void 0) { fields = []; }
-        var _this = _super.call(this, t) || this;
+        var _this = _super.call(this, d, t) || this;
         _this.values = [];
         _this.fields = fields.filter(function (e) { return e !== "id"; });
         return _this;
@@ -331,7 +333,7 @@ var MysqlInserter = /** @class */ (function (_super) {
             var conn, result, stmt, _i, _a, value, row, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, global.mysqlPool.getConnection()];
+                    case 0: return [4 /*yield*/, this.pool.getConnection()];
                     case 1:
                         conn = _c.sent();
                         result = [];
@@ -370,8 +372,8 @@ exports.MysqlInserter = MysqlInserter;
 /** @description 删除数据 */
 var MysqlDeleter = /** @class */ (function (_super) {
     __extends(MysqlDeleter, _super);
-    function MysqlDeleter(t) {
-        return _super.call(this, t) || this;
+    function MysqlDeleter(d, t) {
+        return _super.call(this, d, t) || this;
     }
     Object.defineProperty(MysqlDeleter.prototype, "sql", {
         get: function () {
@@ -397,7 +399,7 @@ var MysqlDeleter = /** @class */ (function (_super) {
                     case 0:
                         _b.trys.push([0, 2, , 3]);
                         _a = this, sql = _a.sql, selectStat = _a.selectStat;
-                        return [4 /*yield*/, global.mysqlPool.execute(sql, selectStat.values)];
+                        return [4 /*yield*/, this.pool.execute(sql, selectStat.values)];
                     case 1:
                         res = (_b.sent())[0];
                         // @ts-ignore
@@ -438,9 +440,9 @@ exports.MysqlDeleter = MysqlDeleter;
 /** @description 更新数据 */
 var MysqlUpdater = /** @class */ (function (_super) {
     __extends(MysqlUpdater, _super);
-    function MysqlUpdater(t, exFields) {
+    function MysqlUpdater(d, t, exFields) {
         if (exFields === void 0) { exFields = []; }
-        var _this = _super.call(this, t) || this;
+        var _this = _super.call(this, d, t) || this;
         _this.exFields = exFields;
         _this.updateFields = {};
         return _this;
@@ -500,9 +502,10 @@ var MysqlUpdater = /** @class */ (function (_super) {
                         _b.trys.push([0, 2, , 3]);
                         _a = this, sql = _a.sql, selectStat = _a.selectStat, updateStat = _a.updateStat;
                         values = __spreadArray(__spreadArray([], updateStat.values, true), selectStat.values, true);
-                        return [4 /*yield*/, global.mysqlPool.execute(sql, values)];
+                        return [4 /*yield*/, this.pool.execute(sql, values)];
                     case 1:
                         res = (_b.sent())[0];
+                        // @ts-ignore
                         return [2 /*return*/, res.affectedRows];
                     case 2:
                         err_2 = _b.sent();

package/dist/index.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -17,13 +28,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setup = setup;
+exports.CreateMysql = CreateMysql;
 var promise_1 = __importDefault(require("mysql2/promise")); // 使用 Promise 接口
-function setup(opts) {
-    // @ts-ignore
-    global.mysqlPool = promise_1.default.createPool(opts);
-}
 __exportStar(require("./helper"), exports);
 __exportStar(require("./meta"), exports);
 __exportStar(require("./interface"), exports);
 __exportStar(require("./utils"), exports);
+function CreateMysql(props) {
+    return {
+        setup: function (database) {
+            // @ts-ignore
+            global.$MysqlDb[database] = promise_1.default.createPool(__assign(__assign({}, props), { database: database }));
+        },
+    };
+}

package/dist/meta.js

@@ -36,23 +36,24 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DbSchema = void 0;
+exports.MysqlDbSchema = void 0;
 var helper_1 = require("./helper");
 var utils_1 = require("./utils");
 /**
  * @description
  * 使用$toMap时 不返回的字段名前面需要加$
  */
-var DbSchema = /** @class */ (function () {
-    function DbSchema($table, $mapExFields) {
+var MysqlDbSchema = /** @class */ (function () {
+    function MysqlDbSchema($database, $table, $mapExFields) {
         if ($mapExFields === void 0) { $mapExFields = []; }
+        this.$database = $database;
         this.$table = $table;
         this.$mapExFields = $mapExFields;
         this.id = "";
         this.createTime = utils_1.Parser.easyDate();
         this.updateTime = utils_1.Parser.easyDate();
     }
-    Object.defineProperty(DbSchema.prototype, "$toJson", {
+    Object.defineProperty(MysqlDbSchema.prototype, "$toJson", {
         get: function () {
             var _this = this;
             return Object.keys(this).reduce(function (obj, key) {
@@ -67,7 +68,7 @@ var DbSchema = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DbSchema.prototype, "$toMap", {
+    Object.defineProperty(MysqlDbSchema.prototype, "$toMap", {
         get: function () {
             var _this = this;
             var target = this.$toJson;
@@ -80,14 +81,14 @@ var DbSchema = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DbSchema.prototype, "$fields", {
+    Object.defineProperty(MysqlDbSchema.prototype, "$fields", {
         get: function () {
             return Object.keys(this.$toJson);
         },
         enumerable: false,
         configurable: true
     });
-    DbSchema.prototype.$formJson = function (json) {
+    MysqlDbSchema.prototype.$formJson = function (json) {
         var _this = this;
         Object.keys(json).forEach(function (k) {
             if (Object.prototype.hasOwnProperty.call(_this, k)) {
@@ -96,13 +97,13 @@ var DbSchema = /** @class */ (function () {
             }
         });
     };
-    DbSchema.prototype.$get = function () {
+    MysqlDbSchema.prototype.$get = function () {
         return __awaiter(this, void 0, void 0, function () {
             var selector, res;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        selector = new helper_1.MysqlSelector(this.$table, this.$mapExFields);
+                        selector = new helper_1.MysqlSelector(this.$database, this.$table, this.$mapExFields);
                         return [4 /*yield*/, selector.getById(this.id)];
                     case 1:
                         res = _a.sent();
@@ -115,16 +116,16 @@ var DbSchema = /** @class */ (function () {
             });
         });
     };
-    DbSchema.prototype.$insert = function (uniqueKey) {
+    MysqlDbSchema.prototype.$insert = function (uniqueKey) {
         return __awaiter(this, void 0, void 0, function () {
             var inserter, existing, res;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        inserter = new helper_1.MysqlInserter(this.$table, this.$fields);
+                        inserter = new helper_1.MysqlInserter(this.$database, this.$table, this.$fields);
                         inserter.push(this.$toJson);
                         if (!uniqueKey) return [3 /*break*/, 2];
-                        return [4 /*yield*/, global.mysqlPool.query("SELECT 1 FROM ".concat(this.$table, " WHERE ").concat(uniqueKey, " = ? LIMIT 1"), [this.$toJson[uniqueKey]])];
+                        return [4 /*yield*/, inserter.pool.query("SELECT 1 FROM ".concat(this.$table, " WHERE ").concat(uniqueKey, " = ? LIMIT 1"), [this.$toJson[uniqueKey]])];
                     case 1:
                         existing = (_a.sent())[0];
                         // @ts-ignore
@@ -147,13 +148,13 @@ var DbSchema = /** @class */ (function () {
             });
         });
     };
-    DbSchema.prototype.$remove = function () {
+    MysqlDbSchema.prototype.$remove = function () {
         return __awaiter(this, void 0, void 0, function () {
             var deleter, user;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        deleter = new helper_1.MysqlDeleter(this.$table);
+                        deleter = new helper_1.MysqlDeleter(this.$database, this.$table);
                         return [4 /*yield*/, this.$get()];
                     case 1:
                         user = _a.sent();
@@ -165,13 +166,13 @@ var DbSchema = /** @class */ (function () {
             });
         });
     };
-    DbSchema.prototype.$update = function (maps) {
+    MysqlDbSchema.prototype.$update = function (maps) {
         return __awaiter(this, void 0, void 0, function () {
             var updater, user, values, affected;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        updater = new helper_1.MysqlUpdater(this.$table);
+                        updater = new helper_1.MysqlUpdater(this.$database, this.$table);
                         return [4 /*yield*/, this.$get()];
                     case 1:
                         user = _a.sent();
@@ -196,6 +197,6 @@ var DbSchema = /** @class */ (function () {
             });
         });
     };
-    return DbSchema;
+    return MysqlDbSchema;
 }());
-exports.DbSchema = DbSchema;
+exports.MysqlDbSchema = MysqlDbSchema;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rdyl/node-mysql",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "types/index.d.ts",

package/types/helper.d.ts

@@ -1,7 +1,9 @@
+import mysql from "mysql2/promise";
 import { SortKey, SelectOption, OptionsType } from "./interface";
 declare class BaseHelper {
     _tableName: string;
-    constructor(_tableName: string);
+    pool: mysql.Pool;
+    constructor(db: string, _tableName: string);
     selects: SelectOption[];
     options: OptionsType;
     get selectStat(): {
@@ -19,7 +21,7 @@ declare class BaseHelper {
 /** @description 查询数据 */
 export declare class MysqlSelector extends BaseHelper {
     exFields: string[];
-    constructor(t: string, exFields?: string[]);
+    constructor(d: string, t: string, exFields?: string[]);
     get sql(): string;
     get countSql(): string;
     total(): Promise<any>;
@@ -47,14 +49,14 @@ export declare class MysqlSelector extends BaseHelper {
 export declare class MysqlInserter extends BaseHelper {
     values: Array<unknown[]>;
     fields: string[];
-    constructor(t: string, fields?: string[]);
+    constructor(d: string, t: string, fields?: string[]);
     get sql(): string;
     push(...arr: Record<string, unknown>[]): void;
     result(): Promise<number[]>;
 }
 /** @description 删除数据 */
 export declare class MysqlDeleter extends BaseHelper {
-    constructor(t: string);
+    constructor(d: string, t: string);
     get sql(): string;
     /** @查询结果 */
     result(): Promise<any>;
@@ -64,7 +66,7 @@ export declare class MysqlDeleter extends BaseHelper {
 /** @description 更新数据 */
 export declare class MysqlUpdater extends BaseHelper {
     exFields: string[];
-    constructor(t: string, exFields?: string[]);
+    constructor(d: string, t: string, exFields?: string[]);
     updateFields: Record<string, unknown>;
     get updateStat(): {
         sql: string;

package/types/index.d.ts

@@ -1,6 +1,8 @@
-import mysql from 'mysql2/promise';
-export declare function setup(opts: mysql.PoolOptions): void;
-export * from './helper';
-export * from './meta';
-export * from './interface';
-export * from './utils';
+import mysql from "mysql2/promise";
+export * from "./helper";
+export * from "./meta";
+export * from "./interface";
+export * from "./utils";
+export declare function CreateMysql(props: mysql.PoolOptions): {
+    setup(database: string): void;
+};

package/types/meta.d.ts

@@ -2,13 +2,14 @@
  * @description
  * 使用$toMap时 不返回的字段名前面需要加$
  */
-export declare class DbSchema implements DbBaseType {
+export declare class MysqlDbSchema implements MysqlDbBaseType {
+    $database: string;
     $table: string;
     $mapExFields: string[];
     id: number | string;
     createTime: string;
     updateTime: string;
-    constructor($table: string, $mapExFields?: string[]);
+    constructor($database: string, $table: string, $mapExFields?: string[]);
     get $toJson(): Record<string, any>;
     get $toMap(): {
         [k: string]: any;
@@ -16,7 +17,7 @@ export declare class DbSchema implements DbBaseType {
     get $fields(): string[];
     $formJson(json: Record<string, unknown>): void;
     $get(): Promise<this | null>;
-    $insert(uniqueKey?: string): Promise<DbResultStat>;
-    $remove(): Promise<DbResultStat>;
-    $update(maps: Record<string, unknown>): Promise<DbResultStat>;
+    $insert(uniqueKey?: string): Promise<MysqlDbResultStat>;
+    $remove(): Promise<MysqlDbResultStat>;
+    $update(maps: Record<string, unknown>): Promise<MysqlDbResultStat>;
 }

package/types/type.d.ts

@@ -1,9 +1,9 @@
 type DbId = number | string;
 
-interface DbBaseType {
+interface MysqlDbBaseType {
   id: DbId;
   createTime: string;
   updateTime: string;
 }
 
-type DbResultStat = "exist" | "ok" | "fail";
+type MysqlDbResultStat = "exist" | "ok" | "fail";