semanticdb-core 1.0.39 → 1.0.41

package/dist/common/date.d.ts

@@ -16,4 +16,4 @@ export declare function isDateForm(dateValue: any): boolean;
  * @param {Boolean} flag 本函数是否在yoymomsplysplm.ts获得最小粒度时被调用
  * @return {String}
  */
-export declare function getMinGran(date: any, flag?: boolean): "year" | "quarter" | "month" | "week" | "day" | "hour" | "minute" | "second" | "date" | "w" | "y" | "years" | "months" | "M" | "weeks" | "days" | "d" | "hours" | "h" | "minutes" | "m" | "seconds" | "s" | "millisecond" | "milliseconds" | "ms" | "quarters" | "Q" | "isoWeek" | "isoWeeks" | "W" | "dates" | "D" | null;
+export declare function getMinGran(date: any, flag?: boolean): unitOfTime.Base | unitOfTime._quarter | unitOfTime._isoWeek | unitOfTime._date | null;

package/dist/common/date.js

@@ -127,6 +127,9 @@ function getMinGran(date, flag = false) {
     for (const tw of [...exports.grans].reverse()) {
         if (gte.isSame((0, moment_1.default)(gte).startOf(tw), 'second') &&
             lte.isSame((0, moment_1.default)(lte).endOf(tw), 'second')) {
+            if (tw === 'isoWeek') {
+                return 'week';
+            }
             return tw;
         }
     }

package/dist/logicform/logicform.utils.js

@@ -146,6 +146,7 @@ const isDimensionInLogicform = (logicform, dimension, strictMode = true) => {
                 }
             }
         }
+        // dailyavg', '$monthlyavg', '$yearlyavg', '$weeklyavg， to be deprecated
         {
             const avgPreds = logicform.preds
                 .filter((pred) => pred.operator &&
@@ -170,6 +171,18 @@ const isDimensionInLogicform = (logicform, dimension, strictMode = true) => {
                 return tws.indexOf(minTWGranInLogicform) >= tws.indexOf(dimension.level);
             }
         }
+        // by timewindow：这个可能是未来唯一的表达方式
+        {
+            const twPreds = logicform.preds.filter((pred) => pred.by && typeof pred.by === 'string' && pred.by.startsWith('$'));
+            if (twPreds.length > 0) {
+                const minTWGranInLogicform = underscore_1.default.min(twPreds, (i) => tws.indexOf(i.by.slice(1)));
+                // 如果粒度没到，那么就返回false
+                if (minTWGranInLogicform && typeof minTWGranInLogicform === 'object') {
+                    return (tws.indexOf(minTWGranInLogicform.by.slice(1)) >=
+                        tws.indexOf(dimension.level));
+                }
+            }
+        }
     }
     const dimInLFIgnoreLevel = isDimensionInLogicformIgnoreLevel(logicform, dimension, strictMode);
     if (!dimInLFIgnoreLevel)

package/package.json

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