@rdyl/node-mysql 0.1.7 → 0.1.9

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.1.6 (2025-08-26)
+## 0.1.8 (2025-08-26)
 
 
 

package/dist/helper.js

@@ -75,8 +75,8 @@ exports.MysqlUpdater = exports.MysqlDeleter = exports.MysqlInserter = exports.My
 var interface_1 = require("./interface");
 var utils_1 = require("./utils");
 var BaseHelper = /** @class */ (function () {
-    function BaseHelper(db, _tableName) {
-        this._tableName = _tableName;
+    function BaseHelper(table) {
+        this.table = table;
         this.selects = [];
         this.options = {
             limit: 0,
@@ -84,7 +84,7 @@ var BaseHelper = /** @class */ (function () {
             sort: {},
         };
         // @ts-ignore
-        this.pool = global.$MysqlDb[db];
+        this.pool = global.$MysqlPool;
     }
     Object.defineProperty(BaseHelper.prototype, "selectStat", {
         get: function () {
@@ -161,13 +161,13 @@ var BaseHelper = /** @class */ (function () {
 /** @description 查询数据 */
 var MysqlSelector = /** @class */ (function (_super) {
     __extends(MysqlSelector, _super);
-    function MysqlSelector(d, t) {
-        return _super.call(this, d, t) || this;
+    function MysqlSelector(d) {
+        return _super.call(this, d) || this;
     }
     Object.defineProperty(MysqlSelector.prototype, "sql", {
         get: function () {
             var _a = this, selectStat = _a.selectStat, optionStat = _a.optionStat;
-            var target = "SELECT * FROM ".concat(this._tableName);
+            var target = "SELECT * FROM ".concat(this.table);
             if (selectStat.sql) {
                 target += selectStat.sql;
             }
@@ -182,7 +182,7 @@ var MysqlSelector = /** @class */ (function (_super) {
     Object.defineProperty(MysqlSelector.prototype, "countSql", {
         get: function () {
             var selectStat = this.selectStat;
-            var target = "SELECT COUNT(*) AS count FROM users ".concat(this._tableName);
+            var target = "SELECT COUNT(*) AS count FROM users ".concat(this.table);
             if (selectStat.sql) {
                 target += selectStat.sql;
             }
@@ -301,16 +301,16 @@ exports.MysqlSelector = MysqlSelector;
 /** @description 插入数据 */
 var MysqlInserter = /** @class */ (function (_super) {
     __extends(MysqlInserter, _super);
-    function MysqlInserter(d, t, fields) {
-        if (fields === void 0) { fields = []; }
-        var _this = _super.call(this, d, t) || this;
+    function MysqlInserter(t) {
+        var _this = _super.call(this, t) || this;
         _this.values = [];
-        _this.fields = fields.filter(function (e) { return e !== "id"; });
+        // @ts-ignore
+        _this.fields = (_this.$MysqlTable[t].fields || []).filter(function (e) { return e !== "id"; });
         return _this;
     }
     Object.defineProperty(MysqlInserter.prototype, "sql", {
         get: function () {
-            return "INSERT INTO ".concat(this._tableName, " (").concat(this.fields
+            return "INSERT INTO ".concat(this.table, " (").concat(this.fields
                 .map(utils_1.Parser.toDbName)
                 .join(", "), ") \nVALUES (").concat(this.fields.map(function () { return "?"; }).join(", "), ")");
         },
@@ -372,13 +372,13 @@ exports.MysqlInserter = MysqlInserter;
 /** @description 删除数据 */
 var MysqlDeleter = /** @class */ (function (_super) {
     __extends(MysqlDeleter, _super);
-    function MysqlDeleter(d, t) {
-        return _super.call(this, d, t) || this;
+    function MysqlDeleter(t) {
+        return _super.call(this, t) || this;
     }
     Object.defineProperty(MysqlDeleter.prototype, "sql", {
         get: function () {
             var _a = this, selectStat = _a.selectStat, optionStat = _a.optionStat;
-            var target = "DELETE FROM ".concat(this._tableName);
+            var target = "DELETE FROM ".concat(this.table);
             if (selectStat.sql) {
                 target += selectStat.sql;
             }
@@ -439,8 +439,8 @@ exports.MysqlDeleter = MysqlDeleter;
 /** @description 更新数据 */
 var MysqlUpdater = /** @class */ (function (_super) {
     __extends(MysqlUpdater, _super);
-    function MysqlUpdater(d, t) {
-        var _this = _super.call(this, d, t) || this;
+    function MysqlUpdater(t) {
+        var _this = _super.call(this, t) || this;
         _this.updateFields = {};
         return _this;
     }
@@ -470,7 +470,7 @@ var MysqlUpdater = /** @class */ (function (_super) {
     Object.defineProperty(MysqlUpdater.prototype, "sql", {
         get: function () {
             var _a = this, updateStat = _a.updateStat, selectStat = _a.selectStat, optionStat = _a.optionStat;
-            var target = "UPDATE ".concat(this._tableName);
+            var target = "UPDATE ".concat(this.table);
             if (selectStat.sql && updateStat.sql) {
                 target += updateStat.sql;
                 target += selectStat.sql;

package/dist/index.js

@@ -1,15 +1,4 @@
 "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);
@@ -24,67 +13,17 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateMysql = CreateMysql;
+exports.setup = setup;
 var promise_1 = __importDefault(require("mysql2/promise")); // 使用 Promise 接口
 __exportStar(require("./helper"), exports);
 __exportStar(require("./meta"), exports);
 __exportStar(require("./interface"), exports);
 __exportStar(require("./utils"), exports);
-function CreateMysql(props) {
-    return {
-        setup: function (database) {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    // @ts-ignore
-                    if (!global.$MysqlDb) {
-                        // @ts-ignore
-                        global.$MysqlDb = {};
-                    }
-                    // @ts-ignore
-                    global.$MysqlDb[database] = promise_1.default.createPool(__assign(__assign({}, props), { database: database }));
-                    return [2 /*return*/];
-                });
-            });
-        },
-    };
+function setup(props) {
+    // @ts-ignore
+    global.$MysqlPool = promise_1.default.createPool(props);
 }

package/dist/meta.js

@@ -45,9 +45,8 @@ var utils_1 = require("./utils");
  * 使用$toMap时 不返回的字段名前面需要加$
  */
 var MysqlDbSchema = /** @class */ (function () {
-    function MysqlDbSchema($database, $table, $mapExFields) {
+    function MysqlDbSchema($table, $mapExFields) {
         if ($mapExFields === void 0) { $mapExFields = []; }
-        this.$database = $database;
         this.$table = $table;
         this.$mapExFields = $mapExFields;
         this.id = "";
@@ -104,7 +103,7 @@ var MysqlDbSchema = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        selector = new helper_1.MysqlSelector(this.$database, this.$table);
+                        selector = new helper_1.MysqlSelector(this.$table);
                         return [4 /*yield*/, selector.getById(this.id)];
                     case 1:
                         res = _a.sent();
@@ -124,7 +123,7 @@ var MysqlDbSchema = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        inserter = new helper_1.MysqlInserter(this.$database, this.$table, this.$fields);
+                        inserter = new helper_1.MysqlInserter(this.$table);
                         inserter.push(this.$toJson);
                         if (!uniqueKey) return [3 /*break*/, 2];
                         return [4 /*yield*/, inserter.pool.query("SELECT 1 FROM ".concat(this.$table, " WHERE ").concat(uniqueKey, " = ? LIMIT 1"), [this.$toJson[uniqueKey]])];
@@ -156,7 +155,7 @@ var MysqlDbSchema = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        deleter = new helper_1.MysqlDeleter(this.$database, this.$table);
+                        deleter = new helper_1.MysqlDeleter(this.$table);
                         return [4 /*yield*/, this.$get()];
                     case 1:
                         user = _a.sent();
@@ -174,7 +173,7 @@ var MysqlDbSchema = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        updater = new helper_1.MysqlUpdater(this.$database, this.$table);
+                        updater = new helper_1.MysqlUpdater(this.$table);
                         return [4 /*yield*/, this.$get()];
                     case 1:
                         user = _a.sent();
@@ -209,6 +208,6 @@ function MysqlRegister() {
             }
             return item;
         }, {});
-        utils_1.Parser.dynamicConnectTable(target.$database, target.$table, json);
+        utils_1.Parser.createTableBy(target.$table, json);
     };
 }

package/dist/utils.js

@@ -81,13 +81,13 @@ exports.Parser = {
             return "'".concat(v, "'");
         return "".concat(v);
     },
-    dynamicConnectTable: function (db, table, json) {
+    createTableBy: function (table, json) {
         return __awaiter(this, void 0, void 0, function () {
-            var pool, rows, currentCols, dbKeys, addCols, dropCols, _i, addCols_1, col, type, _a, dropCols_1, col;
+            var pool, rows, currentCols, mapKeys, dbKeys, addCols, dropCols, _i, addCols_1, col, type, _a, dropCols_1, col;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        pool = global.$MysqlDb[db];
+                        pool = global.$MysqlPool;
                         return [4 /*yield*/, pool.execute("\n    CREATE TABLE IF NOT EXISTS `".concat(table, "` (\n      id BIGINT AUTO_INCREMENT PRIMARY KEY,\n      create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,\n      update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\n    )\n  "))];
                     case 1:
                         _b.sent();
@@ -95,7 +95,8 @@ exports.Parser = {
                     case 2:
                         rows = (_b.sent())[0];
                         currentCols = rows.map(function (r) { return r.COLUMN_NAME; });
-                        dbKeys = Object.keys(json)
+                        mapKeys = Object.keys(json);
+                        dbKeys = mapKeys
                             .filter(function (k) { return !["id", "createTime", "updateTime"].includes(k); })
                             .map(exports.Parser.toDbName);
                         addCols = dbKeys.filter(function (k) { return !currentCols.includes(k); });
@@ -130,7 +131,12 @@ exports.Parser = {
                     case 9:
                         _a++;
                         return [3 /*break*/, 7];
-                    case 10: return [4 /*yield*/, pool.end()];
+                    case 10:
+                        // @ts-ignore
+                        this.$MysqlTable[table] = {
+                            fields: mapKeys,
+                        };
+                        return [4 /*yield*/, pool.end()];
                     case 11:
                         _b.sent();
                         return [2 /*return*/];

package/package.json

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

package/types/helper.d.ts

@@ -1,9 +1,9 @@
 import mysql from "mysql2/promise";
 import { SortKey, SelectOption, OptionsType } from "./interface";
 declare class BaseHelper {
-    _tableName: string;
+    table: string;
     pool: mysql.Pool;
-    constructor(db: string, _tableName: string);
+    constructor(table: string);
     selects: SelectOption[];
     options: OptionsType;
     get selectStat(): {
@@ -20,7 +20,7 @@ declare class BaseHelper {
 }
 /** @description 查询数据 */
 export declare class MysqlSelector<T = object> extends BaseHelper {
-    constructor(d: string, t: string);
+    constructor(d: string);
     get sql(): string;
     get countSql(): string;
     total(): Promise<number>;
@@ -42,14 +42,14 @@ export declare class MysqlSelector<T = object> extends BaseHelper {
 export declare class MysqlInserter extends BaseHelper {
     values: Array<unknown[]>;
     fields: string[];
-    constructor(d: string, t: string, fields?: string[]);
+    constructor(t: string);
     get sql(): string;
     push(...arr: Record<string, unknown>[]): void;
     result(): Promise<number[]>;
 }
 /** @description 删除数据 */
 export declare class MysqlDeleter extends BaseHelper {
-    constructor(d: string, t: string);
+    constructor(t: string);
     get sql(): string;
     /** @根据id删除 */
     removeById(value: number | string): Promise<"ok" | "fail">;
@@ -57,7 +57,7 @@ export declare class MysqlDeleter extends BaseHelper {
 }
 /** @description 更新数据 */
 export declare class MysqlUpdater extends BaseHelper {
-    constructor(d: string, t: string);
+    constructor(t: string);
     updateFields: Record<string, unknown>;
     get updateStat(): {
         sql: string;

package/types/index.d.ts

@@ -3,6 +3,4 @@ export * from "./helper";
 export * from "./meta";
 export * from "./interface";
 export * from "./utils";
-export declare function CreateMysql(props: mysql.PoolOptions): {
-    setup(database: string): Promise<void>;
-};
+export declare function setup(props: mysql.PoolOptions): void;

package/types/meta.d.ts

@@ -3,13 +3,12 @@
  * 使用$toMap时 不返回的字段名前面需要加$
  */
 export declare class MysqlDbSchema implements MysqlDbBaseType {
-    private $database;
     private $table;
     private $mapExFields;
     id: number | string;
     createTime: string;
     updateTime: string;
-    constructor($database: string, $table: string, $mapExFields?: string[]);
+    constructor($table: string, $mapExFields?: string[]);
     get $toJson(): any;
     get $toMap(): any;
     get $fields(): string[];

package/types/utils.d.ts

@@ -4,5 +4,5 @@ export declare const Parser: {
     toFieldName(str: string): string;
     toValuesOf(values: unknown[]): string;
     valueTypeOf(v: unknown): string;
-    dynamicConnectTable(db: string, table: string, json: Record<string, any>): Promise<void>;
+    createTableBy(table: string, json: Record<string, any>): Promise<void>;
 };