@rdyl/node-mysql 0.3.6 → 0.3.8

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.3.5 (2025-12-31)
+## 0.3.8 (2025-12-31)
 
 
 

package/dist/helper.js

@@ -97,16 +97,17 @@ var BaseHelper = /** @class */ (function () {
                 /* 单个角色对象 */
                 relatedFields.forEach(function (n) {
                     var item = _this.related[n];
-                    // @ts-ignore
-                    var _a = (global.$MysqlTable[item.table] || {}).fields, fields = _a === void 0 ? [] : _a;
+                    var model = item.model;
+                    var fields = model.$mapFields;
+                    var rTable = model.$table;
                     var fieldsSql = "\n".concat(fields
-                        .map(function (e) { return "      '".concat(e, "', ").concat(item.table, ".").concat(utils_1.Parser.toDbName(e)); })
+                        .map(function (e) { return "      '".concat(e, "', ").concat(rTable, ".").concat(utils_1.Parser.toDbName(e)); })
                         .join(",\n"), "\n");
                     if (item.isArray) {
-                        sqlList.push("COALESCE(\n  (\n    SELECT JSON_ARRAYAGG(\n      JSON_OBJECT(".concat(fieldsSql, "    )\n    )\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  ),\n  JSON_ARRAY()\n) AS ").concat(n, "\n"));
+                        sqlList.push("COALESCE(\n  (\n    SELECT JSON_ARRAYAGG(\n      JSON_OBJECT(".concat(fieldsSql, "    )\n    )\n    FROM ").concat(item.related, "\n    JOIN ").concat(rTable, " ON ").concat(rTable, ".id = ").concat(item.related, ".").concat(rTable, "_id\n    WHERE ").concat(item.related, ".").concat(_this.table, "_id = ").concat(_this.table, ".id\n  ),\n  JSON_ARRAY()\n) AS ").concat(n, "\n"));
                     }
                     else {
-                        sqlList.push("COALESCE(\n  (\n    SELECT JSON_OBJECT(".concat(fieldsSql, "    )\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 ").concat(n, "\n"));
+                        sqlList.push("COALESCE(\n  (\n    SELECT JSON_OBJECT(".concat(fieldsSql, "    )\n    FROM ").concat(item.related, "\n    JOIN ").concat(rTable, " ON ").concat(rTable, ".id = ").concat(item.related, ".").concat(rTable, "_id\n    WHERE ").concat(item.related, ".").concat(_this.table, "_id = ").concat(_this.table, ".id\n    LIMIT 1\n  ),\n  JSON_OBJECT()\n) AS ").concat(n, "\n"));
                     }
                 });
             }

package/dist/meta.js

@@ -71,22 +71,29 @@ var MysqlDbSchema = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(MysqlDbSchema.prototype, "$toMap", {
+    Object.defineProperty(MysqlDbSchema.prototype, "$fields", {
+        get: function () {
+            return Object.keys(this.$toJson);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(MysqlDbSchema.prototype, "$mapFields", {
         get: function () {
             var _this = this;
-            var target = this.$toJson;
-            return Object.fromEntries(Object.keys(target)
-                .filter(function (k) { return !_this.$mapExFields.includes(k); })
-                .map(function (k) {
-                return [k, target[k]];
-            }));
+            var list = this.$fields.filter(function (k) { return !_this.$mapExFields.includes(k); });
+            list.push.apply(list, Object.keys(this.$related));
+            return list;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(MysqlDbSchema.prototype, "$fields", {
+    Object.defineProperty(MysqlDbSchema.prototype, "$toMap", {
         get: function () {
-            return Object.keys(this.$toJson);
+            var target = this.$toJson;
+            return Object.fromEntries(this.$mapFields.map(function (k) {
+                return [k, target[k]];
+            }));
         },
         enumerable: false,
         configurable: true

package/package.json

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

package/types/meta.d.ts

@@ -14,8 +14,9 @@ export declare class MysqlDbSchema implements MysqlDbBaseType {
         related?: Record<string, MysqlRelatedField>;
     });
     get $toJson(): any;
-    get $toMap(): any;
     get $fields(): string[];
+    get $mapFields(): string[];
+    get $toMap(): any;
     $formJson(json: Record<string, unknown>): void;
     $get(): Promise<this | null>;
     $insert(uniqueKey?: string): Promise<MysqlDbResultStat>;

package/types/type.d.ts

@@ -9,7 +9,7 @@ interface MysqlDbBaseType {
 type MysqlDbResultStat = "exist" | "ok" | "fail";
 
 type MysqlRelatedField = {
-  table: string;
-  relatedTable: string;
+  model: import("./meta").MysqlDbSchema;
+  related: string;
   isArray?: boolean;
 };