semanticdb-core 1.1.40 → 1.1.42

package/dist/logicform/explainLogicform.js

@@ -38,6 +38,83 @@ const stringifyJson = (value) => {
     const stringified = JSON.stringify(value);
     return stringified === undefined ? String(value) : stringified;
 };
+const isCompareOperatorObject = (value) => {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return false;
+    }
+    const keys = Object.keys(value);
+    return keys.length > 0 && keys.every((key) => key.startsWith('$'));
+};
+const isSubQueryLikeValue = (value) => {
+    return Boolean(value &&
+        typeof value === 'object' &&
+        !Array.isArray(value) &&
+        'schema' in value &&
+        'query' in value &&
+        !('groupby' in value));
+};
+const explainInlineQueryValues = (query, schemas) => {
+    return explainFilterLikeQuery(query ? (0, logicform_utils_1.getFlattenQuery)(query, schemas) : undefined, '', true, schemas).values;
+};
+const stringifyExplainValue = (value, schemas) => {
+    if (Array.isArray(value)) {
+        return stringifyJson(value);
+    }
+    if (isCompareOperatorObject(value)) {
+        return stringifyJson(value);
+    }
+    return stringifyJson(value);
+};
+const explainComparedValue = (key, value, schemas) => {
+    const segments = Object.entries(value)
+        .filter(([operator]) => operator !== '$options')
+        .map(([operator, operatorValue]) => {
+        if ((operator === '$in' || operator === '$nin') &&
+            Array.isArray(operatorValue) &&
+            operatorValue.every((item) => isSubQueryLikeValue(item))) {
+            const subQueryItems = operatorValue.map((item) => {
+                const queryValues = explainInlineQueryValues(item.query, schemas);
+                if (item.entity_id) {
+                    queryValues.push(`ID为${item.entity_id}`);
+                }
+                return queryValues.join('、') || stringifyJson(item);
+            });
+            return `${key}${operator === '$in' ? ' 属于' : ' 不属于'}（${subQueryItems.join('；')}）`;
+        }
+        if (operator === '$eq') {
+            return `${key} = ${stringifyExplainValue(operatorValue, schemas)}`;
+        }
+        if (operator === '$gt') {
+            return `${key} > ${stringifyExplainValue(operatorValue, schemas)}`;
+        }
+        if (operator === '$gte') {
+            return `${key} >= ${stringifyExplainValue(operatorValue, schemas)}`;
+        }
+        if (operator === '$lt') {
+            return `${key} < ${stringifyExplainValue(operatorValue, schemas)}`;
+        }
+        if (operator === '$lte') {
+            return `${key} <= ${stringifyExplainValue(operatorValue, schemas)}`;
+        }
+        if (operator === '$ne') {
+            return `${key} != ${stringifyExplainValue(operatorValue, schemas)}`;
+        }
+        if (operator === '$exists') {
+            return `${key}${operatorValue ? '存在' : '不存在'}`;
+        }
+        if (operator === '$regex') {
+            return `${key} 匹配 ${stringifyExplainValue(operatorValue, schemas)}`;
+        }
+        if (operator === '$in') {
+            return `${key} in ${stringifyExplainValue(operatorValue, schemas)}`;
+        }
+        if (operator === '$nin') {
+            return `${key} not in ${stringifyExplainValue(operatorValue, schemas)}`;
+        }
+        return `${key} ${operator} ${stringifyExplainValue(operatorValue, schemas)}`;
+    });
+    return segments.join(' 且 ');
+};
 const getEntityIdFromValue = (value) => {
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
         return undefined;
@@ -48,7 +125,7 @@ const getEntityIdFromValue = (value) => {
     const entityId = value.entity_id;
     return typeof entityId === 'string' && entityId ? entityId : undefined;
 };
-const explainFilterLikeQuery = (query, prefix = '筛选', includeValue = false) => {
+const explainFilterLikeQuery = (query, prefix = '筛选', includeValue = false, schemas = {}) => {
     if (!query || Object.keys(query).length === 0) {
         return buildExplainResult(prefix, []);
     }
@@ -60,7 +137,10 @@ const explainFilterLikeQuery = (query, prefix = '筛选', includeValue = false)
             if (k === 'entity_id') {
                 return `ID为${stringifyJson(v)}`;
             }
-            return `${key} = ${stringifyJson(v)}`;
+            if (isCompareOperatorObject(v)) {
+                return explainComparedValue(key, v, schemas);
+            }
+            return `${key} = ${stringifyExplainValue(v, schemas)}`;
         }
         const entityId = getEntityIdFromValue(query[k]);
         if (entityId) {
@@ -111,7 +191,7 @@ const explainSchema = (logicform, schemas, locale = exports.DEFAULT_EXPLAIN_LOGI
 exports.explainSchema = explainSchema;
 const explainQuery = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {
     (0, exports.normalizeExplainLogicformLocale)(locale);
-    return explainFilterLikeQuery(logicform.query ? (0, logicform_utils_1.getFlattenQuery)(logicform.query) : undefined, '筛选', true);
+    return explainFilterLikeQuery(logicform.query ? (0, logicform_utils_1.getFlattenQuery)(logicform.query, _schemas) : undefined, '筛选', true, _schemas);
 };
 exports.explainQuery = explainQuery;
 const explainEntityID = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {
@@ -128,7 +208,16 @@ const explainPreds = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGI
         return buildExplainResult('计算', []);
     }
     return buildExplainResult('计算', logicform.preds
-        .map((p) => p.name)
+        .map((p) => {
+        if (typeof p.name !== 'string' || p.name.length === 0) {
+            return null;
+        }
+        const predQueryExplanation = explainFilterLikeQuery(p.query ? (0, logicform_utils_1.getFlattenQuery)(p.query, _schemas) : undefined, '', true, _schemas).values.join('、');
+        if (!predQueryExplanation) {
+            return p.name;
+        }
+        return `${p.name}（${predQueryExplanation}）`;
+    })
         .filter((name) => typeof name === 'string' && name.length > 0));
 };
 exports.explainPreds = explainPreds;
@@ -150,7 +239,7 @@ const explainLimit = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGI
 exports.explainLimit = explainLimit;
 const explainHaving = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {
     (0, exports.normalizeExplainLogicformLocale)(locale);
-    return explainFilterLikeQuery(logicform.having, '结果过滤');
+    return explainFilterLikeQuery(logicform.having, '结果过滤', false, _schemas);
 };
 exports.explainHaving = explainHaving;
 const explainLogicform = (logicform, schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {

package/dist/logicform/logicform.utils.d.ts

@@ -55,7 +55,7 @@ export declare const isDimensionInLogicform: (logicform: LogicformType, dimensio
  * }
  * ```
  */
-export declare const getFlattenQuery: (query: QueryType) => QueryType;
+export declare const getFlattenQuery: (query: QueryType, schemasDict?: Record<string, SchemaType>) => QueryType;
 /**
  * 根据链条字符串在查询对象中查找对应的值
  * @param query - 查询对象

package/dist/logicform/logicform.utils.js

@@ -216,14 +216,14 @@ exports.isDimensionInLogicform = isDimensionInLogicform;
  * }
  * ```
  */
-const getFlattenQuery = (query) => {
+const getFlattenQuery = (query, schemasDict) => {
     let flattenQuery = {};
     for (const [k, v] of Object.entries(query)) {
         if (Array.isArray(v) && (k === '$and' || k === '$or')) {
             const tmp = [];
             v.forEach((item) => {
                 if (typeof item === 'object' && item) {
-                    tmp.push((0, exports.getFlattenQuery)(item));
+                    tmp.push((0, exports.getFlattenQuery)(item, schemasDict));
                 }
             });
             flattenQuery[k] = tmp;
@@ -232,11 +232,16 @@ const getFlattenQuery = (query) => {
             v &&
             'schema' in v &&
             'query' in v &&
-            !('groupby' in v) && // 不是复合的logicform
-            !('entity_id' in v) // entity_id的话，也没必要收起来
+            !('groupby' in v) // 不是复合的logicform
         ) {
-            // 这里是一个logicform
-            const flattenSubQuery = (0, exports.getFlattenQuery)(v.query || {});
+            const subSchema = typeof v.schema === 'string' && schemasDict ? schemasDict[v.schema] : undefined;
+            const idProperty = subSchema ? (0, schema_utils_1.findPropertyByType)('ID', subSchema) : undefined;
+            if ('entity_id' in v && !idProperty) {
+                flattenQuery[k] = v;
+                continue;
+            }
+            // 这里是一个logicform。传了schemas时，把entity_id临时映射成ID属性参与拍平。
+            const flattenSubQuery = (0, exports.getFlattenQuery)(Object.assign(Object.assign({}, (v.query || {})), ('entity_id' in v && idProperty ? { [idProperty.name]: v.entity_id } : {})), schemasDict);
             for (const [sk, sv] of Object.entries(flattenSubQuery)) {
                 if (Array.isArray(sv) &&
                     sv.length &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semanticdb-core",
-  "version": "1.1.40",
+  "version": "1.1.42",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [