typespeed 2.4.6 → 2.4.8

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/database.decorator.js

@@ -99,7 +99,10 @@ async function actionExecute(newSql, sqlValues) {
 async function actionQuery(newSql, sqlValues, dataClassType) {
     const readConnection = await (0, core_decorator_1.getBean)(data_source_factory_class_1.default).readConnection();
     const [rows] = await readConnection.query(newSql, sqlValues);
-    if (rows === null || Object.keys(rows).length === 0 || !dataClassType) {
+    if (rows === null || Object.keys(rows).length === 0) {
+        return null;
+    }
+    else if (!dataClassType) {
         return rows;
     }
     const records = [];
@@ -112,7 +115,7 @@ async function actionQuery(newSql, sqlValues, dataClassType) {
         });
         records.push(entity);
     }
-    return records;
+    return Object.keys(records).length === 0 ? null : records;
 }
 function convertSQLParams(decoratorSQL, target, propertyKey, args) {
     const queryValues = [];
@@ -188,7 +191,7 @@ class Model {
         }
         else if (typeof limit === 'object') {
             const total = await actionQuery('SELECT COUNT(*) AS M_COUNTER  FROM ' + this.table + ' WHERE ' + sql, values);
-            if (total === undefined || total[0]['M_COUNTER'] === 0) {
+            if (total === null || total[0] === undefined || total[0]['M_COUNTER'] === 0) {
                 return [];
             }
             if (limit['pageSize'] !== undefined && limit['pageSize'] < total[0]['M_COUNTER']) {
@@ -220,7 +223,7 @@ class Model {
     }
     async find(conditions, sort, fields = '*') {
         const result = await this.findAll(conditions, sort, fields, 1);
-        return result.length > 0 ? result[0] : null;
+        return result != null && result.length > 0 ? result[0] : null;
     }
     async update(conditions, fieldToValues) {
         const { sql, values } = this.where(conditions);
@@ -238,7 +241,7 @@ class Model {
         const { sql, values } = this.where(conditions);
         const newSql = 'SELECT COUNT(*) AS M_COUNTER FROM ' + this.table + ' WHERE ' + sql;
         const result = await actionQuery(newSql, values);
-        return result[0]['M_COUNTER'] || 0;
+        return result != null && result[0] != undefined ? result[0]['M_COUNTER'] : 0;
     }
     async incr(conditions, field, optval = 1) {
         const { sql, values } = this.where(conditions);

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.6", 
+  "version": "2.4.8", 
   "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/database.decorator.ts

@@ -99,7 +99,9 @@ async function actionExecute(newSql, sqlValues): Promise<ResultSetHeader> {
 async function actionQuery(newSql, sqlValues, dataClassType?) {
     const readConnection = await getBean(DataSourceFactory).readConnection();
     const [rows] = await readConnection.query(newSql, sqlValues);
-    if (rows === null || Object.keys(rows).length === 0 || !dataClassType) {
+    if (rows === null || Object.keys(rows).length === 0){
+        return null;
+    } else if (!dataClassType) {
         return rows;
     }
     const records = [];
@@ -112,7 +114,7 @@ async function actionQuery(newSql, sqlValues, dataClassType?) {
         });
         records.push(entity);
     }
-    return records;
+    return Object.keys(records).length === 0 ? null : records;
 }
 
 function convertSQLParams(decoratorSQL: string, target: any, propertyKey: string, args: any[]): [string, any[]] {
@@ -192,7 +194,7 @@ class Model {
             newSql += ' LIMIT ' + limit
         } else if (typeof limit === 'object') {
             const total = await actionQuery('SELECT COUNT(*) AS M_COUNTER  FROM ' + this.table + ' WHERE ' + sql, values);
-            if (total === undefined || total[0]['M_COUNTER'] === 0) {
+            if (total === null || total[0] === undefined || total[0]['M_COUNTER'] === 0) {
                 return [];
             }
             if (limit['pageSize'] !== undefined && limit['pageSize'] < total[0]['M_COUNTER']) {
@@ -226,7 +228,7 @@ class Model {
 
     async find<T>(conditions, sort, fields = '*'): Promise<T> {
         const result = await this.findAll(conditions, sort, fields, 1);
-        return result.length > 0 ? <T>result[0] : null;
+        return result != null && result.length > 0 ? <T>result[0] : null;
     }
 
     async update(conditions, fieldToValues): Promise<number> {
@@ -247,7 +249,7 @@ class Model {
         const { sql, values } = this.where(conditions);
         const newSql = 'SELECT COUNT(*) AS M_COUNTER FROM ' + this.table + ' WHERE ' + sql;
         const result = await actionQuery(newSql, values);
-        return result[0]['M_COUNTER'] || 0;
+        return result != null && result[0] != undefined ? result[0]['M_COUNTER'] : 0;
     }
 
     async incr(conditions, field, optval = 1): Promise<number> {

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 };