semanticdb-core 1.0.29 → 1.0.31

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,8 @@
 "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)();
 /**
  * 判断一个维度是否在查询中被使用
@@ -19,7 +20,19 @@ const isDimensionInQuery = (query, dimension, strictMode = true) => {
     const flattenQuery = (0, exports.getFlattenQuery)(query);
     if (strictMode) {
         if (typeof dimension === 'string') {
-            return dimension in flattenQuery;
+            if (!(dimension in flattenQuery)) {
+                return false;
+            }
+            // 如果是单纯的$exists: true, 不认为是。
+            const v = flattenQuery[dimension];
+            if (v &&
+                typeof v === 'object' &&
+                '$exists' in v &&
+                v['$exists'] === true &&
+                Object.keys(v).length === 1) {
+                return false;
+            }
+            return true;
         }
         else if (dimension._id in flattenQuery) {
             if ((0, date_1.isStandardDateForm)(flattenQuery[dimension._id])) {
@@ -30,8 +43,16 @@ const isDimensionInQuery = (query, dimension, strictMode = true) => {
             }
         }
     }
-    for (const k of Object.keys(flattenQuery)) {
+    for (const [k, v] of Object.entries(flattenQuery)) {
         if (k.startsWith(`${dimension}_`) || k === dimension) {
+            // 如果是单纯的$exists: true, 不认为是。
+            if (v &&
+                typeof v === 'object' &&
+                '$exists' in v &&
+                v['$exists'] === true &&
+                Object.keys(v).length === 1) {
+                return false;
+            }
             return true;
         }
     }
@@ -211,3 +232,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.29",
+  "version": "1.0.31",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [