semanticdb-core 1.1.17 → 1.1.19

package/dist/logicform/logicform.d.ts

@@ -1,4 +1,5 @@
 import { RepresentationType } from '../common/representation';
+import { PropertyType } from '../schema/property';
 import { SchemaType } from '../schema/schema';
 import { QueryType } from './types/query';
 export interface PredItemType {
@@ -20,6 +21,7 @@ export interface GroupbyItemType {
     name?: string;
     schema?: SchemaType;
     order?: string[];
+    property?: Pick<PropertyType, 'type' | 'primal_type'>;
 }
 export interface LogicformType {
     schema: string;

package/dist/schema/schema.utils/getDrilldownDimensions.d.ts

@@ -1,3 +1,3 @@
 import { GroupbyItemType, LogicformType } from '../../logicform/logicform';
 import { SchemaType } from '../schema';
-export declare const getDrilldownDimensions: (schema: SchemaType, schemasDict: Record<string, SchemaType>, logicform?: LogicformType) => Promise<GroupbyItemType[]>;
+export declare const getDrilldownDimensions: (schema: SchemaType, schemasDict: Record<string, SchemaType>, logicform?: LogicformType, usage?: "drilldown" | "analyze") => Promise<GroupbyItemType[]>;

package/dist/schema/schema.utils/getDrilldownDimensions.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDrilldownDimensions = void 0;
 const logicform_utils_1 = require("../../logicform/logicform.utils");
 const moment_1 = __importDefault(require("moment"));
-const getDrilldownDimensions = (schema, schemasDict, logicform) => __awaiter(void 0, void 0, void 0, function* () {
+const getDrilldownDimensions = (schema_1, schemasDict_1, logicform_1, ...args_1) => __awaiter(void 0, [schema_1, schemasDict_1, logicform_1, ...args_1], void 0, function* (schema, schemasDict, logicform, usage = 'drilldown') {
     if (!schema)
         return []; // 如果没有schema，代表logicform result报错了
     if (logicform && schema.analyzer && schema.analyzer.drilldown) {
@@ -38,11 +38,11 @@ const getDrilldownDimensions = (schema, schemasDict, logicform) => __awaiter(voi
     let drilldownProps = [];
     // 一个递归函数
     const addToArrayWithProperty = (property, prefix, schema) => {
-        if (property.is_analyzable === false)
+        if (usage === 'analyze' && property.is_analyzable === false)
             return;
-        const pushToPropNames = (propertyName, level, prefix, schema) => {
+        const pushToPropNames = (property, level, prefix, schema) => {
             const groupbyItem = {
-                _id: prefix ? `${prefix}_${propertyName}` : propertyName,
+                _id: prefix ? `${prefix}_${property.name}` : property.name,
             };
             if (level) {
                 groupbyItem.level = level;
@@ -50,6 +50,10 @@ const getDrilldownDimensions = (schema, schemasDict, logicform) => __awaiter(voi
             if (schema) {
                 groupbyItem.schema = schema;
             }
+            groupbyItem.property = {
+                type: property.type,
+                primal_type: property.primal_type,
+            };
             drilldownProps.push(groupbyItem);
         };
         if (property.isArray)
@@ -59,7 +63,7 @@ const getDrilldownDimensions = (schema, schemasDict, logicform) => __awaiter(voi
         if (property.can_drilldown === false)
             return;
         if (property.is_categorical) {
-            pushToPropNames(property.name, undefined, prefix, schema);
+            pushToPropNames(property, undefined, prefix, schema);
         }
         else if (property.ref && schemasDict[property.ref]) {
             if (schemasDict[property.ref].drilldown) {
@@ -67,17 +71,17 @@ const getDrilldownDimensions = (schema, schemasDict, logicform) => __awaiter(voi
                     if (!h._id.startsWith('_')) {
                         property.name = h._id ? `${property.name}_${h._id}` : property.name;
                     }
-                    pushToPropNames(property.name, h.level, prefix, schema);
+                    pushToPropNames(property, h.level, prefix, schema);
                 });
                 return;
             }
             else if (schemasDict[property.ref].hierarchy) {
                 schemasDict[property.ref].hierarchy.forEach((h) => {
-                    pushToPropNames(property.name, h.name, prefix, schema);
+                    pushToPropNames(property, h.name, prefix, schema);
                 });
             }
             else {
-                pushToPropNames(property.name, undefined, prefix, schema);
+                pushToPropNames(property, undefined, prefix, schema);
             }
             // 这里要获取其他schema的属性
             if (!prefix || prefix.split('_').length < 3) {

package/package.json

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