@rdyl/node-mysql 0.2.5 → 0.2.7

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.2.4 (2025-08-29)
+## 0.2.7 (2025-12-31)
 
 
 

package/dist/helper.js

@@ -75,8 +75,10 @@ exports.MysqlUpdater = exports.MysqlDeleter = exports.MysqlInserter = exports.My
 var interface_1 = require("./interface");
 var utils_1 = require("./utils");
 var BaseHelper = /** @class */ (function () {
-    function BaseHelper(table) {
+    function BaseHelper(table, related) {
+        if (related === void 0) { related = {}; }
         this.table = table;
+        this.related = related;
         this.selects = [];
         this.options = {
             limit: 0,
@@ -86,6 +88,30 @@ var BaseHelper = /** @class */ (function () {
         // @ts-ignore
         this.pool = global.$MysqlPool;
     }
+    Object.defineProperty(BaseHelper.prototype, "relatedStat", {
+        get: function () {
+            var _this = this;
+            var relatedFields = Object.keys(this.related);
+            var sqlList = [];
+            if (relatedFields.length) {
+                // @ts-ignore
+                var _a = (global.$MysqlTable[table] || {}).fields, fields_1 = _a === void 0 ? [] : _a;
+                /* 单个角色对象 */
+                relatedFields.forEach(function (n) {
+                    var item = _this.related[n];
+                    var itemSql = "COALESCE(\n  (\n    SELECT JSON_OBJECT(".concat(fields_1
+                        .map(function (e) { return "".concat(e, ": ").concat(item.table, ".").concat(e); })
+                        .join(","), ")\n    FROM ").concat(item.relatedTable, "\n    JOIN ").concat(item.table, " ON ").concat(item.table, ".id = ").concat(item.relatedTable, ".").concat(item.table, "_id\n    WHERE ").concat(item.relatedTable, ".").concat(_this.table, "_id = ").concat(_this.table, ".id\n    LIMIT 1\n  ),\n  JSON_OBJECT()\n) AS role");
+                    sqlList.push(itemSql);
+                });
+            }
+            return {
+                sql: sqlList.join(",\n"),
+            };
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(BaseHelper.prototype, "selectStat", {
         get: function () {
             var sql = "";
@@ -161,8 +187,8 @@ var BaseHelper = /** @class */ (function () {
 /** @description 查询数据 */
 var MysqlSelector = /** @class */ (function (_super) {
     __extends(MysqlSelector, _super);
-    function MysqlSelector(d) {
-        return _super.call(this, d) || this;
+    function MysqlSelector(table, related) {
+        return _super.call(this, table, related) || this;
     }
     Object.defineProperty(MysqlSelector.prototype, "sql", {
         get: function () {
@@ -182,7 +208,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.table);
+            var target = "SELECT COUNT(*) AS count FROM ".concat(this.table);
             if (selectStat.sql) {
                 target += selectStat.sql;
             }
@@ -237,14 +263,12 @@ var MysqlSelector = /** @class */ (function (_super) {
                             }
                             return target;
                         };
-                        console.log(res);
                         if (Array.isArray(res)) {
                             return [2 /*return*/, res.map(get)];
                         }
                         return [2 /*return*/, [get(res)]];
                     case 2:
                         err_1 = _b.sent();
-                        console.log(err_1);
                         return [2 /*return*/, []];
                     case 3: return [2 /*return*/];
                 }
@@ -315,7 +339,7 @@ var MysqlInserter = /** @class */ (function (_super) {
         get: function () {
             return "INSERT INTO ".concat(this.table, " (").concat(this.fields
                 .map(utils_1.Parser.toDbName)
-                .join(", "), ") \nVALUES (").concat(this.fields.map(function () { return "?"; }).join(", "), ")");
+                .join(", "), ") VALUES (").concat(this.fields.map(function () { return "?"; }).join(", "), ")");
         },
         enumerable: false,
         configurable: true
@@ -450,7 +474,7 @@ var MysqlUpdater = /** @class */ (function (_super) {
     Object.defineProperty(MysqlUpdater.prototype, "updateStat", {
         get: function () {
             var updateFields = this.updateFields;
-            var keys = Object.keys(updateFields).filter(function (k) { return k !== "id" && k !== "createTime"; });
+            var keys = Object.keys(updateFields).filter(function (k) { return k !== "id" && k !== "createAt"; });
             var sql = "";
             var values = [];
             if (keys.length > 0) {

package/dist/meta.js

@@ -45,13 +45,16 @@ var utils_1 = require("./utils");
  * 使用$toMap时 不返回的字段名前面需要加$
  */
 var MysqlDbSchema = /** @class */ (function () {
-    function MysqlDbSchema($table, $mapExFields) {
-        if ($mapExFields === void 0) { $mapExFields = []; }
+    function MysqlDbSchema($table, opts) {
         this.$table = $table;
-        this.$mapExFields = $mapExFields;
         this.id = "";
-        this.createTime = utils_1.Parser.easyDate();
-        this.updateTime = utils_1.Parser.easyDate();
+        this.createAt = utils_1.Parser.easyDate();
+        this.updateAt = utils_1.Parser.easyDate();
+        this.$mapExFields = [];
+        this.$related = {};
+        var _a = opts || {}, _b = _a.exFields, exFields = _b === void 0 ? [] : _b, _c = _a.related, related = _c === void 0 ? {} : _c;
+        this.$mapExFields = exFields;
+        this.$related = related;
     }
     Object.defineProperty(MysqlDbSchema.prototype, "$toJson", {
         get: function () {
@@ -103,7 +106,7 @@ var MysqlDbSchema = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        selector = new helper_1.MysqlSelector(this.$table);
+                        selector = new helper_1.MysqlSelector(this.$table, this.$related);
                         return [4 /*yield*/, selector.getById(this.id)];
                     case 1:
                         res = _a.sent();

package/dist/utils.js

@@ -95,13 +95,13 @@ exports.Parser = {
                     case 0:
                         pool = global.$MysqlPool;
                         _a = global.$MysqlTable[table], fields = _a.fields, json = _a.json;
-                        return [4 /*yield*/, pool.execute("\n    CREATE TABLE IF NOT EXISTS `".concat(table, "` (\n      id BIGINT AUTO_INCREMENT PRIMARY KEY,\n      create_time VARCHAR(255),\n      update_time VARCHAR(255)\n    )\n  "))];
+                        return [4 /*yield*/, pool.execute("\n    CREATE TABLE IF NOT EXISTS `".concat(table, "` (\n      id BIGINT AUTO_INCREMENT PRIMARY KEY,\n      create_at VARCHAR(255),\n      update_at VARCHAR(255)\n    )\n  "))];
                     case 1:
                         _c.sent();
                         return [4 /*yield*/, pool.execute("SELECT COLUMN_NAME \n     FROM INFORMATION_SCHEMA.COLUMNS \n     WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = ?", [table])];
                     case 2:
                         rows = (_c.sent())[0];
-                        ex = ["id", "create_time", "update_time"];
+                        ex = ["id", "create_at", "update_at"];
                         columns = rows.map(function (r) { return r.COLUMN_NAME; });
                         fieldKeys = fields.map(exports.Parser.toDbName);
                         add = fieldKeys.filter(function (c) { return !columns.includes(c); });

package/package.json

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

package/types/helper.d.ts

@@ -2,10 +2,14 @@ import mysql from "mysql2/promise";
 import { SortKey, SelectOption, OptionsType } from "./interface";
 declare class BaseHelper {
     table: string;
+    private related;
     pool: mysql.Pool;
-    constructor(table: string);
+    constructor(table: string, related?: Record<string, MysqlRelatedField>);
     selects: SelectOption[];
     options: OptionsType;
+    get relatedStat(): {
+        sql: string;
+    };
     get selectStat(): {
         sql: string;
         values: unknown[];
@@ -20,7 +24,7 @@ declare class BaseHelper {
 }
 /** @description 查询数据 */
 export declare class MysqlSelector<T = object> extends BaseHelper {
-    constructor(d: string);
+    constructor(table: string, related?: Record<string, MysqlRelatedField>);
     get sql(): string;
     get countSql(): string;
     total(): Promise<number>;

package/types/meta.d.ts

@@ -3,12 +3,16 @@
  * 使用$toMap时 不返回的字段名前面需要加$
  */
 export declare class MysqlDbSchema implements MysqlDbBaseType {
-    private $table;
-    private $mapExFields;
+    readonly $table: string;
     id: number | string;
-    createTime: string;
-    updateTime: string;
-    constructor($table: string, $mapExFields?: string[]);
+    createAt: string;
+    updateAt: string;
+    readonly $mapExFields: string[];
+    readonly $related: Record<string, MysqlRelatedField>;
+    constructor($table: string, opts?: {
+        exFields?: string[];
+        related?: Record<string, MysqlRelatedField>;
+    });
     get $toJson(): any;
     get $toMap(): any;
     get $fields(): string[];

package/types/type.d.ts

@@ -2,8 +2,14 @@ type DbId = number | string;
 
 interface MysqlDbBaseType {
   id: DbId;
-  createTime: string;
-  updateTime: string;
+  createAt: string;
+  updateAt: string;
 }
 
 type MysqlDbResultStat = "exist" | "ok" | "fail";
+
+type MysqlRelatedField = {
+  table: string;
+  relatedTable: string;
+  isArray?: boolean;
+};