semanticdb-core 1.1.51 → 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;
 };
@@ -366,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 '';
@@ -396,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.51",
+  "version": "1.1.52",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [