semanticdb-core 1.0.31 → 1.0.33

package/dist/common/date.js

@@ -122,11 +122,14 @@ function getMinGran(date, flag = false) {
         if (date.$options === 'DTD') {
             return 'day';
         }
+        const checkLTEValid = (lte, tw) => {
+            return (0, moment_1.default)(lte).isSame((0, moment_1.default)(lte).endOf(tw));
+        };
         for (const tw of exports.grans) {
-            if (tw && tw in date.$options) {
+            if (tw && tw in date.$options && checkLTEValid(date.$lte, tw)) {
                 return tw;
             }
-            if (tw === 'isoWeek' && 'week' in date.$options) {
+            if (tw === 'isoWeek' && 'week' in date.$options && checkLTEValid(date.$lte, tw)) {
                 return tw;
             }
         }

package/dist/logicform/logicform.utils.js

@@ -98,14 +98,8 @@ const isDimensionInPred = (predItem, dimension, strictMode = true) => {
     return predItem.pred === dimension;
 };
 exports.isDimensionInPred = isDimensionInPred;
-/**
- *
- * @param logicform
- * @param dimension
- * @param strictMode 是否严格模式，严格模式下，只有完全匹配才返回true，非严格模式下，只要包含就返回true
- * @returns
- */
-const isDimensionInLogicform = (logicform, dimension, strictMode = true) => {
+// 下面isDimensionInLogicform的帮助函数
+const isDimensionInLogicformIgnoreLevel = (logicform, dimension, strictMode = true) => {
     if ((0, exports.isDimensionInQuery)(logicform.query || {}, dimension, strictMode))
         return true;
     if (logicform.groupby && (0, exports.isDimensionInGroupby)(logicform.groupby, dimension)) {
@@ -123,6 +117,29 @@ const isDimensionInLogicform = (logicform, dimension, strictMode = true) => {
     }
     return false;
 };
+/**
+ *
+ * @param logicform
+ * @param dimension
+ * @param strictMode 是否严格模式，严格模式下，只有完全匹配才返回true，非严格模式下，只要包含就返回true
+ * @returns
+ */
+const isDimensionInLogicform = (logicform, dimension, strictMode = true) => {
+    const dimInLFIgnoreLevel = isDimensionInLogicformIgnoreLevel(logicform, dimension, strictMode);
+    if (!dimInLFIgnoreLevel)
+        return dimInLFIgnoreLevel;
+    if (typeof dimension === 'string' || !dimension.level)
+        return dimInLFIgnoreLevel;
+    if (!logicform.groupby)
+        return dimInLFIgnoreLevel;
+    // 如果在query和groupby里面都有，那么要拿联合最小粒度。
+    if (!logicform.groupby.find((gi) => gi._id === dimension._id))
+        return dimInLFIgnoreLevel;
+    if (!(0, exports.isDimensionInQuery)(logicform.query || {}, dimension, strictMode))
+        return dimInLFIgnoreLevel;
+    const dimInGroupby = (0, exports.isDimensionInGroupby)(logicform.groupby, dimension);
+    return dimInGroupby;
+};
 exports.isDimensionInLogicform = isDimensionInLogicform;
 /**
  * 将嵌套的查询对象扁平化

package/dist/schema/schema.d.ts

@@ -21,7 +21,7 @@ export interface SchemaTypeDraft {
         drilldown_blacklist?: string[];
     };
     drilldown?: GroupbyItemType[];
-    projections?: string[];
+    projections?: any[];
     etl?: any;
 }
 export interface SchemaType extends SchemaTypeDraft {

package/package.json

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