@rdyl/node-mysql 0.1.0 → 0.1.2

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.0.9 (2025-04-21)
+## 0.1.1 (2025-08-26)
 
 
 

package/dist/helper.js

@@ -161,11 +161,8 @@ var BaseHelper = /** @class */ (function () {
 /** @description 查询数据 */
 var MysqlSelector = /** @class */ (function (_super) {
     __extends(MysqlSelector, _super);
-    function MysqlSelector(d, t, exFields) {
-        if (exFields === void 0) { exFields = []; }
-        var _this = _super.call(this, d, t) || this;
-        _this.exFields = exFields;
-        return _this;
+    function MysqlSelector(d, t) {
+        return _super.call(this, d, t) || this;
     }
     Object.defineProperty(MysqlSelector.prototype, "sql", {
         get: function () {
@@ -217,8 +214,9 @@ var MysqlSelector = /** @class */ (function (_super) {
     };
     /** @查询结果 */
     MysqlSelector.prototype.result = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, selectStat, sql, res, exFields_1, get, _b;
+        return __awaiter(this, arguments, void 0, function (exFields) {
+            var _a, selectStat, sql, res, get, _b;
+            if (exFields === void 0) { exFields = []; }
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -227,14 +225,16 @@ var MysqlSelector = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.pool.execute(sql, selectStat.values)];
                     case 1:
                         res = (_c.sent())[0];
-                        exFields_1 = this.exFields;
                         get = function (obj) {
-                            return Object.fromEntries(
-                            // @ts-ignore
-                            Object.keys(obj)
-                                .filter(function (k) { return !exFields_1.includes(utils_1.Parser.toFieldName(k)); })
-                                // @ts-ignore
-                                .map(function (k) { return [utils_1.Parser.toFieldName(k), obj[k]]; }));
+                            var target = {};
+                            for (var k in obj) {
+                                var key = utils_1.Parser.toFieldName(k);
+                                if (!exFields.includes(key)) {
+                                    // @ts-ignore
+                                    target[key] = obj[k];
+                                }
+                            }
+                            return target;
                         };
                         if (Array.isArray(res)) {
                             return [2 /*return*/, res.map(get)];
@@ -390,28 +390,6 @@ var MysqlDeleter = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    /** @查询结果 */
-    MysqlDeleter.prototype.result = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, sql, selectStat, res, err_1;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 2, , 3]);
-                        _a = this, sql = _a.sql, selectStat = _a.selectStat;
-                        return [4 /*yield*/, this.pool.execute(sql, selectStat.values)];
-                    case 1:
-                        res = (_b.sent())[0];
-                        // @ts-ignore
-                        return [2 /*return*/, res.affectedRows];
-                    case 2:
-                        err_1 = _b.sent();
-                        return [2 /*return*/, 0];
-                    case 3: return [2 /*return*/];
-                }
-            });
-        });
-    };
     /** @根据id删除 */
     MysqlDeleter.prototype.removeById = function (value) {
         return __awaiter(this, void 0, void 0, function () {
@@ -434,6 +412,27 @@ var MysqlDeleter = /** @class */ (function (_super) {
             });
         });
     };
+    MysqlDeleter.prototype.result = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, sql, selectStat, res, err_1;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 2, , 3]);
+                        _a = this, sql = _a.sql, selectStat = _a.selectStat;
+                        return [4 /*yield*/, this.pool.execute(sql, selectStat.values)];
+                    case 1:
+                        res = (_b.sent())[0];
+                        // @ts-ignore
+                        return [2 /*return*/, res.affectedRows];
+                    case 2:
+                        err_1 = _b.sent();
+                        return [2 /*return*/, 0];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
     return MysqlDeleter;
 }(BaseHelper));
 exports.MysqlDeleter = MysqlDeleter;
@@ -492,7 +491,6 @@ var MysqlUpdater = /** @class */ (function (_super) {
         this.updateFields = __assign(__assign({}, this.updateFields), values);
         return this;
     };
-    /** @查询结果 */
     MysqlUpdater.prototype.result = function () {
         return __awaiter(this, void 0, void 0, function () {
             var _a, sql, selectStat, updateStat, values, res, err_2;

package/dist/index.js

@@ -24,6 +24,42 @@ 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 };
 };
@@ -37,8 +73,18 @@ __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 }));
+            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*/];
+                });
+            });
         },
     };
 }

package/dist/meta.js

@@ -103,11 +103,12 @@ var MysqlDbSchema = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        selector = new helper_1.MysqlSelector(this.$database, this.$table, this.$mapExFields);
+                        selector = new helper_1.MysqlSelector(this.$database, this.$table);
                         return [4 /*yield*/, selector.getById(this.id)];
                     case 1:
                         res = _a.sent();
                         if (res) {
+                            // @ts-ignore
                             this.$formJson(res);
                             return [2 /*return*/, this];
                         }

package/package.json

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

package/types/helper.d.ts

@@ -19,30 +19,23 @@ declare class BaseHelper {
     sort(field: string, v: SortKey): this;
 }
 /** @description 查询数据 */
-export declare class MysqlSelector extends BaseHelper {
-    exFields: string[];
-    constructor(d: string, t: string, exFields?: string[]);
+export declare class MysqlSelector<T = object> extends BaseHelper {
+    constructor(d: string, t: string);
     get sql(): string;
     get countSql(): string;
-    total(): Promise<any>;
+    total(): Promise<number>;
     /** @查询结果 */
-    result(): Promise<{
-        [k: string]: any;
-    }[]>;
+    result(exFields?: string[]): Promise<T[]>;
     /** @根据id查询 */
-    getById(value: number | string): Promise<{
-        [k: string]: any;
-    } | null>;
+    getById(value: number | string): Promise<T | null>;
     paged(param: {
         page: number;
         pageSize: number;
     }): Promise<{
         page: number;
         pageSize: number;
-        records: {
-            [k: string]: any;
-        }[];
-        total: any;
+        records: T[];
+        total: number;
     }>;
 }
 /** @description 插入数据 */
@@ -58,10 +51,9 @@ export declare class MysqlInserter extends BaseHelper {
 export declare class MysqlDeleter extends BaseHelper {
     constructor(d: string, t: string);
     get sql(): string;
-    /** @查询结果 */
-    result(): Promise<any>;
     /** @根据id删除 */
     removeById(value: number | string): Promise<"ok" | "fail">;
+    result(): Promise<any>;
 }
 /** @description 更新数据 */
 export declare class MysqlUpdater extends BaseHelper {
@@ -75,7 +67,6 @@ export declare class MysqlUpdater extends BaseHelper {
     get sql(): string;
     setField(field: string, v: unknown): this;
     setFields(values: Record<string, unknown>): this;
-    /** @查询结果 */
     result(): Promise<any>;
 }
 export {};

package/types/index.d.ts

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