baja-lite 1.1.5 → 1.1.8

package/code.js

@@ -47,7 +47,7 @@ const lxMap = {
     geometrycollection: "Object"
 };
 let force = false;
-const basepath = path.join(__dirname, '..', '..', '..');
+const basepath = path.join(__dirname, '..', '..');
 const config = path.join(basepath, 'baja.code.json');
 const templatePath = path.join(basepath, 'code-template');
 console.log(`
@@ -109,7 +109,8 @@ console.log(`
         ], Field(类型string)，表示字段的注解, Type 表示JS类型
         columnNames_join: 'sku_id, sku_name'
         ColumnNames_join: 'sku_id skuId, sku_name skuName'
-
+        columnNames_joinT: 't.sku_id, t.sku_name'
+        ColumnNames_joinT: 't.sku_id skuId, t.sku_name skuName'
         columns_no_id: [], 同columns，没有ID而已
         columnNames_no_id: [],
 
@@ -253,6 +254,8 @@ try {
                 ColumnNames: columns?.map(i => i.Name),
                 columnNames_join: columns?.map(i => i.name).join(','),
                 ColumnNames_join: columns?.map(i => `${i.name} ${i.Name}`).join(','),
+                columnNames_joinT: columns?.map(i => `t.${i.name}`).join(','),
+                ColumnNames_joinT: columns?.map(i => `t.${i.name} ${i.Name}`).join(','),
                 columns_no_id: columns?.filter(i => !i.id),
                 columnNames_no_id: columns?.filter(i => !i.id).map(i => i.name),
                 ColumnNames_no_id: columns?.filter(i => !i.id).map(i => i.Name),

package/object.js

@@ -8,7 +8,6 @@ import iterate from "iterare";
  */
 export const copyBean = (source, classType) => {
     const result = {};
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     Object.keys(classType).forEach((key) => {
         result[key] =
             source[key] !== undefined ? source[key] : (result[key] = null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.1.5",
+  "version": "1.1.8",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -45,6 +45,7 @@
     "pino": "9.6.0",
     "pino-pretty": "13.0.0",
     "reflect-metadata": "0.2.2",
+    "request": "2.88.2",
     "request-promise": "4.2.6",
     "sql-formatter": "15.4.10",
     "sqlstring": "2.3.3",

package/sql.js

@@ -2725,7 +2725,7 @@ export class SqlService {
                     }
                     return result;
                 }, { everyLength: option?.maxDeal });
-                return result.reduce((a, b) => a + b);
+                return result.length > 0 ? result.reduce((a, b) => a + b) : 0;
             };
             if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
@@ -2747,7 +2747,7 @@ export class SqlService {
                     }
                     return result;
                 }, { everyLength: option?.maxDeal });
-                return result.reduce((a, b) => a + b);
+                return result.length > 0 ? result.reduce((a, b) => a + b) : 0;
             };
             if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();