semanticdb-core 1.0.28 → 1.0.30

package/dist/logicform/logicform.utils.d.ts

@@ -1,3 +1,4 @@
+import { SchemaType } from '../schema/schema';
 import { GroupbyItemType, LogicformType, PredItemType } from './logicform';
 import { QueryType } from './types/query';
 /**
@@ -73,3 +74,11 @@ export declare const getFlattenQuery: (query: QueryType) => QueryType;
  * ```
  */
 export declare const getValueByChain: (query: QueryType, chain: string) => any;
+/**
+ * 肯定是返回flatten的dimension
+ * @param logicform
+ */
+export declare const getDimensionsInLogicform: (logicform: LogicformType, schemasDict: Record<string, SchemaType>) => {
+    _id: string;
+    level?: string;
+}[];

package/dist/logicform/logicform.utils.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getValueByChain = exports.getFlattenQuery = exports.isDimensionInLogicform = exports.isDimensionInPred = exports.isDimensionInGroupby = exports.isDimensionInQuery = void 0;
+exports.getDimensionsInLogicform = exports.getValueByChain = exports.getFlattenQuery = exports.isDimensionInLogicform = exports.isDimensionInPred = exports.isDimensionInGroupby = exports.isDimensionInQuery = void 0;
 const date_1 = require("../common/date");
+const schema_utils_1 = require("../schema/schema.utils");
+const tws = (0, date_1.getSupportedTimeWindows)();
 /**
  * 判断一个维度是否在查询中被使用
  * @param query - 查询对象
@@ -23,7 +25,9 @@ const isDimensionInQuery = (query, dimension, strictMode = true) => {
         else if (dimension._id in flattenQuery) {
             if ((0, date_1.isStandardDateForm)(flattenQuery[dimension._id])) {
                 const minGran = (0, date_1.getMinGran)(flattenQuery[dimension._id]);
-                return minGran === dimension.level;
+                if (!minGran)
+                    return false;
+                return tws.indexOf(minGran) >= tws.indexOf(dimension.level);
             }
         }
     }
@@ -38,8 +42,22 @@ exports.isDimensionInQuery = isDimensionInQuery;
 const isDimensionInGroupby = (groupby, dimension) => {
     for (const groupbyItem of groupby) {
         if (typeof dimension === 'object') {
-            return ((groupbyItem._id === dimension._id || groupbyItem._id.startsWith(`${dimension._id}_`)) &&
-                groupbyItem.level === dimension.level);
+            // predItem check
+            if (groupbyItem._id === dimension._id || groupbyItem._id.startsWith(`${dimension._id}_`)) {
+                if (groupbyItem.level) {
+                    // level check
+                    if (tws.indexOf(groupbyItem.level) < 0) {
+                        return groupbyItem.level === dimension.level;
+                    }
+                    else {
+                        return tws.indexOf(groupbyItem.level) >= tws.indexOf(dimension.level);
+                    }
+                }
+                else {
+                    return true;
+                }
+            }
+            return false;
         }
         if (groupbyItem._id === dimension) {
             return true;
@@ -194,3 +212,28 @@ const getValueByChain = (query, chain) => {
     return undefined;
 };
 exports.getValueByChain = getValueByChain;
+/**
+ * 肯定是返回flatten的dimension
+ * @param logicform
+ */
+const getDimensionsInLogicform = (logicform, schemasDict) => {
+    const dimensions = [];
+    if (logicform.query) {
+        const flattenQuery = (0, exports.getFlattenQuery)(logicform.query);
+        for (const [k, v] of Object.entries(flattenQuery)) {
+            const property = (0, schema_utils_1.findPropertyByName)(logicform.schema, k, schemasDict);
+            if ((property === null || property === void 0 ? void 0 : property.primal_type) === 'date') {
+                const gran = (0, date_1.getMinGran)(v);
+                dimensions.push({ _id: k, level: gran || 'day' });
+            }
+            else {
+                dimensions.push({ _id: k });
+            }
+        }
+    }
+    if (logicform.groupby) {
+        dimensions.push(...logicform.groupby);
+    }
+    return dimensions;
+};
+exports.getDimensionsInLogicform = getDimensionsInLogicform;

package/package.json

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