semanticdb-core 1.1.44 → 1.1.46

package/dist/logicform/explainLogicform.d.ts

@@ -2,9 +2,14 @@ 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 ExplainLogicformEntityRef = {
+    schema: string;
+    id: string;
+};
 export type ExplainLogicformResultItem = {
     title: string;
     values: string[];
+    entities?: ExplainLogicformEntityRef[];
 };
 export type ExplainFilterLikeResult = ExplainLogicformResultItem;
 export type ExplainQueryResult = ExplainLogicformResultItem;

package/dist/logicform/explainLogicform.js

@@ -7,6 +7,8 @@ const buildExplainResult = (title, values) => ({
     title,
     values,
 });
+const buildExplainResultWithEntities = (title, values, entities = []) => (Object.assign({ title,
+    values }, (entities.length > 0 ? { entities } : {})));
 const normalizeExplainLogicformLocale = (locale) => {
     if (locale === exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) {
         return locale;
@@ -176,6 +178,35 @@ const getEntityIdFromValue = (value) => {
     const entityId = value.entity_id;
     return typeof entityId === 'string' && entityId ? entityId : undefined;
 };
+const isPlainObject = (value) => {
+    return Boolean(value && typeof value === 'object' && !Array.isArray(value));
+};
+const collectQueryEntitiesFromValue = (value, fallbackSchema, entities) => {
+    if (!isPlainObject(value)) {
+        return;
+    }
+    const schema = typeof value.schema === 'string' && value.schema ? value.schema : fallbackSchema;
+    const entityId = getEntityIdFromValue(value);
+    if (schema && entityId) {
+        entities.push({ schema, id: entityId });
+    }
+    for (const nestedValue of Object.values(value)) {
+        if (Array.isArray(nestedValue)) {
+            for (const item of nestedValue) {
+                collectQueryEntitiesFromValue(item, schema, entities);
+            }
+            continue;
+        }
+        collectQueryEntitiesFromValue(nestedValue, schema, entities);
+    }
+};
+const collectQueryEntities = (logicform, query) => {
+    const entities = [];
+    if (query) {
+        collectQueryEntitiesFromValue(query, logicform.schema, entities);
+    }
+    return entities.filter((entity, index, allEntities) => allEntities.findIndex((item) => item.schema === entity.schema && item.id === entity.id) === index);
+};
 const explainFilterLikeQuery = (query, prefix = '筛选', includeValue = false, schemas = {}) => {
     if (!query || Object.keys(query).length === 0) {
         return buildExplainResult(prefix, []);
@@ -242,7 +273,9 @@ 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, _schemas) : undefined, '筛选', true, _schemas);
+    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);
 };
 exports.explainQuery = explainQuery;
 const explainEntityID = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {
@@ -250,7 +283,9 @@ const explainEntityID = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_L
     if (!logicform.entity_id) {
         return buildExplainResult('ID', []);
     }
-    return buildExplainResult('ID', [logicform.entity_id]);
+    return buildExplainResultWithEntities('ID', [logicform.entity_id], [
+        { schema: logicform.schema, id: logicform.entity_id },
+    ]);
 };
 exports.explainEntityID = explainEntityID;
 const explainPreds = (logicform, _schemas, locale = exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) => {

package/dist/logicform/logicform.d.ts

@@ -2,6 +2,11 @@ import { RepresentationType } from '../common/representation';
 import { PropertyType } from '../schema/property';
 import { SchemaType } from '../schema/schema';
 import { QueryType } from './types/query';
+export type LogicformOutputTypeValue = 'url' | 'data' | 'export' | 'sql' | 'sqlComponents';
+export interface LogicformOutputType {
+    type: LogicformOutputTypeValue;
+    filename?: string;
+}
 export interface PredItemType {
     operator?: string;
     pred?: string | PredItemType;
@@ -35,6 +40,7 @@ export interface LogicformType {
         [key: string]: 1 | -1;
     };
     having?: QueryType;
+    output?: LogicformOutputType;
     limit?: number;
     limitBy?: number;
     skip?: number;

package/package.json

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