semanticdb-core 1.1.50 → 1.1.52

package/dist/logicform/explainLogicform.js

@@ -56,6 +56,18 @@ const isSubQueryLikeValue = (value) => {
         'query' in value &&
         !('groupby' in value));
 };
+const isCompositeLogicformValue = (value) => {
+    return Boolean(value &&
+        typeof value === 'object' &&
+        !Array.isArray(value) &&
+        'schema' in value &&
+        ('preds' in value ||
+            'groupby' in value ||
+            'having' in value ||
+            'limit' in value ||
+            'skip' in value ||
+            'sort' in value));
+};
 const explainInlineQueryValues = (query, schemas) => {
     return explainFilterLikeQuery(query ? (0, logicform_utils_1.getFlattenQuery)(query, schemas) : undefined, '', true, schemas).values;
 };
@@ -79,28 +91,89 @@ const stripExplainKeyPrefix = (segment, key) => {
     }
     return segment;
 };
+const startsWithExplainOperatorPhrase = (segment) => {
+    return [
+        '>= ',
+        '<= ',
+        '> ',
+        '< ',
+        '= ',
+        '不等于 ',
+        '不属于 ',
+        '属于 ',
+        '不包含 ',
+        '包含 ',
+        '不匹配 ',
+        '匹配 ',
+        '不存在',
+        '存在',
+        '不满足 ',
+    ].some((prefix) => segment.startsWith(prefix));
+};
+const startsWithExplainUnaryPhrase = (segment) => {
+    return [
+        '不等于 ',
+        '不属于 ',
+        '属于 ',
+        '不包含 ',
+        '包含 ',
+        '不匹配 ',
+        '匹配 ',
+        '不存在',
+        '存在',
+        '不满足 ',
+    ].some((prefix) => segment.startsWith(prefix));
+};
+const explainLogicalOperandValue = (key, item, schemas) => {
+    if (isCompareOperatorObject(item)) {
+        const comparedValue = explainComparedValue(key, item, schemas);
+        const normalizedValue = stripExplainKeyPrefix(comparedValue, key);
+        if (normalizedValue.startsWith('= ')) {
+            return {
+                value: normalizedValue.slice(2).trim(),
+                isEqualityLiteral: true,
+            };
+        }
+        return {
+            value: normalizedValue,
+        };
+    }
+    if (isSubQueryLikeValue(item)) {
+        return {
+            value: explainInlineQueryValues(item.query, schemas).join('、') || stringifyJson(item),
+        };
+    }
+    if (isPlainObject(item)) {
+        return {
+            value: explainFilterLikeQuery((0, logicform_utils_1.getFlattenQuery)(item, schemas), '', true, schemas).values.join('、') || stringifyJson(item),
+        };
+    }
+    return {
+        value: stringifyExplainValue(item, schemas),
+        isEqualityLiteral: true,
+    };
+};
 const explainLogicalComparedValue = (key, operator, operatorValue, schemas) => {
     if (!Array.isArray(operatorValue)) {
         return `${key} ${operator} ${stringifyExplainValue(operatorValue, schemas)}`;
     }
     const explainedSegments = operatorValue
-        .map((item, index) => {
-        if (isCompareOperatorObject(item)) {
-            const comparedValue = explainComparedValue(key, item, schemas);
-            const normalizedValue = stripExplainKeyPrefix(comparedValue, key);
-            return `(${normalizedValue})`;
-        }
-        return `(= ${stringifyExplainValue(item, schemas)})`;
-    })
-        .filter((segment) => segment.length > 0);
+        .map((item) => explainLogicalOperandValue(key, item, schemas))
+        .filter((segment) => segment.value.length > 0);
     if (explainedSegments.length === 0) {
         return `${key} ${operator} []`;
     }
     const [firstSegment, ...restSegments] = explainedSegments;
-    const normalizedFirstSegment = firstSegment.startsWith('(= ')
-        ? `${key} = (${firstSegment.slice(3, -1)})`
-        : `${key} ${firstSegment}`;
-    return [normalizedFirstSegment, ...restSegments].join(` ${LOGICAL_OPERATOR_LABELS[operator]} `);
+    let normalizedFirstSegment = `${key} = (${firstSegment.value})`;
+    if (firstSegment.isEqualityLiteral) {
+        normalizedFirstSegment = `${key} = (${firstSegment.value})`;
+    }
+    else if (startsWithExplainOperatorPhrase(firstSegment.value)) {
+        normalizedFirstSegment = startsWithExplainUnaryPhrase(firstSegment.value)
+            ? `${key} ${firstSegment.value}`
+            : `${key} (${firstSegment.value})`;
+    }
+    return [normalizedFirstSegment, ...restSegments.map((segment) => `(${segment.value})`)].join(` ${LOGICAL_OPERATOR_LABELS[operator]} `);
 };
 const explainSingleComparedValue = (key, operator, operatorValue, schemas) => {
     if ((operator === '$in' || operator === '$nin') &&
@@ -305,6 +378,12 @@ const stringifyExplainFilterLikeResult = (result, separator = ' ') => {
     return `${result.title}${separator}${result.values.join('、')}`;
 };
 exports.stringifyExplainFilterLikeResult = stringifyExplainFilterLikeResult;
+const stringifyExplainLogicformInline = (logicform, schemas) => {
+    return (0, exports.explainLogicform)(logicform, schemas)
+        .map((item) => (0, exports.stringifyExplainFilterLikeResult)(item))
+        .filter((item) => item.length > 0)
+        .join('；');
+};
 const explainGroupbyLevel = (level) => {
     if (!level) {
         return '';
@@ -335,9 +414,18 @@ 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);
-    const query = logicform.query ? (0, logicform_utils_1.getFlattenQuery)(logicform.query, _schemas) : undefined;
     const entities = collectQueryEntities(logicform, logicform.query);
-    return buildExplainResultWithEntities('筛选', explainFilterLikeQuery(query, '筛选', true, _schemas).values, entities);
+    const values = !logicform.query
+        ? []
+        : Object.entries(logicform.query)
+            .flatMap(([key, value]) => {
+            if (isCompositeLogicformValue(value)) {
+                return `${formatExplainKey(key)} = (${stringifyExplainLogicformInline(value, _schemas)})`;
+            }
+            return explainFilterLikeQuery((0, logicform_utils_1.getFlattenQuery)({ [key]: value }, _schemas), '筛选', true, _schemas).values;
+        })
+            .filter((value) => value.length > 0);
+    return buildExplainResultWithEntities('筛选', values, entities);
 };
 exports.explainQuery = explainQuery;
 const explainEntityID = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {

package/package.json

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