baja-lite 1.1.5 → 1.1.11

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.11",
   "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

@@ -11,7 +11,7 @@ var _b, _c, _d, _e;
 var _f, _g, _h, _j;
 import { Throw } from './error.js';
 import tslib from 'tslib';
-import iterare from 'iterare';
+import { iterate } from 'iterare';
 import { emptyString } from './string.js';
 import pino from 'pino';
 import { excuteSplit, ExcuteSplitMode, sleep } from './fn.js';
@@ -2244,7 +2244,7 @@ export const DB = (config) => {
                     this[_x] = __stateFileName;
                     this[_y] = __deleteState;
                     this[_z] = (data, option) => {
-                        return Object.fromEntries(iterare(option?.skipId === true ? __columnsNoId : __columns)
+                        return Object.fromEntries(iterate(option?.skipId === true ? __columnsNoId : __columns)
                             .map(K => [K, FieldFilter(K, data[K], __def, __fields[K].uuid === true || __fields[K].uuidShort === true, option)])
                             .filter(data => {
                             if (data[1][0] === 1) {
@@ -2338,7 +2338,7 @@ export class SqlService {
                 const conditions = option.existConditionOtherThanIds || this[_ids];
                 Throw.if(!conditions, 'not found where condition for insertIfNotExists!');
                 Throw.if(conditions.length === 0, 'insertIfNotExists must have not null where!');
-                const where = iterare(conditions).map(c => `${this[_fields][c]?.C2()} = ?`).join(' AND ');
+                const where = iterate(conditions).map(c => `${this[_fields][c]?.C2()} = ?`).join(' AND ');
                 const finalColumns = new Set();
                 const whereColumns = conditions;
                 const params = [];
@@ -2397,7 +2397,7 @@ export class SqlService {
                     }
                     return `SELECT ${questMark.join(',')} FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM ${tableName} WHERE ${where})`;
                 });
-                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
+                const columnNames = iterate(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
                 const sql = formatDialect(`INSERT INTO
                 ${tableName}
                 (${columnNames})
@@ -2456,7 +2456,7 @@ export class SqlService {
                     }
                     return `(${questMark.join(',')})`;
                 });
-                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
+                const columnNames = iterate(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
                 const sql = formatDialect(`
                     ${option.dbType === DBType.Mysql ? '' : 'INSERT OR'} REPLACE INTO
                     ${tableName}
@@ -2517,7 +2517,7 @@ export class SqlService {
                     }
                     return `(${questMark.join(',')})`;
                 });
-                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
+                const columnNames = iterate(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
                 const sql = formatDialect(`
                     INSERT INTO
                     ${tableName}
@@ -2583,7 +2583,7 @@ export class SqlService {
                 });
                 const _sqls = this._createTable({ tableName: tableTemp, temp: true, columns: Array.from(finalColumns) });
                 sqls.push(..._sqls);
-                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
+                const columnNames = iterate(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
                 sqls.push({
                     sql: formatDialect(`
                         INSERT INTO
@@ -2679,7 +2679,7 @@ export class SqlService {
     _update(datas, option) {
         const sqls = [];
         const tableName = option?.tableName;
-        const where = `WHEN ${iterare(this[_ids]).map(c => `${this[_fields][c]?.C2()} = ?`).join(' AND ')} THEN ?`;
+        const where = `WHEN ${iterate(this[_ids]).map(c => `${this[_fields][c]?.C2()} = ?`).join(' AND ')} THEN ?`;
         const columnMaps = Object.fromEntries(this[_columnsNoId].map(c => [c, {
                 where: new Array(),
                 params: []
@@ -2699,7 +2699,7 @@ export class SqlService {
                 }
             });
         }
-        const sql = formatDialect(`UPDATE ${tableName} SET ${iterare(this[_columnsNoId])
+        const sql = formatDialect(`UPDATE ${tableName} SET ${iterate(this[_columnsNoId])
             .filter(K => columnMaps[K].where.length > 0)
             .map(K => {
             params.push(...columnMaps[K].params);
@@ -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();
@@ -2776,7 +2776,7 @@ export class SqlService {
         const sqls = [];
         if (option.mode === DeleteMode.Common) {
             const params = new Array();
-            const whereSql = iterare(wheres).map(where => {
+            const whereSql = iterate(wheres).map(where => {
                 return `(
                     ${Object.entries(where).map(([K, V]) => {
                     params.push(V);
@@ -2820,7 +2820,7 @@ export class SqlService {
                 }
                 case DBType.Sqlite:
                 case DBType.SqliteRemote: {
-                    const columnNames = iterare(delWhere).map(K => this[_fields][K]?.C2()).join(',');
+                    const columnNames = iterate(delWhere).map(K => this[_fields][K]?.C2()).join(',');
                     if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
                         sqls.push({
                             sql: formatDialect(`UPDATE ${tableNameESC} SET ${this[_fields][this[_stateFileName]]?.C2()} = ?
@@ -2906,13 +2906,13 @@ export class SqlService {
             const ids = option.id instanceof Array ? option.id : [option.id];
             option.where = ids.map(i => ({ [idName]: i }));
         }
-        const columns = option.templateResult === TemplateResult.Count ? 'COUNT(1) ct' : iterare((option.columns ?? this[_columns])).map((K) => `a.${this[_fields][K]?.C3()}`).join(',');
+        const columns = option.templateResult === TemplateResult.Count ? 'COUNT(1) ct' : iterate((option.columns ?? this[_columns])).map((K) => `a.${this[_fields][K]?.C3()}`).join(',');
         const wheres = option.where instanceof Array ? option.where : [option.where];
         const sqls = [];
         let resultIndex = -1;
         if (option.mode === SelectMode.Common) {
             const params = new Array();
-            const whereSql = formatDialect(iterare(wheres).map(where => this[_transformer](where, option)).map(where => {
+            const whereSql = formatDialect(iterate(wheres).map(where => this[_transformer](where, option)).map(where => {
                 return `SELECT ${columns} FROM ${tableNameESC} a WHERE
                     ${Object.entries(where).map(([K, V]) => {
                     params.push(V);
@@ -3017,10 +3017,10 @@ export class SqlService {
             }
             case SelectResult.RS_CS: {
                 if (mapper) {
-                    return iterare(result).map((data) => flatData({ data, mapper, mapperIfUndefined })).toArray();
+                    return iterate(result).map((data) => flatData({ data, mapper, mapperIfUndefined })).toArray();
                 }
                 else if (hump === true || (hump === undefined && globalThis[_Hump] === true)) {
-                    return iterare(result).map((r) => C2P2(r)).toArray();
+                    return iterate(result).map((r) => C2P2(r)).toArray();
                 }
                 else {
                     return result;
@@ -3036,10 +3036,10 @@ export class SqlService {
             }
             case SelectResult.RS_CS_List: {
                 if (mapper) {
-                    return new ArrayList(iterare(result).map((data) => flatData({ data, mapper, mapperIfUndefined })).toArray());
+                    return new ArrayList(iterate(result).map((data) => flatData({ data, mapper, mapperIfUndefined })).toArray());
                 }
                 else if (hump === true || (hump === undefined && globalThis[_Hump] === true)) {
-                    return new ArrayList(iterare(result).map((r) => C2P2(r)).toArray());
+                    return new ArrayList(iterate(result).map((r) => C2P2(r)).toArray());
                 }
                 else {
                     return new ArrayList();
@@ -3272,7 +3272,7 @@ export class SqlService {
         Throw.if(list.length === 0, 'not found data!');
         const columnTitles = new Array();
         const keys = this[_fields] ?
-            iterare(Object.entries(this[_fields]))
+            iterate(Object.entries(this[_fields]))
                 .filter(([K, F]) => (F.id !== true && F.exportable !== false) || (F.id === true && F.exportable === true))
                 .map(([K, F]) => {
                 columnTitles.push(F.comment ?? K);
@@ -3291,7 +3291,7 @@ export class SqlService {
     imp() {
         Throw.if(!this[_fields], 'not set fields!');
         const columnTitles = new Array();
-        const keys = iterare(Object.entries(this[_fields]))
+        const keys = iterate(Object.entries(this[_fields]))
             .filter(([K, F]) => (F.id !== true && F.exportable !== false) || (F.id === true && F.exportable === true))
             .map(([K, F]) => {
             columnTitles.push(F.comment ?? K);
@@ -3317,7 +3317,7 @@ export class SqlService {
                 const tableVersion = option.conn.pluck(SyncMode.Sync, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
                 if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
                     // 更新版本
-                    const columns = iterare(option.conn.query(SyncMode.Sync, `PRAGMA table_info(${tableES})`))
+                    const columns = iterate(option.conn.query(SyncMode.Sync, `PRAGMA table_info(${tableES})`))
                         .filter(c => this[_fields].hasOwnProperty(C2P(c.name, globalThis[_Hump])))
                         .map(c => c.name)
                         .join(',');
@@ -3376,7 +3376,7 @@ export class SqlService {
                         const tableVersion = await option.conn.pluck(SyncMode.Async, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
                         if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
                             // 更新版本
-                            const columns = iterare(await option.conn.query(SyncMode.Async, `PRAGMA table_info(${tableES})`))
+                            const columns = iterate(await option.conn.query(SyncMode.Async, `PRAGMA table_info(${tableES})`))
                                 .filter(c => this[_fields].hasOwnProperty(C2P(c.name, globalThis[_Hump])))
                                 .map(c => c.name)
                                 .join(',');

package/wx/mini.d.ts

@@ -42,4 +42,11 @@ export declare class WxMini extends BaseWx {
     }): T | undefined;
     getLiveInfo(start: number, limit: number): Promise<WxLiveInfo[]>;
     getLiveReplay(room_id: number, start: number, limit: number): Promise<WxLiveReplay[]>;
+    getPhone(code: string, openid: string): Promise<{
+        phoneNumber: any;
+        purePhoneNumber: any;
+        countryCode: any;
+        timestamp: any;
+        appid: any;
+    }>;
 }

package/wx/mini.js

@@ -99,4 +99,14 @@ export class WxMini extends BaseWx {
         const data = await this.fetch((token) => `https://api.weixin.qq.com/wxa/business/getliveinfo?access_token=${token}`, 'post', { room_id, start, limit, action: 'get_replay' });
         return data.live_replay;
     }
+    async getPhone(code, openid) {
+        const data = await this.fetch((token) => `https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=${token}`, 'post', { code, openid });
+        return {
+            phoneNumber: data.phone_info.phoneNumber,
+            purePhoneNumber: data.phone_info.purePhoneNumber,
+            countryCode: data.phone_info.countryCode,
+            timestamp: data.phone_info.watermark.timestamp,
+            appid: data.phone_info.watermark.appid
+        };
+    }
 }