semanticdb-core 1.1.39 → 1.1.41

package/dist/logicform/explainLogicform.d.ts

@@ -2,13 +2,20 @@ import { LogicformType } from './logicform';
 import { SchemaType } from '../schema/schema';
 export declare const DEFAULT_EXPLAIN_LOGICFORM_LOCALE = "zh-CN";
 export type ExplainLogicformSchemas = Record<string, SchemaType>;
+export type ExplainLogicformResultItem = {
+    title: string;
+    values: string[];
+};
+export type ExplainFilterLikeResult = ExplainLogicformResultItem;
+export type ExplainQueryResult = ExplainLogicformResultItem;
 export declare const normalizeExplainLogicformLocale: (locale?: string) => string;
+export declare const stringifyExplainFilterLikeResult: (result: ExplainLogicformResultItem, separator?: string) => string;
 export declare const explainGroupbyLevel: (level?: string) => string;
-export declare const explainSchema: (logicform: LogicformType, schemas: ExplainLogicformSchemas, locale?: string) => string;
-export declare const explainQuery: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => string;
-export declare const explainEntityID: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => string;
-export declare const explainPreds: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => string;
-export declare const explainGroupby: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => string;
-export declare const explainLimit: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => string;
-export declare const explainHaving: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => string;
-export declare const explainLogicform: (logicform: LogicformType, schemas: ExplainLogicformSchemas, locale?: string) => string[];
+export declare const explainSchema: (logicform: LogicformType, schemas: ExplainLogicformSchemas, locale?: string) => ExplainLogicformResultItem;
+export declare const explainQuery: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => ExplainQueryResult;
+export declare const explainEntityID: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => ExplainLogicformResultItem;
+export declare const explainPreds: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => ExplainLogicformResultItem;
+export declare const explainGroupby: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => ExplainLogicformResultItem;
+export declare const explainLimit: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => ExplainLogicformResultItem;
+export declare const explainHaving: (logicform: LogicformType, _schemas: ExplainLogicformSchemas, locale?: string) => ExplainLogicformResultItem;
+export declare const explainLogicform: (logicform: LogicformType, schemas: ExplainLogicformSchemas, locale?: string) => ExplainLogicformResultItem[];

package/dist/logicform/explainLogicform.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.explainLogicform = exports.explainHaving = exports.explainLimit = exports.explainGroupby = exports.explainPreds = exports.explainEntityID = exports.explainQuery = exports.explainSchema = exports.explainGroupbyLevel = exports.normalizeExplainLogicformLocale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE = void 0;
+exports.explainLogicform = exports.explainHaving = exports.explainLimit = exports.explainGroupby = exports.explainPreds = exports.explainEntityID = exports.explainQuery = exports.explainSchema = exports.explainGroupbyLevel = exports.stringifyExplainFilterLikeResult = exports.normalizeExplainLogicformLocale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE = void 0;
+const logicform_utils_1 = require("./logicform.utils");
 exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE = 'zh-CN';
+const buildExplainResult = (title, values) => ({
+    title,
+    values,
+});
 const normalizeExplainLogicformLocale = (locale) => {
     if (locale === exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) {
         return locale;
@@ -27,6 +32,9 @@ const stringifyJson = (value) => {
     if (value === undefined) {
         return '无';
     }
+    if (typeof value === 'string') {
+        return value;
+    }
     const stringified = JSON.stringify(value);
     return stringified === undefined ? String(value) : stringified;
 };
@@ -40,26 +48,39 @@ const getEntityIdFromValue = (value) => {
     const entityId = value.entity_id;
     return typeof entityId === 'string' && entityId ? entityId : undefined;
 };
-const explainFilterLikeQuery = (query, prefix = '筛选', separator = ' ') => {
+const explainFilterLikeQuery = (query, prefix = '筛选', includeValue = false) => {
     if (!query || Object.keys(query).length === 0) {
-        return '';
+        return buildExplainResult(prefix, []);
     }
-    const parts = Object.keys(query)
-        .filter((k) => k !== 'entity_id')
-        .map((k) => {
+    const values = Object.entries(query)
+        .filter(([k]) => includeValue || k !== 'entity_id')
+        .map(([k, v]) => {
         const key = k.split('_').pop() || '';
+        if (includeValue) {
+            if (k === 'entity_id') {
+                return `ID为${stringifyJson(v)}`;
+            }
+            return `${key} = ${stringifyJson(v)}`;
+        }
         const entityId = getEntityIdFromValue(query[k]);
         if (entityId) {
             return `${key}(${entityId})`;
         }
         return key;
     });
-    const queryEntityId = getEntityIdFromValue(query);
+    const queryEntityId = includeValue ? undefined : getEntityIdFromValue(query);
     if (queryEntityId) {
-        parts.push(`ID为${queryEntityId}`);
+        values.push(`ID为${queryEntityId}`);
+    }
+    return buildExplainResult(prefix, values);
+};
+const stringifyExplainFilterLikeResult = (result, separator = ' ') => {
+    if (result.values.length === 0) {
+        return '';
     }
-    return parts.length > 0 ? `${prefix}${separator}${parts.join('、')}` : '';
+    return `${result.title}${separator}${result.values.join('、')}`;
 };
+exports.stringifyExplainFilterLikeResult = stringifyExplainFilterLikeResult;
 const explainGroupbyLevel = (level) => {
     if (!level) {
         return '';
@@ -71,54 +92,65 @@ const explainSchema = (logicform, schemas, locale = exports.DEFAULT_EXPLAIN_LOGI
     var _a;
     (0, exports.normalizeExplainLogicformLocale)(locale);
     if (!logicform.schema) {
-        return '未指定主题';
+        return buildExplainResult('主题', ['未指定']);
     }
-    const schemaName = ((_a = schemas[logicform.schema]) === null || _a === void 0 ? void 0 : _a.name) || logicform.schema;
-    return `${schemaName}主题`;
+    const schemaValues = [
+        ((_a = schemas[logicform.schema]) === null || _a === void 0 ? void 0 : _a.name) || logicform.schema,
+        ...(logicform.preds || [])
+            .map((pred) => {
+            var _a;
+            if (!pred || typeof pred !== 'object' || !pred.schema) {
+                return null;
+            }
+            return ((_a = schemas[pred.schema]) === null || _a === void 0 ? void 0 : _a.name) || pred.schema;
+        })
+            .filter((schemaName) => typeof schemaName === 'string' && schemaName.length > 0),
+    ];
+    return buildExplainResult('主题', Array.from(new Set(schemaValues)));
 };
 exports.explainSchema = explainSchema;
 const explainQuery = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {
     (0, exports.normalizeExplainLogicformLocale)(locale);
-    return explainFilterLikeQuery(logicform.query, '筛选');
+    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) => {
     (0, exports.normalizeExplainLogicformLocale)(locale);
     if (!logicform.entity_id) {
-        return '';
+        return buildExplainResult('ID', []);
     }
-    return `ID为"${logicform.entity_id}"`;
+    return buildExplainResult('ID', [logicform.entity_id]);
 };
 exports.explainEntityID = explainEntityID;
 const explainPreds = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {
     (0, exports.normalizeExplainLogicformLocale)(locale);
     if (!logicform.preds || logicform.preds.length === 0) {
-        return '';
+        return buildExplainResult('计算', []);
     }
-    return `计算 ${logicform.preds.map((p) => p.name).join('、')}`;
+    return buildExplainResult('计算', logicform.preds
+        .map((p) => p.name)
+        .filter((name) => typeof name === 'string' && name.length > 0));
 };
 exports.explainPreds = explainPreds;
 const explainGroupby = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {
     (0, exports.normalizeExplainLogicformLocale)(locale);
     if (!logicform.groupby || logicform.groupby.length === 0) {
-        return '';
+        return buildExplainResult('分组', []);
     }
-    return `按 ${logicform.groupby
-        .map((gi) => (0, exports.explainGroupbyLevel)(gi.level) || gi.name || '')
-        .join('、')} 分组`;
+    return buildExplainResult('分组', logicform.groupby.map((gi) => (0, exports.explainGroupbyLevel)(gi.level) || gi.name || ''));
 };
 exports.explainGroupby = explainGroupby;
 const explainLimit = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {
     (0, exports.normalizeExplainLogicformLocale)(locale);
     if (typeof logicform.limit !== 'number') {
-        return '';
+        return buildExplainResult('限制', []);
     }
-    return `限制 ${logicform.limit} 条记录`;
+    return buildExplainResult('限制', [`${logicform.limit} 条记录`]);
 };
 exports.explainLimit = explainLimit;
 const explainHaving = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {
     (0, exports.normalizeExplainLogicformLocale)(locale);
-    return explainFilterLikeQuery(logicform.having, '结果过滤：', '');
+    return explainFilterLikeQuery(logicform.having, '结果过滤');
 };
 exports.explainHaving = explainHaving;
 const explainLogicform = (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.39",
+  "version": "1.1.41",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [