@rdyl/node-mysql 0.0.2 → 0.0.4

package/dist/meta.js

@@ -1,113 +1,201 @@
 "use strict";
+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 };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConditionKey = exports.SortKey = exports.RelationKey = exports.Options = exports.Condition = void 0;
+exports.DbSchema = void 0;
+var helper_1 = require("./helper");
 var utils_1 = require("./utils");
-var Condition = /** @class */ (function () {
-    function Condition(props) {
-        this.field = props.field;
-        this.value = props.value;
-        this.condition = props.condition || ConditionKey.eq;
-        this.relation = props.relation || RelationKey.and;
+/**
+ * @description
+ * 使用$toMap时 不返回的字段名前面需要加$
+ */
+var DbSchema = /** @class */ (function () {
+    function DbSchema($table, $mapExFields) {
+        if ($mapExFields === void 0) { $mapExFields = []; }
+        this.$table = $table;
+        this.$mapExFields = $mapExFields;
+        this.id = '';
+        this.createTime = utils_1.Parser.easyDate();
+        this.updateTime = utils_1.Parser.easyDate();
     }
-    Object.defineProperty(Condition.prototype, "_valueSql", {
+    Object.defineProperty(DbSchema.prototype, "$toJson", {
         get: function () {
-            var target = '';
-            var _a = this, condition = _a.condition, value = _a.value;
-            if (condition == ConditionKey.include) {
-                if (Array.isArray(value) && value.length > 0) {
-                    target = utils_1.MysqlParser.toValuesOf(value);
+            var _this = this;
+            return Object.keys(this).reduce(function (obj, key) {
+                if (!key.startsWith('$') &&
+                    Object.prototype.hasOwnProperty.call(_this, key)) {
+                    // @ts-ignore
+                    obj[key] = _this[key];
                 }
-            }
-            else if (condition == ConditionKey.area) {
-                if (Array.isArray(value) && value.length > 0) {
-                    target = "".concat(value[0], " AND ").concat(value[1]);
-                }
-            }
-            else {
-                target = utils_1.MysqlParser.valueTypeOf(value);
-            }
-            return target;
+                return obj;
+            }, {});
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(Condition.prototype, "result", {
+    Object.defineProperty(DbSchema.prototype, "$toMap", {
         get: function () {
-            var target = '';
-            var _a = this, condition = _a.condition, field = _a.field;
-            if (this._valueSql) {
-                if (condition == ConditionKey.not) {
-                    target += 'NOT ';
-                }
-                target += "".concat(field, " ").concat(condition, " ").concat(this._valueSql);
-            }
-            return target;
+            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]];
+            }));
         },
         enumerable: false,
         configurable: true
     });
-    Condition.prototype.connect = function (prev) {
-        var _a = this, relation = _a.relation, result = _a.result;
-        if (!prev) {
-            return result;
-        }
-        if (!result) {
-            return prev;
-        }
-        return "".concat(prev, " ").concat(relation, " ").concat(result);
-    };
-    return Condition;
-}());
-exports.Condition = Condition;
-var Options = /** @class */ (function () {
-    function Options() {
-        this.limit = 0;
-        this.skip = 0;
-        // 排序
-        this.sort = {};
-    }
-    Object.defineProperty(Options.prototype, "result", {
+    Object.defineProperty(DbSchema.prototype, "$fields", {
         get: function () {
-            var target = '';
-            var _a = this, sort = _a.sort, limit = _a.limit, skip = _a.skip;
-            if (Object.keys(sort).length > 0) {
-                var items_1 = [];
-                Object.keys(sort).forEach(function (name, v) {
-                    items_1.push("".concat(name, " ").concat(v));
-                });
-                target += "ORDER BY ".concat(items_1.join('), '));
-            }
-            if (limit > 0) {
-                target += "\nLIMIT ".concat(limit, " OFFSET ").concat(skip);
-            }
-            return target;
+            return Object.keys(this.$toJson);
         },
         enumerable: false,
         configurable: true
     });
-    return Options;
+    DbSchema.prototype.$formJson = function (json) {
+        var _this = this;
+        Object.keys(json).forEach(function (k) {
+            if (Object.prototype.hasOwnProperty.call(_this, k)) {
+                // @ts-ignore
+                _this[k] = json[k];
+            }
+        });
+    };
+    DbSchema.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);
+                        return [4 /*yield*/, selector.getById(this.id)];
+                    case 1:
+                        res = _a.sent();
+                        if (res) {
+                            this.$formJson(res);
+                            return [2 /*return*/, this];
+                        }
+                        return [2 /*return*/, null];
+                }
+            });
+        });
+    };
+    DbSchema.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.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]])];
+                    case 1:
+                        existing = (_a.sent())[0];
+                        // @ts-ignore
+                        if (existing && existing.length > 0) {
+                            return [2 /*return*/, 'exist'];
+                        }
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, inserter.result()];
+                    case 3:
+                        res = _a.sent();
+                        if (res.filter(function (e) { return e !== -1; }).length > 0) {
+                            this.id = res[0];
+                            return [2 /*return*/, 'ok'];
+                        }
+                        else {
+                            return [2 /*return*/, 'fail'];
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    DbSchema.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);
+                        return [4 /*yield*/, this.$get()];
+                    case 1:
+                        user = _a.sent();
+                        if (!user) return [3 /*break*/, 3];
+                        return [4 /*yield*/, deleter.removeById(this.id)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3: return [2 /*return*/, 'exist'];
+                }
+            });
+        });
+    };
+    DbSchema.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);
+                        return [4 /*yield*/, this.$get()];
+                    case 1:
+                        user = _a.sent();
+                        if (!user) return [3 /*break*/, 3];
+                        values = Object.fromEntries(Object.keys(maps)
+                            .filter(function (n) { return !['id', 'createTime', 'updateTime'].includes(n); })
+                            .map(function (k) { return [k, maps[k]]; }));
+                        updater.setFields(values);
+                        updater.select({
+                            field: 'id',
+                            value: user.id,
+                        });
+                        return [4 /*yield*/, updater.result()];
+                    case 2:
+                        affected = _a.sent();
+                        if (affected > 0) {
+                            return [2 /*return*/, 'ok'];
+                        }
+                        return [2 /*return*/, 'fail'];
+                    case 3: return [2 /*return*/, 'exist'];
+                }
+            });
+        });
+    };
+    return DbSchema;
 }());
-exports.Options = Options;
-var RelationKey;
-(function (RelationKey) {
-    RelationKey["and"] = "AND";
-    RelationKey["or"] = "OR";
-})(RelationKey || (exports.RelationKey = RelationKey = {}));
-var SortKey;
-(function (SortKey) {
-    SortKey["asc"] = "ASC";
-    SortKey["desc"] = "DESC";
-})(SortKey || (exports.SortKey = SortKey = {}));
-var ConditionKey;
-(function (ConditionKey) {
-    ConditionKey["eq"] = "=";
-    ConditionKey["ne"] = "!=";
-    ConditionKey["gt"] = ">";
-    ConditionKey["gte"] = ">=";
-    ConditionKey["lt"] = "<";
-    ConditionKey["lte"] = "<=";
-    ConditionKey["like"] = "LIKE";
-    ConditionKey["include"] = "IN";
-    ConditionKey["area"] = "BETWEEN";
-    ConditionKey["not"] = "=";
-})(ConditionKey || (exports.ConditionKey = ConditionKey = {}));
+exports.DbSchema = DbSchema;

package/dist/utils.js

@@ -1,21 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlParser = void 0;
-var MysqlParser = /** @class */ (function () {
-    function MysqlParser() {
-    }
-    MysqlParser.valueTypeOf = function (v) {
-        if (typeof v === 'string')
-            return "'".concat(v, "'");
-        return "".concat(v);
-    };
-    MysqlParser.toValuesOf = function (values) {
+exports.Parser = void 0;
+exports.Parser = {
+    easyDate: function (date, format) {
+        if (date === void 0) { date = new Date(); }
+        if (format === void 0) { format = 'YYYY-MM-DD HH:mm:ss'; }
+        var pad = function (num) { return num.toString().padStart(2, '0'); };
+        var year = date.getFullYear();
+        var month = pad(date.getMonth() + 1);
+        var day = pad(date.getDate());
+        var hours = pad(date.getHours());
+        var minutes = pad(date.getMinutes());
+        var seconds = pad(date.getSeconds());
+        return format
+            .replace('YYYY', year.toString())
+            .replace('MM', month)
+            .replace('DD', day)
+            .replace('HH', hours)
+            .replace('mm', minutes)
+            .replace('ss', seconds);
+    },
+    toDbName: function (str) {
+        return str.replace(/[A-Z]/g, function (letter) { return "_".concat(letter.toLowerCase()); });
+    },
+    toFieldName: function (str) {
+        var words = str.split(/[-_\s]+/);
+        if (!words.length)
+            return '';
+        var firstWord = words[0].toLowerCase();
+        var restWords = words
+            .slice(1)
+            .map(function (word) { return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase(); });
+        return firstWord + restWords.join('');
+    },
+    toValuesOf: function (values) {
         var items = [];
         for (var v in values) {
-            items.push(MysqlParser.valueTypeOf(v));
+            items.push(exports.Parser.valueTypeOf(v));
         }
         return "(".concat(items.join(', '), ")");
-    };
-    return MysqlParser;
-}());
-exports.MysqlParser = MysqlParser;
+    },
+    valueTypeOf: function (v) {
+        if (typeof v === 'string')
+            return "'".concat(v, "'");
+        return "".concat(v);
+    },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rdyl/node-mysql",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -18,7 +18,7 @@
     "build": "tsc && copyfiles -u 1 src/**/*.d.ts src/*.d.ts types && npm run changelog && git add CHANGELOG.md"
   },
   "dependencies": {
-    "mysql": "^2.18.1"
+    "mysql2": "^3.14.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.6.1",
@@ -28,4 +28,4 @@
     "copyfiles": "^2.4.1",
     "typescript": "^5.6.3"
   }
-}
+}

package/types/helper.d.ts

@@ -0,0 +1,79 @@
+import { SortKey, SelectOption, OptionsType } from './interface';
+declare class BaseHelper {
+    _tableName: string;
+    constructor(_tableName: string);
+    selects: SelectOption[];
+    options: OptionsType;
+    get selectStat(): {
+        sql: string;
+        values: unknown[];
+    };
+    get optionStat(): {
+        sql: string;
+    };
+    select(opts: SelectOption): this;
+    limit(n: number): this;
+    skip(n: number): this;
+    sort(field: string, v: SortKey): this;
+}
+/** @description 查询数据 */
+export declare class MysqlSelector extends BaseHelper {
+    exFields: string[];
+    constructor(t: string, exFields?: string[]);
+    get sql(): string;
+    get countSql(): string;
+    total(): Promise<any>;
+    /** @查询结果 */
+    result(): Promise<{
+        [k: string]: any;
+    }[]>;
+    /** @根据id查询 */
+    getById(value: number | string): Promise<{
+        [k: string]: any;
+    } | null>;
+    paged(param: {
+        page: number;
+        pageSize: number;
+    }): Promise<{
+        page: number;
+        pageSize: number;
+        records: {
+            [k: string]: any;
+        }[];
+        total: any;
+    }>;
+}
+/** @description 插入数据 */
+export declare class MysqlInserter extends BaseHelper {
+    values: Array<unknown[]>;
+    fields: string[];
+    constructor(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);
+    get sql(): string;
+    /** @查询结果 */
+    result(): Promise<any>;
+    /** @根据id删除 */
+    removeById(value: number | string): Promise<"ok" | "fail">;
+}
+/** @description 更新数据 */
+export declare class MysqlUpdater extends BaseHelper {
+    exFields: string[];
+    constructor(t: string, exFields?: string[]);
+    updateFields: Record<string, unknown>;
+    get updateStat(): {
+        sql: string;
+        values: unknown[];
+    };
+    get sql(): string;
+    setField(field: string, v: unknown): this;
+    setFields(values: Record<string, unknown>): this;
+    /** @查询结果 */
+    result(): Promise<any>;
+}
+export {};

package/types/index.d.ts

@@ -1,3 +1,6 @@
-export * from "./selector";
-export * from "./meta";
-export * from "./utils";
+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';

package/types/interface.d.ts

@@ -0,0 +1,40 @@
+export declare const RelationMaps: {
+    and: string;
+    or: string;
+};
+export type RelationKey = keyof typeof RelationMaps;
+export declare const SortMaps: {
+    asc: string;
+    desc: string;
+};
+export type SortKey = keyof typeof SortMaps;
+export declare const ConditionMaps: {
+    eq: string;
+    ne: string;
+    gt: string;
+    gte: string;
+    lt: string;
+    lte: string;
+    like: string;
+    include: string;
+    area: string;
+    not: string;
+};
+export type ConditionKey = keyof typeof ConditionMaps;
+export interface SelectOption {
+    field: string;
+    value: unknown;
+    relation?: RelationKey;
+    condition?: ConditionKey;
+}
+export interface OptionsType {
+    limit?: number;
+    skip?: number;
+    sort: Record<string, SortKey>;
+}
+export interface DbBaseType {
+    id: number | string;
+    createTime: string;
+    updateTime: string;
+}
+export type DbResultStat = 'exist' | 'ok' | 'fail';

package/types/meta.d.ts

@@ -1,42 +1,23 @@
-export declare class Condition {
-    relation: RelationKey;
-    field: string;
-    value: unknown;
-    condition: ConditionKey;
-    constructor(props: ConditionProps);
-    get _valueSql(): string;
-    get result(): string;
-    connect(prev: string): string;
-}
-export declare class Options {
-    limit: number;
-    skip: number;
-    sort: Record<string, SortKey>;
-    get result(): string;
-}
-export declare enum RelationKey {
-    and = "AND",
-    or = "OR"
-}
-export declare enum SortKey {
-    asc = "ASC",
-    desc = "DESC"
-}
-export declare enum ConditionKey {
-    eq = "=",
-    ne = "!=",
-    gt = ">",
-    gte = ">=",
-    lt = "<",
-    lte = "<=",
-    like = "LIKE",
-    include = "IN",
-    area = "BETWEEN",// 范围
-    not = "="
-}
-export interface ConditionProps {
-    field: string;
-    value: unknown;
-    relation?: RelationKey;
-    condition?: ConditionKey;
+import { DbBaseType, DbResultStat } from './interface';
+/**
+ * @description
+ * 使用$toMap时 不返回的字段名前面需要加$
+ */
+export declare class DbSchema implements DbBaseType {
+    $table: string;
+    $mapExFields: string[];
+    id: number | string;
+    createTime: string;
+    updateTime: string;
+    constructor($table: string, $mapExFields?: string[]);
+    get $toJson(): Record<string, any>;
+    get $toMap(): {
+        [k: string]: any;
+    };
+    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>;
 }

package/types/utils.d.ts

@@ -1,4 +1,7 @@
-export declare class MysqlParser {
-    static valueTypeOf(v: unknown): string;
-    static toValuesOf(values: unknown[]): string;
-}
+export declare const Parser: {
+    easyDate(date?: Date, format?: string): string;
+    toDbName(str: string): string;
+    toFieldName(str: string): string;
+    toValuesOf(values: unknown[]): string;
+    valueTypeOf(v: unknown): string;
+};