speed 1.1.1 → 1.1.6

package/README.md

@@ -1,2 +1,326 @@
-# SpeedSQL
-SQL injection for nestjs, like mybatis.
+## SpeedSQL 
+
+SQL injection for NestJS, similar mybatis.
+
+### Introduction
+
+- Follow NestJS Module injection mode.
+- With the TypeScript Decorators, same as Java annotations.
+- Similar to MyBatis used in Java.
+- Support for the Prepared Statements.
+- Support for Entity Injection.
+- Support the Connection pools by mysql2 within.
+
+### Support Decorators
+
+`@Param`, `@ResultType`, `@Select`, `@Insert`, `@Update`, `@Delete`.
+
+### Install as a dependency
+
+Setup SpeedSQL (NPM named `speed`) as dependency in *package.json* file `dependencies`
+
+```
+"dependencies": {
+    "speed": "latest"
+}
+```
+
+### Quick Start
+
+- Prepare some entities and configurations.
+
+*db.provider.ts*
+```
+import { createPool, Pool } from 'speed';
+
+export const DbProviders = [
+  {
+    provide: 'SPEED_POOL',
+    useFactory: async (): Promise<Pool> => {
+      return await createPool({
+        host: 'localhost',
+        user: 'root',
+        port: 3306,
+        password: 'qwer1234',
+        database: 'test',
+      });
+    },
+  },
+];
+```
+*entity/param.dto.ts*
+```
+export class ParamDto {
+  constructor(public name: string, public age: number) {}
+}
+```
+*entity/user.dto.ts*
+```
+export class UserDto {
+  constructor(public name: string, public age: number) {}
+}
+```
+
+* * *
+
+- Import into the Module of NestJS
+
+
+*app.mudule.ts*
+```
+import { Module } from '@nestjs/common';
+import { AppController } from './app.controller';
+import { AppService } from './app.service';
+import { SpeedService } from 'speed';
+import { DbProviders } from './db.providers';
+
+@Module({
+  imports: [],
+  controllers: [AppController],
+  providers: [AppService, SpeedService, ...DbProviders],
+})
+export class AppModule {}
+```
+
+* * *
+
+- Define SpeedSQL within Services, use the Decorators as MyBatis.
+
+*app.service.ts*
+```
+import { Injectable } from '@nestjs/common';
+import { Delete, Update, Param, ResultType, Insert } from 'speed';
+import { UserDto } from './entity/user.dto';
+import { ParamDto } from './entity/param.dto';
+
+@Injectable()
+export class AppService {
+  @Update('update user set age = #{age} where name = #{name}')
+  setUserAge(@Param('name') name: string, @Param('age') age: number): number {return;}
+
+  @Delete('delete from user where name = #{name}')
+  deleteUser(@Param('name') name: string): number {return;}
+
+  @ResultType(UserDto)
+  @Select('select `name`, `age` from `user` where `uid` = #{uid} and `name` = #{name}')
+  getRecords(paramDto: ParamDto): UserDto[] {return;}
+
+  @Insert('insert into user (name, age) value (#{name}, #{age})')
+  addUser(user: UserDto): number {return;}
+}
+```
+
+* * *
+
+- Use Your Services.
+
+*app.controller.ts*
+```
+import { Controller, Get } from '@nestjs/common';
+import { AppService } from './app.service';
+import { ParamDto } from './entity/param.dto';
+import { UserDto } from "./entity/create-cat.dto";
+
+@Controller()
+export class AppController {
+  constructor(private readonly appService: AppService) {}
+
+  @Get()
+  async getHello() {
+    await this.appService.setUserAge("zzz", 20);
+    return "hello world";
+  }
+}
+
+```
+
+### Configuration
+
+The Connection pools configuration is exactly the same as mysql2's [createPool\(\)](https://github.com/sidorares/node-mysql2#using-promise-wrapper).
+
+The usual format is as follows:
+
+```
+{
+    host: '127.0.0.1',
+    user: 'root',
+    port: 3306,
+    password: '123456',
+    database: 'test',
+}
+```
+
+* * *
+Like common NestJS Modules, SpeedSQL uses [Asynchronous providers](https://docs.nestjs.com/fundamentals/async-providers) to inject it's Connection Pool for startup.
+
+- Make file ```db.provider.ts```
+```
+import { createPool, Pool } from 'speed';
+
+export const DbProviders = [
+  {
+    provide: 'SPEED_POOL',
+    useFactory: async (): Promise<Pool> => {
+      return await createPool({
+        host: 'localhost',
+        user: 'root',
+        port: 3306,
+        password: 'qwer1234',
+        database: 'test',
+      });
+    },
+  },
+];
+```
+- Put ```db.provider.ts``` in NestJS app src dir and set it as a provider.
+```
+import { Module } from '@nestjs/common';
+import { AppController } from './app.controller';
+import { AppService } from './app.service';
+import { SpeedService } from 'speed';
+import { DbProviders } from './db.providers';
+
+@Module({
+  imports: [],
+  controllers: [AppController],
+  providers: [AppService, SpeedService, ...DbProviders],
+})
+export class AppModule {}
+```
+
+### Parameter with named (for Prepared Statements)
+
+`@Param` define the named parameters.
+
+As with MyBatis, SpeedSQL is possible to pass a value to a bind parameter as a named parameter to ensure readability and prevent SQL Injection attacks.
+
+Unlike [Prepared Statements](https://github.com/sidorares/node-mysql2#using-prepared-statements) in mysql2, SpeedSQL can be pass param value with named to make SQL more clearer.
+
+**Parameter with named value can support ```@Select```, ```@Insert```, ```@Update```, ```@Delete``` all the CRUD operations.**
+
+* * *
+
+SpeedSQL has two Parameter with named modes.
+
+> Note that you can only choose ONE of the modes at ONE statement.
+
+**Object as Parameters**
+
+- Creates a conditional entity class with the same attribute and parameter names.
+
+```
+export class ParamDto {
+  constructor(public name: string, public age: number) {}
+}
+```
+
+- Inject values as parameter entities.
+
+```
+import { ResultType, Select } from 'speed';
+
+
+@ResultType(UserDto)
+@Select('select `name`, `age` from `user` where `uid` = #{uid} and `name` = #{name}')
+getRecords(paramDto: ParamDto): UserDto[]{return;}
+```
+- So we can start to use.
+```
+const users: UserDto[] = await this.appService.getRecords(
+  new ParamDto("zzz", 10)
+);
+```
+
+**Named Value as Parameters**
+
+Annotate the parameter value name with the parameter annotation '@Param', which corresponds to the SQL value name.
+
+```
+import { ResultType, Select, Param } from 'speed';
+
+@ResultType(UserDto)
+@Select(select `name`, `age` from `user` where `uid` = #{uid} and `name` = #{name}')
+getRecords(@Param('uid') uid:number, @Param('name') name:string): UserDto[]{return;}
+```
+So we can start to use.
+```
+const users: UserDto[] = await this.appService.getRecords('zzz', 10);
+```
+
+### @Select
+
+SpeedSQL uses ```@ResultType``` to annotate the resulting entity.
+
+`@ResultType` define the data entity for @Selete returns.
+
+Select returns an array of annotated entity (```@ResultType```).
+
+- Create a entity: 
+
+```
+export class UserDto {
+  constructor(public name: string, public age: number) {}
+}
+```
+- And Select.
+```
+import { ResultType, Select, Param } from 'speed';
+
+
+@ResultType(UserDto)
+@Select('select `name`, `age` from user where uid = #{uid} and name = #{name} ')
+getRecords(@Param('uid') uid:number, @Param('name') name:string): UserDto[] {return;}
+```
+- The return Array will contains entities, and field name will correspond to the attributes of the entity.
+
+If the field name and attribute are not the same, the value of different name will be lost. The solution is to use SQL's ```AS``` to alias the field name to correspond to the attributes of the entity.
+
+
+```
+import { ResultType, Select, Param } from 'speed';
+
+@ResultType(UserDto)
+@Select('select `realname` as `name`, `age` from user where uid = #{uid} and name = #{name} ')
+getRecords(@Param('uid') uid:number, @Param('name') name:string): UserDto[] {return;}
+```
+
+
+### @Insert
+
+Parameter with named is also supported in ```@Insert```.
+
+The ```@Insert``` return value is <u>the new inserted ID</u>, which can also be ignored.
+
+```
+import { Insert } from 'speed';
+
+@Insert('insert into user (name, age) value (#{name}, #{age})')
+addUser(user: UserDto): number {return;}
+```
+
+### @Update and @Delete
+
+Parameter with named is also supported in ```@Update``` and ```@Delete```.
+
+The ```@Update``` and ```@Delete``` returns number is <u>the effected rows</u>, which can also be ignored.
+
+```
+import { Delete, Update, Param } from 'speed';
+
+@Update('update user set age = #{age} where name = #{name}')
+setUserAge(@Param('name') name: string, @Param('age') age: number): number {return;}
+
+@Delete('delete from user where name = #{name}')
+deleteUser(@Param('name') name: string): number {return;}
+```
+
+
+### About
+
+Github：[https://github.com/speedphp/speedsql](https://github.com/speedphp/speedsql)
+
+The SpeedSQL project follows the open source agreement of the ```MIT License```.
+
+Thanks: [NestJS](https://nestjs.com/)，[mysql2](https://github.com/sidorares/node-mysql2)，[MyBatis](https://mybatis.org/).
+
+Issue: [https://github.com/SpeedPHP/speedsql/issues](https://github.com/SpeedPHP/speedsql/issues)

package/index.js

@@ -1,6 +1,15 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-__export(require("./speed.decorator"));
-__export(require("./speed.service"));
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./speed.decorator"), exports);
+__exportStar(require("./speed.service"), exports);
+//# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,uCAAkC;AAClC,qCAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAkC;AAClC,kDAAgC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "speed",
-  "version": "1.1.1",
-  "description": "SQL injection for nestjs, like mybatis.",
+  "version": "1.1.6",
+  "description": "SQL injection for NestJS, similar mybatis.",
   "author": "speedphp",
   "license": "MIT License",
   "repository": {

package/speed.decorator.js

@@ -1,57 +1,16 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    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) : new P(function (resolve) { resolve(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;
-    return { next: verb(0), "throw": verb(1), "return": verb(2) };
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [0, 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 speed_service_1 = require("./speed.service");
-var paramMetadataKey = Symbol('param');
-function log(message) {
-    var optionalParams = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        optionalParams[_i - 1] = arguments[_i];
-    }
-    console.log.apply(console, [message].concat(optionalParams));
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Delete = exports.Update = exports.Insert = exports.Select = exports.ResultType = exports.Param = exports.log = void 0;
+const speed_service_1 = require("./speed.service");
+const paramMetadataKey = Symbol('param');
+function log(message, ...optionalParams) {
+    console.log(message, ...optionalParams);
 }
 exports.log = log;
 function ResultType(constructorFunction) {
-    var newConstructorFunction = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var func = function () {
-            return new (constructorFunction.bind.apply(constructorFunction, [void 0].concat(args)))();
+    const newConstructorFunction = function (...args) {
+        const func = function () {
+            return new constructorFunction(...args);
         };
         func.prototype = constructorFunction.prototype;
         return new func();
@@ -59,103 +18,62 @@ function ResultType(constructorFunction) {
     newConstructorFunction.prototype = constructorFunction.prototype;
     return function (target, propertyKey) {
         speed_service_1.resultTypeMap.set([target.constructor.name, propertyKey].toString(), newConstructorFunction());
-        //never return
     };
 }
 exports.ResultType = ResultType;
 function Param(name) {
     return function (target, propertyKey, parameterIndex) {
-        var existingParameters = Reflect.getOwnMetadata(paramMetadataKey, target, propertyKey) || [];
+        const existingParameters = Reflect.getOwnMetadata(paramMetadataKey, target, propertyKey) || [];
         existingParameters.push([name, parameterIndex]);
         Reflect.defineMetadata(paramMetadataKey, existingParameters, target, propertyKey);
     };
 }
 exports.Param = Param;
 function convertSQLParams(args, target, propertyKey, decoratorSQL) {
-    var queryValues = [];
-    var argsVal;
+    const queryValues = [];
+    let argsVal;
     if (typeof args[0] === 'object') {
-        argsVal = new Map(Object.getOwnPropertyNames(args[0]).map(function (valName) { return [
+        argsVal = new Map(Object.getOwnPropertyNames(args[0]).map((valName) => [
             valName,
             args[0][valName],
-        ]; }));
+        ]));
     }
     else {
-        var existingParameters = Reflect.getOwnMetadata(paramMetadataKey, target, propertyKey);
-        argsVal = new Map(existingParameters.map(function (_a) {
-            var argName = _a[0], argIdx = _a[1];
-            return [argName, args[argIdx]];
-        }));
+        const existingParameters = Reflect.getOwnMetadata(paramMetadataKey, target, propertyKey);
+        argsVal = new Map(existingParameters.map(([argName, argIdx]) => [argName, args[argIdx]]));
     }
-    var regExp = /#{(\w+)}/g;
-    decoratorSQL.matchAll(regExp).slice().forEach(function (match) {
-        var replaceTag = match[0], matchName = match[1];
+    const regExp = /#{(\w+)}/g;
+    let match;
+    while (match = regExp.exec(decoratorSQL)) {
+        const [replaceTag, matchName] = match;
         decoratorSQL = decoratorSQL.replace(new RegExp(replaceTag, 'g'), '?');
         queryValues.push(argsVal.get(matchName));
-    });
+    }
     return [decoratorSQL, queryValues];
 }
-function queryForExecute(sql, args, target, propertyKey) {
-    return __awaiter(this, void 0, void 0, function () {
-        var sqlValues, newSql, result, _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    sqlValues = [];
-                    newSql = sql;
-                    if (args.length > 0) {
-                        _a = convertSQLParams(args, target, propertyKey, sql), newSql = _a[0], sqlValues = _a[1];
-                    }
-                    return [4 /*yield*/, speed_service_1.speedPromisePool.query(newSql, sqlValues)];
-                case 1:
-                    result = (_b.sent())[0];
-                    return [2 /*return*/, result];
-            }
-        });
-    });
+async function queryForExecute(sql, args, target, propertyKey) {
+    let sqlValues = [];
+    let newSql = sql;
+    if (args.length > 0) {
+        [newSql, sqlValues] = convertSQLParams(args, target, propertyKey, sql);
+    }
+    const [result] = await speed_service_1.speedPromisePool.query(newSql, sqlValues);
+    return result;
 }
 function Insert(sql) {
     return function (target, propertyKey, descriptor) {
-        var _this = this;
-        descriptor.value = function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            return __awaiter(_this, void 0, void 0, function () {
-                var result;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, queryForExecute(sql, args, target, propertyKey)];
-                        case 1:
-                            result = _a.sent();
-                            return [2 /*return*/, result.insertId];
-                    }
-                });
-            });
+        descriptor.value = async (...args) => {
+            const result = await queryForExecute(sql, args, target, propertyKey);
+            return result.insertId;
         };
     };
 }
 exports.Insert = Insert;
 function Update(sql) {
     return function (target, propertyKey, descriptor) {
-        var _this = this;
-        descriptor.value = function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            return __awaiter(_this, void 0, void 0, function () {
-                var result;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, queryForExecute(sql, args, target, propertyKey)];
-                        case 1:
-                            result = _a.sent();
-                            return [2 /*return*/, result.affectedRows];
-                    }
-                });
-            });
+        descriptor.value = async (...args) => {
+            const result = await queryForExecute(sql, args, target, propertyKey);
+            return result.affectedRows;
         };
     };
 }
@@ -163,46 +81,29 @@ exports.Update = Update;
 exports.Delete = Update;
 function Select(sql) {
     return function (target, propertyKey, descriptor) {
-        var _this = this;
-        descriptor.value = function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
+        descriptor.value = async (...args) => {
+            let sqlValues = [];
+            if (args.length > 0) {
+                [sql, sqlValues] = convertSQLParams(args, target, propertyKey, sql);
+            }
+            const [rows] = await speed_service_1.speedPromisePool.query(sql, sqlValues);
+            if (Object.keys(rows).length === 0) {
+                return;
             }
-            return __awaiter(_this, void 0, void 0, function () {
-                var sqlValues, rows, records, resultType, _loop_1, rowIndex, _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            sqlValues = [];
-                            if (args.length > 0) {
-                                _a = convertSQLParams(args, target, propertyKey, sql), sql = _a[0], sqlValues = _a[1];
-                            }
-                            return [4 /*yield*/, speed_service_1.speedPromisePool.query(sql, sqlValues)];
-                        case 1:
-                            rows = (_b.sent())[0];
-                            if (Object.keys(rows).length === 0) {
-                                return [2 /*return*/];
-                            }
-                            records = [];
-                            resultType = speed_service_1.resultTypeMap.get([target.constructor.name, propertyKey].toString());
-                            _loop_1 = function (rowIndex) {
-                                var entity = Object.create(resultType);
-                                Object.getOwnPropertyNames(resultType).forEach(function (propertyRow) {
-                                    if (rows[rowIndex].hasOwnProperty(propertyRow)) {
-                                        Object.defineProperty(entity, propertyRow, Object.getOwnPropertyDescriptor(rows[rowIndex], propertyRow));
-                                    }
-                                });
-                                records.push(entity);
-                            };
-                            for (rowIndex in rows) {
-                                _loop_1(rowIndex);
-                            }
-                            return [2 /*return*/, records];
+            const records = [];
+            const resultType = speed_service_1.resultTypeMap.get([target.constructor.name, propertyKey].toString());
+            for (const rowIndex in rows) {
+                const entity = Object.create(resultType);
+                Object.getOwnPropertyNames(resultType).forEach(function (propertyRow) {
+                    if (rows[rowIndex].hasOwnProperty(propertyRow)) {
+                        Object.defineProperty(entity, propertyRow, Object.getOwnPropertyDescriptor(rows[rowIndex], propertyRow));
                     }
                 });
-            });
+                records.push(entity);
+            }
+            return records;
         };
     };
 }
 exports.Select = Select;
+//# sourceMappingURL=speed.decorator.js.map

package/speed.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"speed.decorator.js","sourceRoot":"","sources":["speed.decorator.ts"],"names":[],"mappings":";AAAA,mDAAkE;AAGlE,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;AAEzC,aAAa,OAAa,EAAE,GAAG,cAAqB;IAClD,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC,CAAC;AAC1C,CAAC;AAgKQ,kBAAG;AA9JZ,oBAAoB,mBAAmB;IACrC,MAAM,sBAAsB,GAAQ,UAAU,GAAG,IAAI;QACnD,MAAM,IAAI,GAAQ;YAChB,MAAM,CAAC,IAAI,mBAAmB,CAAC,GAAG,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAC;QAC/C,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;IACpB,CAAC,CAAC;IACF,sBAAsB,CAAC,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAC;IACjE,MAAM,CAAC,UAAU,MAAM,EAAE,WAAmB;QAC1C,6BAAa,CAAC,GAAG,CACb,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,QAAQ,EAAE,EACjD,sBAAsB,EAAE,CAC3B,CAAC;IAEJ,CAAC,CAAC;AACJ,CAAC;AA8IoB,gCAAU;AA5I/B,eAAe,IAAY;IACzB,MAAM,CAAC,UACH,MAAW,EACX,WAA4B,EAC5B,cAAsB;QAExB,MAAM,kBAAkB,GACpB,OAAO,CAAC,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;QACxE,kBAAkB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;QAChD,OAAO,CAAC,cAAc,CAClB,gBAAgB,EAChB,kBAAkB,EAClB,MAAM,EACN,WAAW,CACd,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AA4Ha,sBAAK;AA1HnB,0BACI,IAAW,EACX,MAAW,EACX,WAAmB,EACnB,YAAoB;IAEtB,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,IAAI,OAAO,CAAC;IACZ,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC;QAChC,OAAO,GAAG,IAAI,GAAG,CACb,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,KAAK;YACnD,OAAO;YACP,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;SACjB,CAAC,CACL,CAAC;IACJ,CAAC;IAAC,IAAI,CAAC,CAAC;QACN,MAAM,kBAAkB,GAAuB,OAAO,CAAC,cAAc,CACjE,gBAAgB,EAChB,MAAM,EACN,WAAW,CACd,CAAC;QACF,OAAO,GAAG,IAAI,GAAG,CACb,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CACzE,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,WAAW,CAAC;IAC3B,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK;QAC/C,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC;QACtC,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;QACtE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AACrC,CAAC;AAED,KAAK,0BACD,GAAW,EACX,IAAW,EACX,MAAM,EACN,WAAmB;IAErB,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,MAAM,GAAG,GAAG,CAAC;IACjB,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;IACzE,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,gCAAgB,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACjE,MAAM,CAAkB,MAAM,CAAC;AACjC,CAAC;AAED,gBAAgB,GAAW;IACzB,MAAM,CAAC,UACH,MAAM,EACN,WAAmB,EACnB,UAA8B;QAEhC,UAAU,CAAC,KAAK,GAAG,KAAK,EAAE,GAAG,IAAW;YACtC,MAAM,MAAM,GAAoB,MAAM,eAAe,CACjD,GAAG,EACH,IAAI,EACJ,MAAM,EACN,WAAW,CACd,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;QACzB,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAyDwC,wBAAM;AAvD/C,gBAAgB,GAAW;IACzB,MAAM,CAAC,UACH,MAAM,EACN,WAAmB,EACnB,UAA8B;QAEhC,UAAU,CAAC,KAAK,GAAG,KAAK,EAAE,GAAG,IAAW;YACtC,MAAM,MAAM,GAAoB,MAAM,eAAe,CACjD,GAAG,EACH,IAAI,EACJ,MAAM,EACN,WAAW,CACd,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAuCgD,wBAAM;AAAY,wBAAM;AArCzE,gBAAgB,GAAW;IACzB,MAAM,CAAC,UACH,MAAM,EACN,WAAmB,EACnB,UAA8B;QAEhC,UAAU,CAAC,KAAK,GAAG,KAAK,EAAE,GAAG,IAAW;YACtC,IAAI,SAAS,GAAG,EAAE,CAAC;YACnB,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpB,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;YACtE,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,gCAAgB,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAC5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;gBACnC,MAAM,CAAC;YACT,CAAC;YACD,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,MAAM,UAAU,GAAG,6BAAa,CAAC,GAAG,CAChC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,QAAQ,EAAE,CACpD,CAAC;YACF,GAAG,CAAC,CAAC,MAAM,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC;gBAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBACzC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAU,WAAW;oBAClE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;wBAC/C,MAAM,CAAC,cAAc,CACjB,MAAM,EACN,WAAW,EACX,MAAM,CAAC,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAC/D,CAAC;oBACJ,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvB,CAAC;YACD,MAAM,CAAC,OAAO,CAAC;QACjB,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAEgC,wBAAM"}
+{"version":3,"file":"speed.decorator.js","sourceRoot":"","sources":["speed.decorator.ts"],"names":[],"mappings":"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"}

package/speed.decorator.ts

@@ -69,11 +69,17 @@ function convertSQLParams(
     );
   }
   const regExp = /#{(\w+)}/g;
-  [...decoratorSQL.matchAll(regExp)].forEach((match) => {
+  let match;
+  while(match = regExp.exec(decoratorSQL)){
     const [replaceTag, matchName] = match;
     decoratorSQL = decoratorSQL.replace(new RegExp(replaceTag, 'g'), '?');
     queryValues.push(argsVal.get(matchName));
-  });
+  }
+  // [...decoratorSQL.matchAll(regExp)].forEach((match) => {
+  //   const [replaceTag, matchName] = match;
+  //   decoratorSQL = decoratorSQL.replace(new RegExp(replaceTag, 'g'), '?');
+  //   queryValues.push(argsVal.get(matchName));
+  // });
   return [decoratorSQL, queryValues];
 }
 

package/speed.service.js

@@ -5,25 +5,33 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var common_1 = require("@nestjs/common");
-var mysql2_1 = require("mysql2");
-exports.createPool = mysql2_1.createPool;
-var speedPromisePool;
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Pool = exports.createPool = exports.resultTypeMap = exports.speedPromisePool = exports.SpeedService = void 0;
+const common_1 = require("@nestjs/common");
+const mysql2_1 = require("mysql2");
+Object.defineProperty(exports, "Pool", { enumerable: true, get: function () { return mysql2_1.Pool; } });
+Object.defineProperty(exports, "createPool", { enumerable: true, get: function () { return mysql2_1.createPool; } });
+let speedPromisePool;
 exports.speedPromisePool = speedPromisePool;
-var resultTypeMap = new Map();
+const resultTypeMap = new Map();
 exports.resultTypeMap = resultTypeMap;
-var SpeedService = (function () {
-    function SpeedService(pool) {
+let SpeedService = class SpeedService {
+    constructor(pool) {
         this.pool = pool;
         exports.speedPromisePool = speedPromisePool = pool.promise();
     }
-    return SpeedService;
-}());
+};
 SpeedService = __decorate([
-    common_1.Injectable(),
-    __param(0, common_1.Inject('SPEED_POOL'))
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)('SPEED_POOL')),
+    __metadata("design:paramtypes", [typeof (_a = typeof mysql2_1.Pool !== "undefined" && mysql2_1.Pool) === "function" ? _a : Object])
 ], SpeedService);
 exports.SpeedService = SpeedService;
+//# sourceMappingURL=speed.service.js.map

package/speed.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"speed.service.js","sourceRoot":"","sources":["speed.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,mCAA0C;AAYA,yCAAU;AATpD,IAAI,gBAA6B,CAAC;AASzB,4CAAgB;AARzB,MAAM,aAAa,GAAG,IAAI,GAAG,EAAe,CAAC;AAQlB,sCAAa;AALxC,IAAa,YAAY,GAAzB;IACI,YAA0C,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;QAChD,2BAAA,gBAAgB,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;CACJ,CAAA;AAJY,YAAY;IADxB,mBAAU,EAAE;IAEI,WAAA,eAAM,CAAC,YAAY,CAAC,CAAA;;GADxB,YAAY,CAIxB;AAJY,oCAAY"}
+{"version":3,"file":"speed.service.js","sourceRoot":"","sources":["speed.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,mCAA0C;AAYY,qFAZ7C,aAAI,OAY6C;AAAhB,2FAZ3B,mBAAU,OAY2B;AATpD,IAAI,gBAA6B,CAAC;AASzB,4CAAgB;AARzB,MAAM,aAAa,GAAG,IAAI,GAAG,EAAe,CAAC;AAQlB,sCAAa;AALxC,IAAa,YAAY,GAAzB,MAAa,YAAY;IACrB,YAA0C,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;QAChD,2BAAA,gBAAgB,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;CACJ,CAAA;AAJY,YAAY;IADxB,IAAA,mBAAU,GAAE;IAEI,WAAA,IAAA,eAAM,EAAC,YAAY,CAAC,CAAA;yDAAe,aAAI,oBAAJ,aAAI;GAD3C,YAAY,CAIxB;AAJY,oCAAY"}