semanticdb-core 1.1.43 → 1.1.45

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,11 @@ const buildExplainResult = (title, values) => ({
     title,
     values,
 });
+const buildExplainResultWithEntities = (title, values, entities = []) => ({
+    title,
+    values,
+    entities,
+});
 const normalizeExplainLogicformLocale = (locale) => {
     if (locale === exports.DEFAULT_EXPLAIN_LOGICFORM_LOCALE) {
         return locale;
@@ -38,6 +43,7 @@ const stringifyJson = (value) => {
     const stringified = JSON.stringify(value);
     return stringified === undefined ? String(value) : stringified;
 };
+const formatExplainKey = (key) => key.split('_').join('.');
 const isCompareOperatorObject = (value) => {
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
         return false;
@@ -175,6 +181,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, []);
@@ -182,7 +217,7 @@ const explainFilterLikeQuery = (query, prefix = '筛选', includeValue = false,
     const values = Object.entries(query)
         .filter(([k]) => includeValue || k !== 'entity_id')
         .map(([k, v]) => {
-        const key = k.split('_').pop() || '';
+        const key = formatExplainKey(k);
         if (includeValue) {
             if (k === 'entity_id') {
                 return `ID为${stringifyJson(v)}`;
@@ -241,7 +276,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) => {

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/dist/logicform/types/query.d.ts

@@ -1,6 +1,6 @@
 import { LogicformType } from '../logicform';
 import { DateValue } from './date';
-export declare type CompareOperator = '$eq' | '$gt' | '$gte' | '$lt' | '$lte' | '$ne' | '$in' | '$nin' | '$exists' | '$regex' | '$options' | '$and' | '$or';
+export declare type CompareOperator = '$eq' | '$gt' | '$gte' | '$lt' | '$lte' | '$ne' | '$in' | '$nin' | '$exists' | '$regex' | '$contains' | '$options' | '$and' | '$or';
 export declare type QueryValueType = null | string | number | boolean | DateValue | LogicformType | string[] | number[] | boolean[] | DateValue[] | LogicformType[];
 export declare type QueryValueTypeWithCompareOperator = Partial<{
     [K in CompareOperator]: QueryValueType;

package/dist/schema/property.utils.js

@@ -239,6 +239,27 @@ const formatWithNumeralSafely = (value, format) => {
     const formattedValue = (0, numeral_1.default)(value).format(format);
     return formattedValue === 'NaN' ? `${value}` : formattedValue;
 };
+const formatObjectValue = (schema, value) => {
+    var _a, _b;
+    const nameProperty = getNameProperty(schema);
+    if (Array.isArray(value)) {
+        return value
+            .map((item) => {
+            var _a, _b;
+            if (item === null || item === undefined)
+                return '';
+            if (typeof item !== 'object')
+                return `${item}`;
+            return (_b = (_a = item[nameProperty.name]) !== null && _a !== void 0 ? _a : item._id) !== null && _b !== void 0 ? _b : JSON.stringify(item);
+        })
+            .filter((item) => item !== '')
+            .join('、');
+    }
+    if (value && typeof value === 'object') {
+        return (_b = (_a = value[nameProperty.name]) !== null && _a !== void 0 ? _a : value._id) !== null && _b !== void 0 ? _b : JSON.stringify(value);
+    }
+    return `${value}`;
+};
 /**
  *
  * @param schema
@@ -256,8 +277,7 @@ const formatWithProperty = (schema, property, value, withUnit = false) => {
     const formatter = (0, exports.getFormatter)(property);
     let finalValue = `${value}`;
     if (property.type === 'object' && typeof value === 'object') {
-        const nameProperty = getNameProperty(schema);
-        finalValue = value[nameProperty.name];
+        finalValue = formatObjectValue(schema, value);
     }
     else if (property.primal_type === 'date') {
         if (formatter) {

package/package.json

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