semanticdb-core 1.1.49 → 1.1.51

package/dist/logicform/explainLogicform.js

@@ -79,28 +79,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') &&
@@ -157,7 +218,7 @@ const explainNegatedComparedValue = (key, value, schemas) => {
     }
     const [operator, operatorValue] = entries[0];
     if (operator === '$eq') {
-        return `${key} != ${stringifyExplainValue(operatorValue, schemas)}`;
+        return `${key} 不等于 ${stringifyExplainValue(operatorValue, schemas)}`;
     }
     if (operator === '$gt') {
         return `${key} <= ${stringifyExplainValue(operatorValue, schemas)}`;
@@ -199,7 +260,7 @@ const explainComparedValue = (key, value, schemas) => {
             if (isCompareOperatorObject(operatorValue)) {
                 return explainNegatedComparedValue(key, operatorValue, schemas);
             }
-            return `${key} != ${stringifyExplainValue(operatorValue, schemas)}`;
+            return `${key} 不等于 ${stringifyExplainValue(operatorValue, schemas)}`;
         }
         return explainSingleComparedValue(key, operator, operatorValue, schemas);
     });

package/package.json

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