@cubejs-client/core 1.5.1 → 1.5.2

package/dist/cubejs-client-core.umd.js

@@ -121,25 +121,17 @@
   };
   var DateRegex = /^\d\d\d\d-\d\d-\d\d$/;
   var LocalDateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z?$/;
-  var _dayRange = function dayRange(from, to) {
-    return {
-      by: function by(value) {
-        var results = [];
-        var start = internalDayjs(from);
-        var end = internalDayjs(to);
-        while (start.startOf(value).isBefore(end) || start.isSame(end)) {
-          results.push(start);
-          start = start.add(1, value);
-        }
-        return results;
-      },
-      snapTo: function snapTo(value) {
-        return _dayRange(internalDayjs(from).startOf(value), internalDayjs(to).endOf(value));
-      },
-      start: internalDayjs(from),
-      end: internalDayjs(to)
-    };
-  };
+
+  /**
+   * Parse PostgreSQL-like interval string into object
+   * E.g. '2 years 15 months 100 weeks 99 hours 15 seconds'
+   * Negative units are also supported
+   * E.g. '-2 months 5 days -10 hours'
+   *
+   * TODO: It's copy/paste of parseSqlInterval from @cubejs-backend/shared [time.ts]
+   * It's not referenced to omit imports of moment.js staff.
+   * Probably one day we should choose one implementation and reuse it in other places.
+   */
   function parseSqlInterval(intervalStr) {
     var interval = {};
     var parts = intervalStr.split(/\s+/);
@@ -226,12 +218,67 @@
     }
     return alignedDate;
   }
+  var _dayRange = function dayRange(from, to, annotations) {
+    return {
+      by: function by(value) {
+        var results = [];
+        var start = internalDayjs(from);
+        var end = internalDayjs(to);
+        while (start.startOf(value).isBefore(end) || start.isSame(end)) {
+          results.push(start);
+          start = start.add(1, value);
+        }
+        return results;
+      },
+      snapTo: function snapTo(value) {
+        // Check if this is a custom granularity
+        if (!isPredefinedGranularity(value) && annotations) {
+          var _customGranularity;
+          // Try to find the custom granularity metadata
+          // The annotation key might be in format "Cube.dimension.granularity"
+          // So we need to search through all annotations
+          var customGranularity;
+          for (var _i = 0, _Object$keys = Object.keys(annotations); _i < _Object$keys.length; _i++) {
+            var key = _Object$keys[_i];
+            if (key.endsWith(".".concat(value)) && annotations[key].granularity) {
+              customGranularity = annotations[key].granularity;
+              break;
+            }
+          }
+          if ((_customGranularity = customGranularity) !== null && _customGranularity !== void 0 && _customGranularity.interval) {
+            // For custom granularities, calculate the range for the bucket
+            var intervalParsed = parseSqlInterval(customGranularity.interval);
+            var intervalStart = internalDayjs(from);
 
-  /**
-   * Returns the time series points for the custom interval
-   * TODO: It's almost a copy/paste of timeSeriesFromCustomInterval from
-   * @cubejs-backend/shared [time.ts] but operates with dayjs instead of moment.js
-   */
+            // origin and offset are mutually exclusive
+            // If either is specified, align to it
+            if (customGranularity.origin || customGranularity.offset) {
+              var origin;
+              if (customGranularity.origin) {
+                // Absolute origin time
+                origin = internalDayjs(customGranularity.origin);
+              } else {
+                // offset is relative to start of year
+                origin = addInterval(internalDayjs().startOf('year'), parseSqlInterval(customGranularity.offset));
+              }
+
+              // Align the value to the origin to find the actual bucket start
+              intervalStart = alignToOrigin(intervalStart, intervalParsed, origin);
+            }
+
+            // End is start + interval - 1 millisecond (to stay within the bucket)
+            var intervalEnd = addInterval(intervalStart, intervalParsed).subtract(1, 'millisecond');
+            return _dayRange(intervalStart, intervalEnd, annotations);
+          }
+        }
+
+        // Default behavior for predefined granularities
+        return _dayRange(internalDayjs(from).startOf(value), internalDayjs(to).endOf(value), annotations);
+      },
+      start: internalDayjs(from),
+      end: internalDayjs(to)
+    };
+  };
   var timeSeriesFromCustomInterval = function timeSeriesFromCustomInterval(from, to, granularity) {
     var intervalParsed = parseSqlInterval(granularity.interval);
     var start = internalDayjs(from);
@@ -741,7 +788,9 @@
           parentFilters = _this$query$filters === void 0 ? [] : _this$query$filters,
           _this$query$segments = _this$query.segments,
           segments = _this$query$segments === void 0 ? [] : _this$query$segments;
-        var measures = this.loadResponses[0].annotation.measures;
+        var _this$loadResponses$ = this.loadResponses[0].annotation,
+          measures = _this$loadResponses$.measures,
+          timeDimensionsAnnotation = _this$loadResponses$.timeDimensions;
         var _ref = values.find(function (_ref3) {
             var _ref4 = _slicedToArray__default['default'](_ref3, 1),
               member = _ref4[0];
@@ -777,7 +826,8 @@
             granularity = _member$split2[2];
           if (granularity !== undefined) {
             var _query$timeDimensions;
-            var range = _dayRange(value, value).snapTo(granularity);
+            // dayRange.snapTo now handles both predefined and custom granularities
+            var range = _dayRange(value, value, timeDimensionsAnnotation).snapTo(granularity);
             var originalTimeDimension = (_query$timeDimensions = query.timeDimensions) === null || _query$timeDimensions === void 0 ? void 0 : _query$timeDimensions.find(function (td) {
               return td.dimension;
             });
@@ -948,7 +998,7 @@
           _dateRange2 = _slicedToArray__default['default'](_dateRange, 2),
           start = _dateRange2[0],
           end = _dateRange2[1];
-        var range = _dayRange(start, end);
+        var range = _dayRange(start, end, annotations);
         if (isPredefinedGranularity(timeDimension.granularity)) {
           return TIME_SERIES[timeDimension.granularity](padToDay ? range.snapTo('d') : range);
         }
@@ -3426,10 +3476,10 @@
     isPredefinedGranularity: isPredefinedGranularity,
     DateRegex: DateRegex,
     LocalDateRegex: LocalDateRegex,
-    dayRange: _dayRange,
     parseSqlInterval: parseSqlInterval,
     addInterval: addInterval,
     subtractInterval: subtractInterval,
+    dayRange: _dayRange,
     timeSeriesFromCustomInterval: timeSeriesFromCustomInterval,
     diffTimeUnitForInterval: diffTimeUnitForInterval,
     minGranularityForIntervals: minGranularityForIntervals,