typespeed 2.4.5 → 2.4.7

package/dist/core.decorator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.schedule = exports.getComponent = exports.getBean = exports.autoware = exports.error = exports.log = exports.resource = exports.bean = exports.component = void 0;
+exports.schedule = exports.getComponent = exports.getBean = exports.autoware = exports.error = exports.logx = exports.log = exports.resource = exports.bean = exports.component = void 0;
 require("reflect-metadata");
 const cron = require("cron");
 const log_factory_class_1 = require("./factory/log-factory.class");
@@ -71,6 +71,17 @@ function log(message, ...optionalParams) {
     }
 }
 exports.log = log;
+function logx(message) {
+    message = JSON.stringify(message);
+    const logObject = beanMapper.get(log_factory_class_1.default.name);
+    if (logObject) {
+        logObject["factory"].log(message);
+    }
+    else {
+        console.log(message);
+    }
+}
+exports.logx = logx;
 function error(message, ...optionalParams) {
     const logObject = beanMapper.get(log_factory_class_1.default.name);
     if (logObject) {

package/dist/default/redis.class.js

@@ -38,7 +38,7 @@ class Redis extends ioredis_1.default {
         if (!(0, typespeed_1.config)("redis")) {
             return null;
         }
-        if (mode === "sub") {
+        if (mode === "pub") {
             this.pubObj = this.pubObj || new Redis((0, typespeed_1.config)("redis"));
             return this.pubObj;
         }

package/dist/scaffold/templates/tsconfig.json.tpl

@@ -4,10 +4,7 @@
         "declaration": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
-        "allowSyntheticDefaultImports": true,
-        "forceConsistentCasingInFileNames": true,
-        "target": "ES2017",
-        "sourceMap": true,
+        "target": "ES6",
         "outDir": "./dist",
         "baseUrl": "./",
         "typeRoots": [
@@ -15,6 +12,6 @@
         ]
     },
     "include": [
-        "./src/**/*.ts"
+        "./src/**.ts"
     ]
 }

package/dist/typespeed.d.ts

@@ -160,6 +160,8 @@ declare function autoware(target: any, propertyKey: string): void;
 declare function resource(...args: any[]): any;
 /**日志函数，输出打印日志 */
 declare function log(message?: any, ...optionalParams: any[]): void;
+/**日志函数，输出JSON日志 */
+declare function logx(message: any): void;
 /**错误日志函数，输出打印错误日志 */
 declare function error(message?: any, ...optionalParams: any[]): void;
 /**路由页面前置执行装饰器，参数指向路由页面方法，被装饰的方法将在路由页面之前执行 */
@@ -394,4 +396,4 @@ declare class SocketIo {
 /**Socket IO 服务实现类 */
 declare const io: IoServer;
 
-export { ExpressServer, LogDefault, NodeCache, RabbitMQ, rabbitListener, redisSubscriber, ReadWriteDb, Redis, CacheFactory, DataSourceFactory, LogFactory, ServerFactory, AuthenticationFactory, next, reqBody, reqQuery, reqForm, reqParam, req, req as request, res, res as response, component, bean, resource, log, app, before, after, value, error, config, autoware, getBean, getComponent, schedule, getMapping, postMapping, requestMapping, setRouter, upload, jwt, insert, update, remove, select, param, resultType, cache, Model, SocketIo, io };
+export { ExpressServer, LogDefault, NodeCache, RabbitMQ, rabbitListener, redisSubscriber, ReadWriteDb, Redis, CacheFactory, DataSourceFactory, LogFactory, ServerFactory, AuthenticationFactory, next, reqBody, reqQuery, reqForm, reqParam, req, req as request, res, res as response, component, bean, resource, log, logx, app, before, after, value, error, config, autoware, getBean, getComponent, schedule, getMapping, postMapping, requestMapping, setRouter, upload, jwt, insert, update, remove, select, param, resultType, cache, Model, SocketIo, io };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespeed",
-  "version": "2.4.5",
+  "version": "2.4.7", 
   "description": "A new Framework for TypeScript.",
   "author": "speedphp",
   "license": "MIT License",

package/src/core.decorator.ts

@@ -70,6 +70,16 @@ function log(message?: any, ...optionalParams: any[]) {
     }
 }
 
+function logx(message) {
+    message = JSON.stringify(message);
+    const logObject = beanMapper.get(LogFactory.name);
+    if (logObject) {
+        logObject["factory"].log(message);
+    } else {
+        console.log(message);
+    }
+}
+
 function error(message?: any, ...optionalParams: any[]) {
     const logObject = beanMapper.get(LogFactory.name);
     if (logObject) {
@@ -85,4 +95,4 @@ function schedule(cronTime: string | Date) {
     }
 }
 
-export { component, bean, resource, log, error, autoware, getBean, getComponent, schedule };
+export { component, bean, resource, log, logx, error, autoware, getBean, getComponent, schedule };

package/src/default/redis.class.ts

@@ -34,7 +34,7 @@ class Redis extends IoRedis {
         if (!config("redis")) {
             return null;
         }
-        if (mode === "sub") {
+        if (mode === "pub") {
             this.pubObj = this.pubObj || new Redis(config("redis"));
             return this.pubObj;
         } else {

package/src/scaffold/templates/tsconfig.json.tpl

@@ -4,10 +4,7 @@
         "declaration": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
-        "allowSyntheticDefaultImports": true,
-        "forceConsistentCasingInFileNames": true,
-        "target": "ES2017",
-        "sourceMap": true,
+        "target": "ES6",
         "outDir": "./dist",
         "baseUrl": "./",
         "typeRoots": [
@@ -15,6 +12,6 @@
         ]
     },
     "include": [
-        "./src/**/*.ts"
+        "./src/**.ts"
     ]
 }

package/src/typespeed.d.ts

@@ -160,6 +160,8 @@ declare function autoware(target: any, propertyKey: string): void;
 declare function resource(...args: any[]): any;
 /**日志函数，输出打印日志 */
 declare function log(message?: any, ...optionalParams: any[]): void;
+/**日志函数，输出JSON日志 */
+declare function logx(message: any): void;
 /**错误日志函数，输出打印错误日志 */
 declare function error(message?: any, ...optionalParams: any[]): void;
 /**路由页面前置执行装饰器，参数指向路由页面方法，被装饰的方法将在路由页面之前执行 */
@@ -394,4 +396,4 @@ declare class SocketIo {
 /**Socket IO 服务实现类 */
 declare const io: IoServer;
 
-export { ExpressServer, LogDefault, NodeCache, RabbitMQ, rabbitListener, redisSubscriber, ReadWriteDb, Redis, CacheFactory, DataSourceFactory, LogFactory, ServerFactory, AuthenticationFactory, next, reqBody, reqQuery, reqForm, reqParam, req, req as request, res, res as response, component, bean, resource, log, app, before, after, value, error, config, autoware, getBean, getComponent, schedule, getMapping, postMapping, requestMapping, setRouter, upload, jwt, insert, update, remove, select, param, resultType, cache, Model, SocketIo, io };
+export { ExpressServer, LogDefault, NodeCache, RabbitMQ, rabbitListener, redisSubscriber, ReadWriteDb, Redis, CacheFactory, DataSourceFactory, LogFactory, ServerFactory, AuthenticationFactory, next, reqBody, reqQuery, reqForm, reqParam, req, req as request, res, res as response, component, bean, resource, log, logx, app, before, after, value, error, config, autoware, getBean, getComponent, schedule, getMapping, postMapping, requestMapping, setRouter, upload, jwt, insert, update, remove, select, param, resultType, cache, Model, SocketIo, io };

package/test/database.test.ts

@@ -43,6 +43,14 @@ describe("Test Database", () => {
             done();
         });
     });
+    it("/db/select-row twice", (done) => {
+        chaiObj.request(testAddr).get("/db/select-row?id=" + randomId).end((err, res) => {
+            const dataList = JSON.parse(res.text);
+            expect(dataList).to.be.an('array');
+            expect(dataList[0]).to.have.property("id").which.is.a("number").equal(randomId);
+            done();
+        });
+    });
     it("/db/select", (done) => {
         chaiObj.request(testAddr).get("/db/select").end((err, res) => {
             const dataList = JSON.parse(res.text);