semanticdb-core 1.1.40 → 1.1.41

package/dist/logicform/explainLogicform.js

@@ -111,7 +111,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);
 };
 exports.explainQuery = explainQuery;
 const explainEntityID = (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.41",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [