semanticdb-core 1.1.47 → 1.1.48

package/dist/logicform/explainLogicform.js

@@ -205,6 +205,28 @@ const explainComparedValue = (key, value, schemas) => {
     });
     return segments.join(' 且 ');
 };
+const explainTopLevelLogicalQuery = (operator, operatorValue, includeValue, schemas) => {
+    if (!Array.isArray(operatorValue)) {
+        return `${operator} ${stringifyExplainValue(operatorValue, schemas)}`;
+    }
+    const explainedSegments = operatorValue
+        .map((item) => {
+        if (!isPlainObject(item)) {
+            return stringifyExplainValue(item, schemas);
+        }
+        const itemValues = explainFilterLikeQuery(item, '', includeValue, schemas).values;
+        if (itemValues.length === 0) {
+            return '';
+        }
+        return itemValues.join('、');
+    })
+        .filter((segment) => segment.length > 0)
+        .map((segment) => `(${segment})`);
+    if (explainedSegments.length === 0) {
+        return `${operator} []`;
+    }
+    return explainedSegments.join(` ${LOGICAL_OPERATOR_LABELS[operator]} `);
+};
 const getEntityIdFromValue = (value) => {
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
         return undefined;
@@ -251,6 +273,9 @@ const explainFilterLikeQuery = (query, prefix = '筛选', includeValue = false,
     const values = Object.entries(query)
         .filter(([k]) => includeValue || k !== 'entity_id')
         .map(([k, v]) => {
+        if (k === '$and' || k === '$or') {
+            return explainTopLevelLogicalQuery(k, v, includeValue, schemas);
+        }
         const key = formatExplainKey(k);
         if (includeValue) {
             if (k === 'entity_id') {

package/dist/logicform/types/query.d.ts

@@ -21,4 +21,7 @@ export declare type QueryValueTypeWithCompareOperator = Partial<{
 }> & {
     schema?: never;
 };
-export declare type QueryType = Record<string, QueryValueType | QueryValueTypeWithCompareOperator | QueryType[] | undefined>;
+export declare type QueryType = Record<string, QueryValueType | QueryValueTypeWithCompareOperator | QueryType[] | undefined> & Partial<{
+    $and: QueryType[];
+    $or: QueryType[];
+}>;

package/package.json

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