@gingkoo/pandora-metabase 1.0.118 → 1.0.120

package/lib/es/utils/transformSql.js

@@ -2,7 +2,6 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"];
-// @ts-nocheck
 var procEnum = {
   mysql: 'mysql',
   oracle: 'oracle',
@@ -19,28 +18,17 @@ var MetabaseTypeEnum = {
   union: 'union',
   permissionTable: 'permissionTable'
 };
-// 数据基础类型
 var BlockTypeEnum = {
   joinDefault: 'joinDefault',
-  // 简单的表达式
   expression: 'expression',
-  // 表达式
   operator: 'operator',
-  // 操作符
   field: 'field',
-  // 字段
   inputNumber: 'inputNumber',
-  // 数字输入框
   inputString: 'inputString',
-  // 字符串输入框
   constant: 'constant',
-  // 常量
   inputStringList: 'inputStringList',
-  // 多个字符串输入框
   inputNumberList: 'inputNumberList',
-  // 多个数字输入框
   unknown: 'unknown',
-  // 未知
   notExists: 'notExists',
   exists: 'exists',
   FORMULA: 'FORMULA',
@@ -77,11 +65,11 @@ var _recursionArr2 = function _recursionArr(arr) {
   }
   return obj;
 };
-var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
+var _handleBaseType2Sql8 = function handleBaseType2Sql(list) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   var sql = '';
   var constants = [];
-  var sql_items = []; // 这个是 给 list  单一类型用的，字符串输入框 类型也不加''
+  var sql_items = [];
   if (!Array.isArray(list)) {
     return {
       sql: sql,
@@ -123,19 +111,15 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
       constants.push(item.val);
     }
     if (type === BlockTypeEnum.inputStringList) {
-      // 这个如果存在 list 数组中，那么 list 数组种 只能有他，因为他太特殊了，现在就表达式在用
       if (Array.isArray(item.val) && item.val.length) {
         item.val.forEach(function (v) {
-          // 这里虽然是字符串 但是不加 ''了 因为他太特殊了 不通用
           sql_items.push("".concat(v));
         });
       }
     }
     if (type === BlockTypeEnum.inputNumberList) {
-      // 这个如果存在 list 数组中，那么 list 数组种 只能有他，因为他太特殊了，现在就表达式在用
       if (Array.isArray(item.val) && item.val.length) {
         item.val.forEach(function (v) {
-          // 这里虽然是字符串 但是不加 ''了 因为他太特殊了 不通用
           sql_items.push("".concat(v));
         });
       }
@@ -143,21 +127,19 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
     if (type === BlockTypeEnum.joinDefault) {
       var lhs = item.lhs,
         rhs = item.rhs;
-      // 他很特殊 左边里面只有一种类型 右边面只有一种类型
-      var _handleBaseType2Sql2 = _handleBaseType2Sql8(lhs, db),
-        leftSql = _handleBaseType2Sql2.sql,
-        leftSqlItems = _handleBaseType2Sql2.sql_items,
-        joinDefaultLeftConstants = _handleBaseType2Sql2.constants;
-      var _handleBaseType2Sql3 = _handleBaseType2Sql8(rhs, db),
-        rightSql = _handleBaseType2Sql3.sql,
-        rightSqlItems = _handleBaseType2Sql3.sql_items,
-        joinDefaultRightConstants = _handleBaseType2Sql3.constants;
+      var _handleBaseType2Sql = _handleBaseType2Sql8(lhs, db),
+        leftSql = _handleBaseType2Sql.sql,
+        leftSqlItems = _handleBaseType2Sql.sql_items,
+        joinDefaultLeftConstants = _handleBaseType2Sql.constants;
+      var _handleBaseType2Sql2 = _handleBaseType2Sql8(rhs, db),
+        rightSql = _handleBaseType2Sql2.sql,
+        rightSqlItems = _handleBaseType2Sql2.sql_items,
+        joinDefaultRightConstants = _handleBaseType2Sql2.constants;
       constants.push.apply(constants, _toConsumableArray(joinDefaultLeftConstants));
       constants.push.apply(constants, _toConsumableArray(joinDefaultRightConstants));
       var left_condition = leftSql;
       var right_condition = rightSql;
       if (leftSqlItems.length > 1) {
-        // 多个肯定是字段
         if (db === procEnum.mysql) {
           left_condition = "CONCAT(".concat(leftSqlItems.join(','), ")");
         }
@@ -169,7 +151,6 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
         }
       }
       if (rightSqlItems.length > 1) {
-        // 多个肯定是字段
         if (db === procEnum.mysql) {
           right_condition = "CONCAT(".concat(rightSqlItems.join(','), ")");
         }
@@ -188,20 +169,19 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
         condition = item.condition,
         database_type = item.database_type,
         formula = item.formula;
-      var _handleBaseType2Sql4 = _handleBaseType2Sql8(_lhs, db),
-        _leftSql = _handleBaseType2Sql4.sql,
-        _leftSqlItems = _handleBaseType2Sql4.sql_items,
-        _joinDefaultLeftConstants = _handleBaseType2Sql4.constants;
-      var _handleBaseType2Sql5 = _handleBaseType2Sql8(_rhs, db),
-        _rightSql = _handleBaseType2Sql5.sql,
-        _rightSqlItems = _handleBaseType2Sql5.sql_items,
-        _joinDefaultRightConstants = _handleBaseType2Sql5.constants;
+      var _handleBaseType2Sql3 = _handleBaseType2Sql8(_lhs, db),
+        _leftSql = _handleBaseType2Sql3.sql,
+        _leftSqlItems = _handleBaseType2Sql3.sql_items,
+        _joinDefaultLeftConstants = _handleBaseType2Sql3.constants;
+      var _handleBaseType2Sql4 = _handleBaseType2Sql8(_rhs, db),
+        _rightSql = _handleBaseType2Sql4.sql,
+        _rightSqlItems = _handleBaseType2Sql4.sql_items,
+        _joinDefaultRightConstants = _handleBaseType2Sql4.constants;
       constants.push.apply(constants, _toConsumableArray(_joinDefaultLeftConstants));
       constants.push.apply(constants, _toConsumableArray(_joinDefaultRightConstants));
       var _left_condition = _leftSql;
       var _right_condition = '';
       if (_leftSqlItems.length > 1) {
-        // 多个肯定是字段
         if (db === procEnum.mysql) {
           _left_condition = "CONCAT(".concat(_leftSqlItems.join(','), ")");
         }
@@ -213,14 +193,12 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
         }
       }
       if (formula && formula.type && formula.params) {
-        // 目前只有一个 SUBSTR, 也不想再加函数了，函数不在这里加
         var formulaType = formula.type;
         if (db === procEnum.sqlserver && formulaType === 'SUBSTR') {
           formulaType = 'SUBSTRING';
         }
         _left_condition = "".concat(formulaType, "(").concat(formula.params.map(function (it, i) {
           if (!i) {
-            // 字段
             return _left_condition;
           } else {
             return it;
@@ -241,7 +219,6 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
       if (group === SQL_GROUP_TYPE.STRING) {
         var condition_1 = (_rightSqlItems === null || _rightSqlItems === void 0 ? void 0 : _rightSqlItems[0]) || '';
         switch (condition) {
-          // string
           case '等于':
             _right_condition = "= ".concat(_rightSql);
             break;
@@ -249,7 +226,6 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
             _right_condition = "!= ".concat(_rightSql);
             break;
           case '包含':
-            // 去掉引号
             _right_condition = "LIKE '%".concat(condition_1, "%'");
             break;
           case '不包含':
@@ -277,7 +253,6 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
             condition_1 = (_condition_ = condition_1) === null || _condition_ === void 0 || (_condition_ = _condition_.split(',')) === null || _condition_ === void 0 || (_condition_ = _condition_.map(function (v) {
               var _v;
               v = (_v = v) === null || _v === void 0 ? void 0 : _v.trim();
-              // 如果已经加了引号
               if (v && (/^'.*'$/.test(v) || /^".*"$/.test(v))) {
                 return "".concat(v);
               } else {
@@ -317,7 +292,6 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
         var _condition_3 = (_rightSqlItems === null || _rightSqlItems === void 0 ? void 0 : _rightSqlItems[0]) || '';
         var condition_2 = (_rightSqlItems === null || _rightSqlItems === void 0 ? void 0 : _rightSqlItems[1]) || '';
         switch (condition) {
-          // number
           case '等于':
             _right_condition = "= ".concat(_condition_3);
             break;
@@ -428,15 +402,12 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
         var _condition_4 = (_rightSqlItems === null || _rightSqlItems === void 0 ? void 0 : _rightSqlItems[0]) || '';
         var _condition_5 = (_rightSqlItems === null || _rightSqlItems === void 0 ? void 0 : _rightSqlItems[1]) || '';
         if (/^[\d- :]+$/.test(_condition_4)) {
-          // 日期
           _condition_4 = "'".concat(transformDate(_condition_4), "'");
         }
         if (/^[\d- :]+$/.test(_condition_5)) {
-          // 日期
           _condition_5 = "'".concat(transformDate(_condition_5), "'");
         }
         switch (condition) {
-          // date
           case '等于':
             _right_condition = "= ".concat(_condition_4);
             break;
@@ -472,11 +443,21 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
       }
     }
     if (type === BlockTypeEnum.FORMULA) {
-      var _handleBaseType2Sql6 = _handleBaseType2Sql8(item.args, db),
-        argSql = _handleBaseType2Sql6.sql,
-        formulaConstants = _handleBaseType2Sql6.constants;
-      sql += " ".concat(item.name, "(").concat(argSql, ")");
-      constants.push.apply(constants, _toConsumableArray(formulaConstants));
+      var argSqlList = (Array.isArray(item.args) ? item.args : []).map(function (arg) {
+        if ((arg === null || arg === void 0 ? void 0 : arg.type) === BlockTypeEnum.collection) {
+          var _handleBaseType2Sql5 = _handleBaseType2Sql8(arg.list, db),
+            collectionSql = _handleBaseType2Sql5.sql,
+            collectionConstants = _handleBaseType2Sql5.constants;
+          constants.push.apply(constants, _toConsumableArray(collectionConstants));
+          return collectionSql.trim();
+        }
+        var _handleBaseType2Sql6 = _handleBaseType2Sql8([arg], db),
+          nestedSql = _handleBaseType2Sql6.sql,
+          nestedConstants = _handleBaseType2Sql6.constants;
+        constants.push.apply(constants, _toConsumableArray(nestedConstants));
+        return nestedSql.trim();
+      }).filter(Boolean);
+      sql += " ".concat(item.name, "(").concat(argSqlList.join(', '), ")");
     }
     if (type === BlockTypeEnum.collection) {
       var _handleBaseType2Sql7 = _handleBaseType2Sql8(item.list, db),
@@ -492,6 +473,7 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
     constants: constants
   };
 };
+export { _handleBaseType2Sql8 as handleBaseType2Sql };
 var _handleJoinData = function _handleJoinData(joinData) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   var constants = [];
@@ -527,7 +509,6 @@ var _handleJoinData = function _handleJoinData(joinData) {
         return {
           field_sql: "".concat(tableAlias ? "".concat(tableAlias, ".").concat(o.name) : o.name, " as ").concat(fieldAlias),
           read_name: o.name,
-          // 原字段名
           name: fieldAlias,
           name_zh: o.name_zh,
           id: o.id
@@ -540,7 +521,6 @@ var _handleJoinData = function _handleJoinData(joinData) {
     constants: constants
   };
 };
-// 处理数据格式 - (这里才是真正处理成后端需要的格式 前面两步都是准备工作)
 var _handleNesting = function handleNesting(data) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   var hasInnerSql = Boolean(data.children);
@@ -562,7 +542,6 @@ var _handleNesting = function handleNesting(data) {
     obj.datasourceId = tableData.table.datasourceId;
     obj.datasourceName = tableData.table.datasourceName;
     if (tableData.isSubquery && Array.isArray(tableData.subquery)) {
-      // 主表是子查询
       obj.tableSubQuery = tableData.subquery;
     }
     if (!summarize || !summarize.group.length && !summarize.by.length) {
@@ -574,14 +553,10 @@ var _handleNesting = function handleNesting(data) {
         var fieldAlias = v.fieldAlias || v.name;
         return {
           field_sql: "".concat(tableAlias ? "".concat(tableAlias, ".").concat(v.name) : v.name, " as ").concat(fieldAlias),
-          // 生成 sql 放 select 后面的
           read_name: v.name,
-          // 原字段名
           name: fieldAlias,
-          // 输出字段名
           name_zh: v.name_zh,
-          // 字段中文名
-          id: v.id // 字段原 DATA_ID
+          id: v.id
         };
       });
     }
@@ -631,10 +606,8 @@ var _handleNesting = function handleNesting(data) {
         queryColumns.push({
           field_sql: "".concat(v.sql, " as ").concat(v.fieldAlias),
           read_name: '',
-          // 原字段名
           name: v.fieldAlias,
           name_zh: v.fieldAlias,
-          // v.quotes,
           id: ''
         });
         return v.sql;
@@ -642,16 +615,16 @@ var _handleNesting = function handleNesting(data) {
     }
     if (summarize.by.length) {
       obj.groupBy.groupColumns = summarize.by.map(function (v) {
+        var _v$atoms;
+        var fieldSql = (_v$atoms = v.atoms) !== null && _v$atoms !== void 0 && _v$atoms.length ? _handleBaseType2Sql8(v.atoms, db).sql.trim() || v.sql : v.sql || "".concat(v.alias, ".").concat(v.realName || v.name);
         queryColumns.push({
-          field_sql: "".concat(v.sql, " as ").concat(v.fieldAlias),
+          field_sql: "".concat(fieldSql, " as ").concat(v.fieldAlias),
           read_name: '',
-          // 原字段名
           name: v.fieldAlias,
           name_zh: v.fieldAlias,
-          // v.name_zh,
           id: v.id
         });
-        return "".concat(v.alias, ".").concat(v.realName || v.name);
+        return fieldSql;
       });
     }
     obj.queryColumns = queryColumns;
@@ -671,18 +644,15 @@ var _handleNesting = function handleNesting(data) {
   }
   return obj;
 };
-// 反转顺序 - （将原本嵌套的顺序完全反转 最内层变成最外层）别问为什么 问就是接口需要
 var reverseData = function reverseData(data) {
   var arr = [];
   _flatArr2(data, arr);
   return _recursionArr2(arr.reverse());
 };
-// 分层 - （将原本平铺的格式转成 嵌套的格式）
 var _layeredData = function layeredData(list) {
   var res = {};
   for (var i = 0; i < list.length; i++) {
     var meta = list[i];
-    // @ts-ignore
     if (meta.type === MetabaseTypeEnum.joinData) {
       if (res[meta.type]) {
         res[meta.type].push(meta);
@@ -690,15 +660,12 @@ var _layeredData = function layeredData(list) {
         res[meta.type] = [meta];
       }
     } else {
-      // @ts-ignore
       res[meta.type] = meta;
     }
     if (meta.type === MetabaseTypeEnum.summarize) {
       var nextMeta = list[i + 1];
       var nextNextMeta = list[i + 2];
       var nextNextNextMeta = list[i + 3];
-      // 将sort 和 rowLimit 归到上一层 （虽然他们两在 summarize 后面）
-      // 处理完 sort 和 rowLimit 之后 如果数组后面还有元素则进入下一层循环
       if (nextMeta) {
         if (nextMeta.type === MetabaseTypeEnum.rowLimit) {
           res[nextMeta.type] = nextMeta;
@@ -730,7 +697,6 @@ var handleSqlStruct = function handleSqlStruct(list) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   return _handleNesting(reverseData(_layeredData(list)), db);
 };
-// 处理 union
 var handleSqlUnion = function handleSqlUnion(metas) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   var noFields = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -746,7 +712,6 @@ var handleSqlUnion = function handleSqlUnion(metas) {
     fields = _sqlStruct2text.fields;
   var union_fields = [fields];
   if (unionMetas.length) {
-    // 用到了 union
     unionMetas.forEach(function (it) {
       if (Array.isArray(it.subquery) && it.subquery.length) {
         var u_data = handleSqlStruct(it.subquery, db);
@@ -764,11 +729,6 @@ var handleSqlUnion = function handleSqlUnion(metas) {
     union_fields: union_fields
   };
 };
-/**
- * 拼 sql
- * @param {meta[]} data
- * @param {boolean} indent 0 是第一次进来 非 0 是第N次进来
- */
 var _sqlStruct2text3 = function sqlStruct2text(data) {
   var indent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var db = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : procEnum.mysql;
@@ -788,19 +748,14 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
     groupBy = data.groupBy;
   sql += "SELECT ";
   var firstEntry = !indent;
-  // -------- 处理 fields --------
-  // 情况一、一层 带聚合  字段是 聚合字段
-  // 情况二、一层 不带聚合  字段是 主表和关联表的字段
-  // 情况三、二层 带聚合 第一层 聚合字段 + 关联表字段 第二层 聚合字段  第三层 聚合字段
   if (noFields) {
     sql += '1 ';
   } else {
-    var flag = false; // 是否加逗号
+    var flag = false;
     if (limit && db === procEnum.sqlserver) {
       sql += "TOP(".concat(limit, ") ");
     }
     if (hasInnerSql) {
-      // 情况三  innerSqlStruct.queryColumns 是内层 聚合输出的字段,这种字段虽说是内层的，但是其实外层也需要
       if (innerSqlStruct.queryColumns && innerSqlStruct.queryColumns.length) {
         sql += innerSqlStruct.queryColumns.map(function (v) {
           return "".concat(alias, ".").concat(v.name, " as ").concat(v.name);
@@ -809,9 +764,6 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
       }
     } else {
       if (Array.isArray(queryColumns) && queryColumns.length) {
-        // 情况一  queryColumns 是聚合字段
-        // 情况二  queryColumns 是主表字段
-        // 情况三  queryColumns 是聚合字段
         flag = true;
         sql += queryColumns.map(function (v) {
           return v.field_sql;
@@ -819,8 +771,6 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
       }
     }
     if (firstEntry && joinTables && !groupBy) {
-      // 情况二  joinTables 是关联表字段
-      // 情况三  joinTables 是关联表字段
       joinTables.forEach(function (it) {
         if (Array.isArray(it.queryColumns) && it.queryColumns.length) {
           if (flag) {
@@ -842,31 +792,26 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
       }).join(', ') + ' ';
     }
   }
-  // -------- 处理 main table --------
   sql += 'FROM ';
   var as = db === procEnum.oracle ? '' : 'AS ';
   if (hasInnerSql) {
     sql += "(".concat(_sqlStruct2text3(innerSqlStruct, indent + 1, db).sql, ") ").concat(as).concat(alias, " ");
   } else {
     if (tableSubQuery) {
-      // 子查询
       sql += "(".concat(handleSqlUnion(tableSubQuery, db).sql, ") ").concat(as).concat(alias, " ");
     } else {
       sql += "".concat(tableName, " ").concat(as).concat(alias, " ");
     }
   }
-  // -------- 处理 left join --------
   if (joinTables) {
     joinTables.forEach(function (it) {
       if (it.subQuery) {
-        // 子查询
         sql += "".concat(it.joinType, " (").concat(handleSqlUnion(it.subQuery, db).sql, ") ").concat(as).concat(it.alias, " ").concat(it.joinCondition, " ");
       } else {
         sql += "".concat(it.joinType, " ").concat(it.tableName, " ").concat(as).concat(it.alias, " ").concat(it.joinCondition, " ");
       }
     });
   }
-  // -------- 处理 where --------
   if (filters) {
     sql += "".concat(filters, " ");
     if (limit && db === procEnum.oracle) {
@@ -877,21 +822,17 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
       }
     }
   }
-  // -------- 处理 group by --------
   if (Array.isArray(groupBy === null || groupBy === void 0 ? void 0 : groupBy.groupColumns) && groupBy.groupColumns.length) {
     sql += "GROUP BY ".concat(groupBy.groupColumns.map(function (it) {
       return it;
     }).join(', '), " ");
   }
-  // -------- 处理 orderby --------
   if (orderInfos) {
     sql += "".concat(orderInfos, " ");
   }
-  // -------- 处理 limit --------
   if (limit && db === procEnum.mysql) {
     sql += "LIMIT ".concat(limit, " ");
   }
-  // -------- 获取 字段列表 --------
   var fields = [];
   if (firstEntry && !noFields) {
     function addFields(data) {
@@ -940,7 +881,6 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
 };
 export var transformSql = function transformSql(metas) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
-  // let new_metas = upgradeLegacyData(metas);
   var _handleSqlUnion = handleSqlUnion(metas, db, true),
     sql = _handleSqlUnion.sql,
     fields = _handleSqlUnion.fields,

package/lib/es/utils.d.ts

@@ -26,17 +26,12 @@ export declare function isValidSQLAlias(str: string): boolean;
 export declare const changeTableAlias: (list: MetaListType[] | [], curObj: Pick<MetaData_TableType, "tableUuid" | "alias">) => MetaListType[];
 export declare const changeFieldAlias: (list: MetaListType[], curObj: Pick<MetaData_ColumnsType, "fieldUuid" | "fieldAlias">) => MetaListType[];
 export declare function splitByUnion(data: any): any[];
+export declare const normalizeLegacySummarizeForSave: (metas?: MetaListType[]) => MetaListType[];
 export declare const getObjTem: (arr: any[]) => any;
 export declare const patchData: (metas: MetaListType[], constantList?: any, formulaTemplates?: any) => MetaListType[];
 export declare function reassembleByUnion(target?: any[]): any[];
 export declare const buildSqlQuery: (data: MetaListType[] | undefined, type: string) => string;
 export declare const isError: (item: AtomsItem | AtomsItem[], data: DataType[]) => boolean;
-/**
- * 在嵌套结构 root 中查找是否存在一个对象，使得 target 是该对象的子集
- * @param root 可能包含任意层数组/对象的根数据
- * @param target 目标对象（可能只包含部分字段）
- * @returns 是否存在
- */
 export declare function containsSubset(root: unknown, target: Record<string, unknown>): boolean;
 export declare const isExistsError: (meta: any[], errorList: any[]) => boolean;
 export declare const changeCopyField: (items: AtomsItem[], data: any[]) => AtomsItem[];