midway-fatcms 0.0.1-beta.7 → 0.0.1-beta.71

package/src/libs/crud-pro/models/RequestModel.ts

@@ -1,141 +1,141 @@
-import * as _ from 'lodash';
-import { ILimitOffset, IOrderByItem, IRequestModel, IVisitor } from '../interfaces';
-import { MixinUtils } from '../utils/MixinUtils';
-import { CommonException, Exceptions } from '../exceptions';
-import {DEFAULT_LIMIT} from "../defaultConfigs";
-
-class RequestModel {
-  visitor: IVisitor;
-
-  method: string;
-  columns?: string[]; // "columns": "id,name,age,sex,addr",
-  condition?: Record<string, any>;
-  data?: Record<string, any>;
-  limit: number;
-  offset: number;
-  orderBys?: IOrderByItem[];
-
-  constructor(req: IRequestModel, visitor: IVisitor) {
-    Object.assign(this, req);
-    this.visitor = visitor;
-    this.columns = MixinUtils.parseColumns(req.columns);
-    this.orderBys = this.parseOrderBys(req.orderBy);
-    const limitOffset = this.parseOffsetList(req);
-    this.limit = limitOffset.limit;
-    this.offset = limitOffset.offset;
-  }
-
-  private parseOrderBys(orderByStr: any): IOrderByItem[] {
-    if (MixinUtils.isEmpty(orderByStr)) {
-      return [];
-    }
-
-    if (Array.isArray(orderByStr)) {
-      return orderByStr
-        .map(obj => {
-          if (typeof obj === 'string') {
-            return { fieldName: obj, orderType: 'asc' };
-          }
-
-          const { fieldName, orderType = 'asc' } = obj;
-          if (fieldName) {
-            return { fieldName, orderType };
-          }
-
-          return null;
-        })
-        .filter(o => {
-          return !!o;
-        });
-    }
-
-    const orderByResult: IOrderByItem[] = [];
-    const orderByArray = orderByStr
-      .split(',')
-      .map(s => {
-        return s.trim();
-      })
-      .filter(s => !!s);
-
-    if (MixinUtils.isEmpty(orderByArray)) {
-      return orderByResult;
-    }
-
-    for (let i = 0; i < orderByArray.length; i++) {
-      const orderByItem = orderByArray[i];
-      let orderType = 'asc'; //默认升序
-      let fieldName = orderByItem;
-
-      if (orderByItem.endsWith('+')) {
-        // 升序
-        fieldName = orderByItem.substring(0, orderByItem.length - 1);
-        orderType = 'asc'; //升序
-      } else if (orderByItem.endsWith('-')) {
-        //降序
-        fieldName = orderByItem.substring(0, orderByItem.length - 1);
-        orderType = 'desc'; //降序
-      }
-
-      fieldName = fieldName.trim();
-
-      if (MixinUtils.isEmpty(fieldName) || !MixinUtils.isValidFieldName(fieldName)) {
-        throw new CommonException(Exceptions.REQUEST_MODEL_PARSE_ORDER_BY_FAILED, orderByItem);
-      }
-
-      orderByResult.push({ fieldName, orderType });
-    }
-
-    return orderByResult;
-  }
-
-  private parseOffsetList(req: IRequestModel): ILimitOffset {
-    const { limit, offset, pageSize, pageNo } = req;
-
-    const limitOffset: ILimitOffset = {
-      limit: DEFAULT_LIMIT,
-      offset: 0,
-    };
-
-    if (typeof limit === 'number') {
-      limitOffset.limit = limit;
-    }
-    if (typeof offset === 'number') {
-      limitOffset.offset = offset;
-    }
-
-    if (typeof pageNo === 'number' && typeof pageSize === 'number' && pageNo > 0 && pageSize > 0) {
-      limitOffset.limit = pageSize;
-      limitOffset.offset = (pageNo - 1) * pageSize;
-    }
-
-    return limitOffset;
-  }
-
-  /**
-   * 获取对象数据类型
-   * @param attrName
-   */
-  getCondOrDataJsonObject(attrName: string): any {
-    if (attrName.startsWith('data') || attrName.startsWith('condition')) {
-      const jsonObject = _.get(this, attrName);
-      if (!jsonObject) {
-        return null;
-      }
-      if (typeof jsonObject !== 'object' && !Array.isArray(jsonObject)) {
-        throw new CommonException(Exceptions.RUN_GET_COND_OR_DATA_JSONOBJECT, attrName);
-      }
-      return jsonObject;
-    }
-    throw new CommonException(Exceptions.RUN_GET_COND_OR_DATA_JSONOBJECT, attrName);
-  }
-
-  /**
-   * 获取基本数据类型
-   * @param attrName
-   */
-  getJsonObjectValue(attrName: string): any {
-    return _.get(this, attrName);
-  }
-}
-
-export { RequestModel };
+import * as _ from 'lodash';
+import { ILimitOffset, IOrderByItem, IRequestModel, IVisitor } from '../interfaces';
+import { MixinUtils } from '../utils/MixinUtils';
+import { CommonException, Exceptions } from '../exceptions';
+import { DEFAULT_LIMIT } from '../defaultConfigs';
+
+class RequestModel {
+  visitor: IVisitor;
+
+  method: string;
+  columns?: string[]; // "columns": "id,name,age,sex,addr",
+  condition?: Record<string, any>;
+  data?: Record<string, any>;
+  limit: number;
+  offset: number;
+  orderBys?: IOrderByItem[];
+
+  constructor(req: IRequestModel, visitor: IVisitor) {
+    Object.assign(this, req);
+    this.visitor = visitor;
+    this.columns = MixinUtils.parseColumns(req.columns);
+    this.orderBys = this.parseOrderBys(req.orderBy);
+    const limitOffset = this.parseOffsetList(req);
+    this.limit = limitOffset.limit;
+    this.offset = limitOffset.offset;
+  }
+
+  private parseOrderBys(orderByStr: any): IOrderByItem[] {
+    if (MixinUtils.isEmpty(orderByStr)) {
+      return [];
+    }
+
+    if (Array.isArray(orderByStr)) {
+      return orderByStr
+        .map(obj => {
+          if (typeof obj === 'string') {
+            return { fieldName: obj, orderType: 'asc' };
+          }
+
+          const { fieldName, orderType = 'asc' } = obj;
+          if (fieldName) {
+            return { fieldName, orderType };
+          }
+
+          return null;
+        })
+        .filter(o => {
+          return !!o;
+        });
+    }
+
+    const orderByResult: IOrderByItem[] = [];
+    const orderByArray = orderByStr
+      .split(',')
+      .map(s => {
+        return s.trim();
+      })
+      .filter(s => !!s);
+
+    if (MixinUtils.isEmpty(orderByArray)) {
+      return orderByResult;
+    }
+
+    for (let i = 0; i < orderByArray.length; i++) {
+      const orderByItem = orderByArray[i];
+      let orderType = 'asc'; //默认升序
+      let fieldName = orderByItem;
+
+      if (orderByItem.endsWith('+')) {
+        // 升序
+        fieldName = orderByItem.substring(0, orderByItem.length - 1);
+        orderType = 'asc'; //升序
+      } else if (orderByItem.endsWith('-')) {
+        //降序
+        fieldName = orderByItem.substring(0, orderByItem.length - 1);
+        orderType = 'desc'; //降序
+      }
+
+      fieldName = fieldName.trim();
+
+      if (MixinUtils.isEmpty(fieldName) || !MixinUtils.isValidFieldName(fieldName)) {
+        throw new CommonException(Exceptions.REQUEST_MODEL_PARSE_ORDER_BY_FAILED, orderByItem);
+      }
+
+      orderByResult.push({ fieldName, orderType });
+    }
+
+    return orderByResult;
+  }
+
+  private parseOffsetList(req: IRequestModel): ILimitOffset {
+    const { limit, offset, pageSize, pageNo } = req;
+
+    const limitOffset: ILimitOffset = {
+      limit: DEFAULT_LIMIT,
+      offset: 0,
+    };
+
+    if (typeof limit === 'number') {
+      limitOffset.limit = limit;
+    }
+    if (typeof offset === 'number') {
+      limitOffset.offset = offset;
+    }
+
+    if (typeof pageNo === 'number' && typeof pageSize === 'number' && pageNo > 0 && pageSize > 0) {
+      limitOffset.limit = pageSize;
+      limitOffset.offset = (pageNo - 1) * pageSize;
+    }
+
+    return limitOffset;
+  }
+
+  /**
+   * 获取对象数据类型
+   * @param attrName
+   */
+  getCondOrDataJsonObject(attrName: string): any {
+    if (attrName.startsWith('data') || attrName.startsWith('condition')) {
+      const jsonObject = _.get(this, attrName);
+      if (!jsonObject) {
+        return null;
+      }
+      if (typeof jsonObject !== 'object' && !Array.isArray(jsonObject)) {
+        throw new CommonException(Exceptions.RUN_GET_COND_OR_DATA_JSONOBJECT, attrName);
+      }
+      return jsonObject;
+    }
+    throw new CommonException(Exceptions.RUN_GET_COND_OR_DATA_JSONOBJECT, attrName);
+  }
+
+  /**
+   * 获取基本数据类型
+   * @param attrName
+   */
+  getJsonObjectValue(attrName: string): any {
+    return _.get(this, attrName);
+  }
+}
+
+export { RequestModel };

package/src/libs/crud-pro/models/ResModel.ts

@@ -0,0 +1,24 @@
+interface ResModelAffected {
+  insertId?: string | number;
+  affectedRows: number;
+}
+
+interface ResModelStandard {
+  row?: any;
+  rows?: any[];
+  total_count?: number;
+  affected?: ResModelAffected;
+  insert_affected?: ResModelAffected;
+  update_affected?: ResModelAffected;
+}
+
+interface ResModelPageQuery {
+  rows: any[];
+  total_count: number;
+}
+
+type ResModelFlexible = ResModelStandard & {
+  [key: string]: any;
+};
+
+export { ResModelAffected, ResModelStandard, ResModelFlexible, ResModelPageQuery };

package/src/libs/crud-pro/models/ServiceHub.ts

@@ -1,32 +1,32 @@
-import { RequestCfgModel } from './RequestCfgModel';
-import { RequestModel } from './RequestModel';
-import { SqlCfgModel } from './SqlCfgModel';
-import { ExecuteContext } from './ExecuteContext';
-import { IFuncCfgModel, IRequestCfgModel, ITableMeta } from '../interfaces';
-import { FuncContext } from './FuncContext';
-
-export interface ICurdProServiceHub {
-  getExecuteContext(): ExecuteContext;
-
-  validateByAllow(cfgModel: RequestCfgModel, reqModel: RequestModel);
-
-  validateByReject(cfgModel: RequestCfgModel, reqModel: RequestModel);
-
-  validateByCfg(cfgModel: RequestCfgModel, reqModel: RequestModel);
-
-  validateByAuthCfg(cfgModel: RequestCfgModel, reqModel: RequestModel): void;
-
-  updateByCfg(cfgModel: RequestCfgModel, reqModel: RequestModel);
-
-  getCachedCfgByMethod(method: string, isEnableCache: boolean): Promise<IRequestCfgModel>;
-
-  generateSQLList(exeCtx: ExecuteContext): Promise<void>;
-
-  executeSqlCfgModels(exeCtx: ExecuteContext): Promise<void>;
-
-  convertOriginToExecuteSql(sqlCfgModel: SqlCfgModel): Promise<void>;
-
-  executeFuncCfg(tmpFunCfg: IFuncCfgModel, exeFunCtx: FuncContext): string;
-
-  getTableMeta(sqlCfgModel: SqlCfgModel): Promise<ITableMeta>;
-}
+import { RequestCfgModel } from './RequestCfgModel';
+import { RequestModel } from './RequestModel';
+import { SqlCfgModel } from './SqlCfgModel';
+import { ExecuteContext } from './ExecuteContext';
+import { IFuncCfgModel, IRequestCfgModel, ITableMeta } from '../interfaces';
+import { FuncContext } from './FuncContext';
+
+export interface ICurdProServiceHub {
+  getExecuteContext(): ExecuteContext;
+
+  validateByAllow(cfgModel: RequestCfgModel, reqModel: RequestModel);
+
+  validateByReject(cfgModel: RequestCfgModel, reqModel: RequestModel);
+
+  validateByCfg(cfgModel: RequestCfgModel, reqModel: RequestModel);
+
+  validateByAuthCfg(cfgModel: RequestCfgModel, reqModel: RequestModel): void;
+
+  updateByCfg(cfgModel: RequestCfgModel, reqModel: RequestModel);
+
+  getCachedCfgByMethod(method: string, isEnableCache: boolean): Promise<IRequestCfgModel>;
+
+  generateSQLList(exeCtx: ExecuteContext): Promise<void>;
+
+  executeSqlCfgModels(exeCtx: ExecuteContext): Promise<void>;
+
+  convertOriginToExecuteSql(sqlCfgModel: SqlCfgModel): Promise<void>;
+
+  executeFuncCfg(tmpFunCfg: IFuncCfgModel, exeFunCtx: FuncContext): string;
+
+  getTableMeta(sqlCfgModel: SqlCfgModel): Promise<ITableMeta>;
+}

package/src/libs/crud-pro/models/SqlCfgModel.ts

@@ -1,52 +1,53 @@
-import { ColumnRelation, IFuncCfgModel, ISqlCfgModel } from '../interfaces';
-import { MixinUtils } from '../utils/MixinUtils';
-import { KeyOfCrudTypes, KeysOfSqlResPicker, SqlDbType} from './keys';
-import { parseJsonObject } from '../../utils/functions';
-
-const { isEmpty } = MixinUtils;
-
-class SqlCfgModel {
-  columns: string[]; // "columns": "id,name,age,sex,addr",
-  columnsRelation?: ColumnRelation[]; //只能关联基本信息：如枚举值
-  sqlTable: string; // 可以为空. originSql中不包含@@table时可以为空
-  sqlSchema?: string; // 可以为空
-  sqlDatabase?: string; // 可以为空，用此字段进行connection的选择和切换。配合getBizConnectionPool使用
-  sqlDdType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
-  maxLimit: number; // 最大一次性返回的数量
-  resName: string;
-  resPicker: KeysOfSqlResPicker;
-  originSql: string; // 有特殊占位符的SQL, 原始的SQL constructor(resName: string, originSql: string) {}
-  validate: IFuncCfgModel; //执行前，进行校验，校验不通过就抛出异常. 校验函数可以返回 boolean或直接抛出异常
-  executeWhen: IFuncCfgModel; //满足表达式的结果，才能执行。 默认：true 校验函数必须返回 booleansetResPicker(resPicker: string) {}
-  executeSql: string; // 可以运行的SQL
-  executeSqlArgs: any[]; //可以运行的SQL的参数setExecuteWhen(executeWhenFunCfg: IFuncCfgModel) {}
-  crudType: KeyOfCrudTypes = null;
-
-  constructor(json: Partial<ISqlCfgModel>) {
-    Object.assign(this, json);
-    this.columns = MixinUtils.parseColumns(json.columns);
-    this.executeWhen = parseJsonObject(json.executeWhen);
-  }
-
-  public getCrudType(): KeyOfCrudTypes {
-    if (!this.crudType) {
-      const sql = this.executeSql.trim().toUpperCase();
-      if (isEmpty(sql)) {
-        this.crudType = KeyOfCrudTypes.EMPTY_SQL;
-      } else if (sql.startsWith(KeyOfCrudTypes.SELECT)) {
-        this.crudType = KeyOfCrudTypes.SELECT;
-      } else if (sql.startsWith(KeyOfCrudTypes.UPDATE)) {
-        this.crudType = KeyOfCrudTypes.UPDATE;
-      } else if (sql.startsWith(KeyOfCrudTypes.DELETE)) {
-        this.crudType = KeyOfCrudTypes.DELETE;
-      } else if (sql.startsWith(KeyOfCrudTypes.INSERT)) {
-        this.crudType = KeyOfCrudTypes.INSERT;
-      } else {
-        this.crudType = KeyOfCrudTypes.NOT_CRUD;
-      }
-    }
-    return this.crudType;
-  }
-}
-
-export { SqlCfgModel };
+import { ColumnRelation, IFuncCfgModel, ISqlCfgModel } from '../interfaces';
+import { MixinUtils } from '../utils/MixinUtils';
+import { KeyOfCrudTypes, KeysOfSqlResPicker, SqlDbType } from './keys';
+import { parseJsonObject } from '../../utils/functions';
+
+const { isEmpty } = MixinUtils;
+
+class SqlCfgModel {
+  columns: string[]; // "columns": "id,name,age,sex,addr",
+  columnsRelation?: ColumnRelation[]; //只能关联基本信息：如枚举值
+  sqlTable: string; // 可以为空. originSql中不包含@@table时可以为空
+  sqlSchema?: string; // 可以为空
+  sqlDatabase?: string; // 可以为空，用此字段进行connection的选择和切换。配合getBizConnectionPool使用
+  sqlDbType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
+  maxLimit: number; // 最大一次性返回的数量
+  resName: string;
+  resPicker: KeysOfSqlResPicker;
+  originSql: string; // 有特殊占位符的SQL, 原始的SQL constructor(resName: string, originSql: string) {}
+  validate: IFuncCfgModel; //执行前，进行校验，校验不通过就抛出异常. 校验函数可以返回 boolean或直接抛出异常
+  executeWhen: IFuncCfgModel; //满足表达式的结果，才能执行。 默认：true 校验函数必须返回 booleansetResPicker(resPicker: string) {}
+  isNativeSQL?: boolean; // 可以运行的SQL。在postgres/sqlserver环境下也可以使用问号。
+  executeSql: string; // 可以运行的SQL
+  executeSqlArgs: any[]; //可以运行的SQL的参数setExecuteWhen(executeWhenFunCfg: IFuncCfgModel) {}
+  crudType: KeyOfCrudTypes = null;
+
+  constructor(json: Partial<ISqlCfgModel>) {
+    Object.assign(this, json);
+    this.columns = MixinUtils.parseColumns(json.columns);
+    this.executeWhen = parseJsonObject(json.executeWhen);
+  }
+
+  public getCrudType(): KeyOfCrudTypes {
+    if (!this.crudType) {
+      const sql = this.executeSql.trim().toUpperCase();
+      if (isEmpty(sql)) {
+        this.crudType = KeyOfCrudTypes.EMPTY_SQL;
+      } else if (sql.startsWith(KeyOfCrudTypes.SELECT)) {
+        this.crudType = KeyOfCrudTypes.SELECT;
+      } else if (sql.startsWith(KeyOfCrudTypes.UPDATE)) {
+        this.crudType = KeyOfCrudTypes.UPDATE;
+      } else if (sql.startsWith(KeyOfCrudTypes.DELETE)) {
+        this.crudType = KeyOfCrudTypes.DELETE;
+      } else if (sql.startsWith(KeyOfCrudTypes.INSERT)) {
+        this.crudType = KeyOfCrudTypes.INSERT;
+      } else {
+        this.crudType = KeyOfCrudTypes.NOT_CRUD;
+      }
+    }
+    return this.crudType;
+  }
+}
+
+export { SqlCfgModel };

package/src/libs/crud-pro/models/SqlSegArg.ts

@@ -1,13 +1,13 @@
-class SqlSegArg {
-  sql: string;
-  args: any[];
-
-  constructor(sql: string, args?: any[]) {
-    this.sql = sql;
-    if (args) {
-      this.args = args;
-    }
-  }
-}
-
-export { SqlSegArg };
+class SqlSegArg {
+  sql: string;
+  args: any[];
+
+  constructor(sql: string, args?: any[]) {
+    this.sql = sql;
+    if (args) {
+      this.args = args;
+    }
+  }
+}
+
+export { SqlSegArg };

package/src/libs/crud-pro/models/Transaction.ts

@@ -1,74 +1,81 @@
-import {IConnectionPool, IPoolConnectionClient} from '../interfaces';
-import {SqlDbType} from "./keys";
-import {TransactionMySQL} from "./TransactionMySQL";
-import {TransactionPostgres} from "./TransactionPostgres";
-import {TransactionSqlServer} from "./TransactionSqlServer";
-
-class Transaction {
-
-  private transactionMySQL : TransactionMySQL = new TransactionMySQL();
-  private transactionPostgres : TransactionPostgres  = new TransactionPostgres();
-  private transactionSqlServer : TransactionSqlServer  = new TransactionSqlServer();
-
-  private getTxObj(pool: IConnectionPool): TransactionMySQL | TransactionPostgres | TransactionSqlServer {
-    if (pool.dbType === SqlDbType.postgres) {
-      return this.transactionPostgres;
-    }
-
-    if (pool.dbType === SqlDbType.sqlserver) {
-      return this.transactionSqlServer;
-    }
-
-    if (!pool.dbType || pool.dbType === SqlDbType.mysql) {
-      return this.transactionMySQL;
-    }
-    return null;
-  }
-
-  /**
-   * 获取链接对象
-   * @param pool
-   */
-  public async getTxConnection(pool: IConnectionPool): Promise<IPoolConnectionClient> {
-    const txObj = this.getTxObj(pool);
-    return txObj.getTxConnection(pool);
-  }
-
-  /**
-   * 开始事务
-   */
-  public beginTx() {
-    this.transactionMySQL.beginTx();
-    this.transactionPostgres.beginTx();
-    this.transactionSqlServer.beginTx();
-  }
-
-  /**
-   * 提交事务
-   */
-  public async commitTx() {
-    await this.transactionMySQL.commitTx();
-    await this.transactionPostgres.commitTx();
-    await this.transactionSqlServer.commitTx();
-  }
-
-  /**
-   * 事务回滚
-   */
-  public async rollbackTx() {
-    await this.transactionMySQL.rollbackTx();
-    await this.transactionPostgres.rollbackTx();
-    await this.transactionSqlServer.rollbackTx();
-  }
-
-  /**
-   * 释放连接
-   */
-  public async releaseTx() {
-    await this.transactionMySQL.releaseTx();
-    await this.transactionPostgres.releaseTx();
-    await this.transactionSqlServer.releaseTx();
-  }
-}
-
-export { Transaction };
+import { IConnectionPool, IPoolConnectionClient } from '../interfaces';
+import { SqlDbType } from './keys';
+import { TransactionMySQL } from './TransactionMySQL';
+import { TransactionPostgres } from './TransactionPostgres';
+import { TransactionSqlServer } from './TransactionSqlServer';
+
+class Transaction {
+  private transactionMySQL: TransactionMySQL = new TransactionMySQL();
+  private transactionPostgres: TransactionPostgres = new TransactionPostgres();
+  private transactionSqlServer: TransactionSqlServer = new TransactionSqlServer();
+  private isReleased = false;
+
+  private getTxObj(pool: IConnectionPool): TransactionMySQL | TransactionPostgres | TransactionSqlServer {
+    if (pool.dbType === SqlDbType.postgres) {
+      return this.transactionPostgres;
+    }
+
+    if (pool.dbType === SqlDbType.sqlserver) {
+      return this.transactionSqlServer;
+    }
+
+    if (!pool.dbType || pool.dbType === SqlDbType.mysql) {
+      return this.transactionMySQL;
+    }
+    return null;
+  }
+
+  /**
+   * 获取链接对象
+   * @param pool
+   */
+  public async getTxConnection(pool: IConnectionPool): Promise<IPoolConnectionClient> {
+    if (this.isReleased) {
+      const msg = '[Transaction] getTxConnection error, the txObject is isReleased, please check your code . DB request must be await';
+      console.error(msg);
+      throw new Error(msg);
+    }
+
+    const txObj = this.getTxObj(pool);
+    return txObj.getTxConnection(pool);
+  }
+
+  /**
+   * 开始事务
+   */
+  public beginTx() {
+    this.transactionMySQL.beginTx();
+    this.transactionPostgres.beginTx();
+    this.transactionSqlServer.beginTx();
+  }
+
+  /**
+   * 提交事务
+   */
+  public async commitTx() {
+    await this.transactionMySQL.commitTx();
+    await this.transactionPostgres.commitTx();
+    await this.transactionSqlServer.commitTx();
+  }
+
+  /**
+   * 事务回滚
+   */
+  public async rollbackTx() {
+    await this.transactionMySQL.rollbackTx();
+    await this.transactionPostgres.rollbackTx();
+    await this.transactionSqlServer.rollbackTx();
+  }
+
+  /**
+   * 释放连接
+   */
+  public async releaseTx() {
+    await this.transactionMySQL.releaseTx();
+    await this.transactionPostgres.releaseTx();
+    await this.transactionSqlServer.releaseTx();
+    this.isReleased = true;
+  }
+}
+
+export { Transaction };