@cubejs-backend/schema-compiler 0.35.80 → 0.36.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (70) hide show
  1. package/dist/src/adapter/BaseMeasure.d.ts +2 -2
  2. package/dist/src/adapter/BaseMeasure.d.ts.map +1 -1
  3. package/dist/src/adapter/BaseMeasure.js.map +1 -1
  4. package/dist/src/adapter/BaseQuery.d.ts +54 -5
  5. package/dist/src/adapter/BaseQuery.d.ts.map +1 -1
  6. package/dist/src/adapter/BaseQuery.js +140 -7
  7. package/dist/src/adapter/BaseQuery.js.map +1 -1
  8. package/dist/src/adapter/BaseTimeDimension.d.ts +4 -1
  9. package/dist/src/adapter/BaseTimeDimension.d.ts.map +1 -1
  10. package/dist/src/adapter/BaseTimeDimension.js +35 -19
  11. package/dist/src/adapter/BaseTimeDimension.js.map +1 -1
  12. package/dist/src/adapter/BigqueryQuery.d.ts +13 -0
  13. package/dist/src/adapter/BigqueryQuery.d.ts.map +1 -1
  14. package/dist/src/adapter/BigqueryQuery.js +91 -4
  15. package/dist/src/adapter/BigqueryQuery.js.map +1 -1
  16. package/dist/src/adapter/ClickHouseQuery.d.ts +15 -5
  17. package/dist/src/adapter/ClickHouseQuery.d.ts.map +1 -1
  18. package/dist/src/adapter/ClickHouseQuery.js +30 -16
  19. package/dist/src/adapter/ClickHouseQuery.js.map +1 -1
  20. package/dist/src/adapter/CubeStoreQuery.d.ts +13 -3
  21. package/dist/src/adapter/CubeStoreQuery.d.ts.map +1 -1
  22. package/dist/src/adapter/CubeStoreQuery.js +75 -3
  23. package/dist/src/adapter/CubeStoreQuery.js.map +1 -1
  24. package/dist/src/adapter/Granularity.d.ts +32 -0
  25. package/dist/src/adapter/Granularity.d.ts.map +1 -0
  26. package/dist/src/adapter/Granularity.js +116 -0
  27. package/dist/src/adapter/Granularity.js.map +1 -0
  28. package/dist/src/adapter/MssqlQuery.d.ts +11 -5
  29. package/dist/src/adapter/MssqlQuery.d.ts.map +1 -1
  30. package/dist/src/adapter/MssqlQuery.js +30 -6
  31. package/dist/src/adapter/MssqlQuery.js.map +1 -1
  32. package/dist/src/adapter/MysqlQuery.d.ts +12 -0
  33. package/dist/src/adapter/MysqlQuery.d.ts.map +1 -1
  34. package/dist/src/adapter/MysqlQuery.js +68 -2
  35. package/dist/src/adapter/MysqlQuery.js.map +1 -1
  36. package/dist/src/adapter/PostgresQuery.d.ts +9 -2
  37. package/dist/src/adapter/PostgresQuery.d.ts.map +1 -1
  38. package/dist/src/adapter/PostgresQuery.js +13 -0
  39. package/dist/src/adapter/PostgresQuery.js.map +1 -1
  40. package/dist/src/adapter/PreAggregations.d.ts +2 -1
  41. package/dist/src/adapter/PreAggregations.d.ts.map +1 -1
  42. package/dist/src/adapter/PreAggregations.js +6 -4
  43. package/dist/src/adapter/PreAggregations.js.map +1 -1
  44. package/dist/src/adapter/SnowflakeQuery.d.ts +10 -0
  45. package/dist/src/adapter/SnowflakeQuery.d.ts.map +1 -1
  46. package/dist/src/adapter/SnowflakeQuery.js +27 -0
  47. package/dist/src/adapter/SnowflakeQuery.js.map +1 -1
  48. package/dist/src/compiler/CubeEvaluator.d.ts.map +1 -1
  49. package/dist/src/compiler/CubeEvaluator.js +5 -0
  50. package/dist/src/compiler/CubeEvaluator.js.map +1 -1
  51. package/dist/src/compiler/CubeSymbols.d.ts.map +1 -1
  52. package/dist/src/compiler/CubeSymbols.js +3 -1
  53. package/dist/src/compiler/CubeSymbols.js.map +1 -1
  54. package/dist/src/compiler/CubeValidator.d.ts.map +1 -1
  55. package/dist/src/compiler/CubeValidator.js +64 -6
  56. package/dist/src/compiler/CubeValidator.js.map +1 -1
  57. package/dist/src/compiler/YamlCompiler.d.ts.map +1 -1
  58. package/dist/src/compiler/YamlCompiler.js +10 -8
  59. package/dist/src/compiler/YamlCompiler.js.map +1 -1
  60. package/dist/src/compiler/transpilers/CubePropContextTranspiler.d.ts.map +1 -1
  61. package/dist/src/compiler/transpilers/CubePropContextTranspiler.js +1 -0
  62. package/dist/src/compiler/transpilers/CubePropContextTranspiler.js.map +1 -1
  63. package/dist/src/compiler/transpilers/ValidationTranspiler.d.ts +2 -2
  64. package/dist/src/compiler/transpilers/ValidationTranspiler.d.ts.map +1 -1
  65. package/dist/src/compiler/transpilers/ValidationTranspiler.js +1 -6
  66. package/dist/src/compiler/transpilers/ValidationTranspiler.js.map +1 -1
  67. package/dist/src/compiler/utils.d.ts.map +1 -1
  68. package/dist/src/compiler/utils.js +7 -1
  69. package/dist/src/compiler/utils.js.map +1 -1
  70. package/package.json +7 -7
@@ -8,6 +8,7 @@ const moment_timezone_1 = __importDefault(require("moment-timezone"));
8
8
  const shared_1 = require("@cubejs-backend/shared");
9
9
  const BaseFilter_1 = require("./BaseFilter");
10
10
  const UserError_1 = require("../compiler/UserError");
11
+ const Granularity_1 = require("./Granularity");
11
12
  class BaseTimeDimension extends BaseFilter_1.BaseFilter {
12
13
  constructor(query, timeDimension) {
13
14
  super(query, {
@@ -21,62 +22,73 @@ class BaseTimeDimension extends BaseFilter_1.BaseFilter {
21
22
  this.dateToValue = null;
22
23
  this.rollupGranularityValue = null;
23
24
  this.dateRange = timeDimension.dateRange;
24
- this.granularity = timeDimension.granularity;
25
+ if (timeDimension.granularity) {
26
+ this.granularityObj = new Granularity_1.Granularity(query, timeDimension);
27
+ }
25
28
  this.boundaryDateRange = timeDimension.boundaryDateRange;
26
29
  this.shiftInterval = timeDimension.shiftInterval;
27
30
  }
31
+ // TODO: find and fix all hidden references to granularity to rely on granularityObj instead?
32
+ get granularity() {
33
+ return this.granularityObj?.granularity;
34
+ }
28
35
  selectColumns() {
29
36
  const context = this.query.safeEvaluateSymbolContext();
30
- if (!context.granularityOverride && !this.granularity) {
37
+ if (!context.granularityOverride && !this.granularityObj) {
31
38
  return null;
32
39
  }
33
40
  return super.selectColumns();
34
41
  }
35
42
  hasNoRemapping() {
36
43
  const context = this.query.safeEvaluateSymbolContext();
37
- if (!context.granularityOverride && !this.granularity) {
44
+ if (!context.granularityOverride && !this.granularityObj) {
38
45
  return false;
39
46
  }
40
47
  return super.hasNoRemapping();
41
48
  }
42
49
  aliasName() {
43
50
  const context = this.query.safeEvaluateSymbolContext();
44
- if (!context.granularityOverride && !this.granularity) {
51
+ if (!context.granularityOverride && !this.granularityObj) {
45
52
  return null;
46
53
  }
47
54
  return super.aliasName();
48
55
  }
49
56
  // @ts-ignore
50
57
  unescapedAliasName(granularity) {
51
- const actualGranularity = granularity || this.granularity || 'day';
58
+ const actualGranularity = granularity || this.granularityObj?.granularity || 'day';
52
59
  return `${this.query.aliasName(this.dimension)}_${actualGranularity}`; // TODO date here for rollups
53
60
  }
54
61
  dateSeriesAliasName() {
55
62
  return this.query.escapeColumnName(`${this.dimension}_series`);
56
63
  }
57
64
  dateSeriesSelectColumn(dateSeriesAliasName) {
58
- if (!this.granularity) {
65
+ if (!this.granularityObj) {
59
66
  return null;
60
67
  }
61
68
  return `${dateSeriesAliasName || this.dateSeriesAliasName()}.${this.query.escapeColumnName('date_from')} ${this.aliasName()}`;
62
69
  }
63
70
  dimensionSql() {
64
71
  const context = this.query.safeEvaluateSymbolContext();
65
- const granularity = context.granularityOverride || this.granularity;
66
- const path = granularity ? `${this.expressionPath()}.${granularity}` : this.expressionPath();
72
+ const granularityName = context.granularityOverride || this.granularityObj?.granularity;
73
+ const path = granularityName ? `${this.expressionPath()}.${granularityName}` : this.expressionPath();
74
+ const granularity = granularityName && this.granularityObj?.granularity !== granularityName ?
75
+ new Granularity_1.Granularity(this.query, {
76
+ dimension: this.dimension,
77
+ granularity: granularityName
78
+ }) : this.granularityObj;
67
79
  if ((context.renderedReference || {})[path]) {
68
80
  return context.renderedReference[path];
69
81
  }
70
82
  if (context.rollupQuery || context.wrapQuery) {
71
- if (context.rollupGranularity === this.granularity) {
83
+ if (context.rollupGranularity === this.granularityObj?.granularity) {
72
84
  return super.dimensionSql();
73
85
  }
74
- return this.query.timeGroupedColumn(granularity, this.query.dimensionSql(this));
86
+ return this.query.dimensionTimeGroupedColumn(this.query.dimensionSql(this), granularity);
75
87
  }
76
88
  if (context.ungrouped) {
77
89
  return this.convertedToTz();
78
90
  }
79
- return this.query.timeGroupedColumn(granularity, this.convertedToTz());
91
+ return this.query.dimensionTimeGroupedColumn(this.convertedToTz(), granularity);
80
92
  }
81
93
  dimensionDefinition() {
82
94
  if (this.shiftInterval) {
@@ -155,7 +167,12 @@ class BaseTimeDimension extends BaseFilter_1.BaseFilter {
155
167
  rollupGranularity() {
156
168
  if (!this.rollupGranularityValue) {
157
169
  this.rollupGranularityValue =
158
- this.query.cacheValue(['rollupGranularity', this.granularity].concat(this.dateRange), () => this.query.minGranularity(this.granularity, this.dateRangeGranularity()));
170
+ this.query.cacheValue(['rollupGranularity', this.granularityObj?.granularity].concat(this.dateRange), () => {
171
+ if (!this.granularityObj) {
172
+ return this.dateRangeGranularity();
173
+ }
174
+ return this.query.minGranularity(this.granularityObj.minGranularity(), this.dateRangeGranularity());
175
+ });
159
176
  }
160
177
  return this.rollupGranularityValue;
161
178
  }
@@ -163,14 +180,13 @@ class BaseTimeDimension extends BaseFilter_1.BaseFilter {
163
180
  if (!this.dateRange) {
164
181
  throw new UserError_1.UserError('Time series queries without dateRange aren\'t supported');
165
182
  }
166
- if (!this.granularity) {
167
- return [
168
- [this.dateFromFormatted(), this.dateToFormatted()]
169
- ];
183
+ if (!this.granularityObj) {
184
+ return [[this.dateFromFormatted(), this.dateToFormatted()]];
170
185
  }
171
- return (0, shared_1.timeSeries)(this.granularity, [this.dateFromFormatted(), this.dateToFormatted()], {
172
- timestampPrecision: this.query.timestampPrecision(),
173
- });
186
+ return this.granularityObj.timeSeriesForInterval([this.dateFromFormatted(), this.dateToFormatted()], { timestampPrecision: this.query.timestampPrecision() });
187
+ }
188
+ resolvedGranularity() {
189
+ return this.granularityObj?.resolvedGranularity();
174
190
  }
175
191
  wildcardRange() {
176
192
  return [shared_1.FROM_PARTITION_RANGE, shared_1.TO_PARTITION_RANGE];
@@ -1 +1 @@
1
- {"version":3,"file":"BaseTimeDimension.js","sourceRoot":"","sources":["../../../src/adapter/BaseTimeDimension.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseTimeDimension.js","sourceRoot":"","sources":["../../../src/adapter/BaseTimeDimension.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAqC;AACrC,mDAKgC;AAEhC,6CAA0C;AAC1C,qDAAkD;AAGlD,+CAA4C;AAE5C,MAAa,iBAAkB,SAAQ,uBAAU;IAS/C,YACE,KAAgB,EAChB,aAAkB;QAElB,KAAK,CAAC,KAAK,EAAE;YACX,SAAS,EAAE,aAAa,CAAC,SAAS;YAClC,QAAQ,EAAE,eAAe;YACzB,MAAM,EAAE,aAAa,CAAC,SAAS;SAChC,CAAC,CAAC;QAqHK,2BAAsB,GAAe,IAAI,CAAC;QAU1C,kBAAa,GAAe,IAAI,CAAC;QAwBjC,yBAAoB,GAAe,IAAI,CAAC;QAUxC,gBAAW,GAAe,IAAI,CAAC;QAmC/B,2BAAsB,GAAe,IAAI,CAAC;QAnMlD,IAAI,CAAC,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;QACzC,IAAI,aAAa,CAAC,WAAW,EAAE;YAC7B,IAAI,CAAC,cAAc,GAAG,IAAI,yBAAW,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;SAC7D;QACD,IAAI,CAAC,iBAAiB,GAAG,aAAa,CAAC,iBAAiB,CAAC;QACzD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,aAAa,CAAC;IACnD,CAAC;IAED,6FAA6F;IAC7F,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC;IAC1C,CAAC;IAEM,aAAa;QAClB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,CAAC,mBAAmB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxD,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC,aAAa,EAAE,CAAC;IAC/B,CAAC;IAEM,cAAc;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,CAAC,mBAAmB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxD,OAAO,KAAK,CAAC;SACd;QAED,OAAO,KAAK,CAAC,cAAc,EAAE,CAAC;IAChC,CAAC;IAEM,SAAS;QACd,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,CAAC,mBAAmB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxD,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;IAC3B,CAAC;IAED,aAAa;IACN,kBAAkB,CAAC,WAAmB;QAC3C,MAAM,iBAAiB,GAAG,WAAW,IAAI,IAAI,CAAC,cAAc,EAAE,WAAW,IAAI,KAAK,CAAC;QAEnF,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC,6BAA6B;IACtG,CAAC;IAEM,mBAAmB;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,SAAS,SAAS,CAAC,CAAC;IACjE,CAAC;IAEM,sBAAsB,CAAC,mBAAmB;QAC/C,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,OAAO,IAAI,CAAC;SACb;QACD,OAAO,GAAG,mBAAmB,IAAI,IAAI,CAAC,mBAAmB,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;IAChI,CAAC;IAEM,YAAY;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC;QACvD,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,IAAI,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC;QACxF,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,eAAe,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QACrG,MAAM,WAAW,GAAG,eAAe,IAAI,IAAI,CAAC,cAAc,EAAE,WAAW,KAAK,eAAe,CAAC,CAAC;YAC3F,IAAI,yBAAW,CAAC,IAAI,CAAC,KAAK,EAAE;gBAC1B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,WAAW,EAAE,eAAe;aAC7B,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QAE3B,IAAI,CAAC,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE;YAC3C,OAAO,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;SACxC;QAED,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE;YAC5C,IAAI,OAAO,CAAC,iBAAiB,KAAK,IAAI,CAAC,cAAc,EAAE,WAAW,EAAE;gBAClE,OAAO,KAAK,CAAC,YAAY,EAAE,CAAC;aAC7B;YAED,OAAO,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAe,WAAW,CAAC,CAAC;SACvG;QAED,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;SAC7B;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,IAAI,CAAC,aAAa,EAAE,EAAe,WAAW,CAAC,CAAC;IAC/F,CAAC;IAEM,mBAAmB;QACxB,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,OAAO,EAAE,GAAG,KAAK,CAAC,mBAAmB,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC;SAC9E;QACD,OAAO,KAAK,CAAC,mBAAmB,EAAE,CAAC;IACrC,CAAC;IAEM,oCAAoC,CAAC,GAAG;QAC7C,OAAO,GAAG,EAAE,CAAC;IACf,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,CAAC;IAEM,aAAa;QAClB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC,aAAa,EAAE,CAAC;IAC/B,CAAC;IAEM,YAAY;QACjB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,OAAO,EAAE,CAAC;SACX;QACD,OAAO,KAAK,CAAC,YAAY,EAAE,CAAC;IAC9B,CAAC;IAIM,iBAAiB;QACtB,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAChC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;SACtE;QAED,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAIM,QAAQ;QACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;SACnE;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,+BAA+B,CAC9D,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CACnD,CAAC;IACJ,CAAC;IAEM,sBAAsB;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;IACpG,CAAC;IAEM,kCAAkC;QACvC,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,gCAAuB,CAAC,CAAC,CAAC;IAC/I,CAAC;IAIM,eAAe;QACpB,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC9B,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;SAClE;QAED,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACnC,CAAC;IAIM,MAAM;QACX,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/D;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEM,WAAW;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,+BAA+B,CAC9D,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CACjD,CAAC;IACJ,CAAC;IAEM,oBAAoB;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAClG,CAAC;IAEM,gCAAgC;QACrC,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,8BAAqB,CAAC,CAAC,CAAC;IAC3I,CAAC;IAEM,oBAAoB;QACzB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,OAAO,IAAI,CAAC;SACb;QACD,MAAM,MAAM,GAAG,yBAAM,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,yBAAM,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACjF,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAC9B,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,EACjC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAChC,CAAC;IACJ,CAAC;IAIM,iBAAiB;QACtB,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAChC,IAAI,CAAC,sBAAsB;gBACzB,IAAI,CAAC,KAAK,CAAC,UAAU,CACnB,CAAC,mBAAmB,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAC9E,GAAG,EAAE;oBACH,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;wBACxB,OAAO,IAAI,CAAC,oBAAoB,EAAE,CAAC;qBACpC;oBAED,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;gBACtG,CAAC,CACF,CAAC;SACL;QAED,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAEM,UAAU;QACf,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,qBAAS,CAAC,yDAAyD,CAAC,CAAC;SAChF;QAED,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,OAAO,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;SAC7D;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;IAChK,CAAC;IAEM,mBAAmB;QACxB,OAAO,IAAI,CAAC,cAAc,EAAE,mBAAmB,EAAE,CAAC;IACpD,CAAC;IAEM,aAAa;QAClB,OAAO,CAAC,6BAAoB,EAAE,2BAAkB,CAAC,CAAC;IACpD,CAAC;IAEM,0BAA0B;QAC/B,8FAA8F;QAC9F,oDAAoD;QACpD,OAAO,IAAI,CAAC,iBAAiB,IAAI;YAC/B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;SAC7C,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IAC1D,CAAC;CACF;AArQD,8CAqQC"}
@@ -7,6 +7,19 @@ export declare class BigqueryQuery extends BaseQuery {
7
7
  dateTimeCast(value: any): string;
8
8
  escapeColumnName(name: any): string;
9
9
  timeGroupedColumn(granularity: any, dimension: any): string;
10
+ /**
11
+ * Returns sql for source expression floored to timestamps aligned with
12
+ * intervals relative to origin timestamp point.
13
+ * BigQuery operates with whole intervals as is without measuring them in plain seconds.
14
+ */
15
+ dateBin(interval: string, source: string, origin: string): string;
16
+ /**
17
+ * The input interval with (possible) plural units, like "2 years", "3 months", "4 weeks", "5 days"...
18
+ * will be converted to BigQuery dialect.
19
+ * @see https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types#interval_type
20
+ * It returns a tuple of (formatted interval, timeUnit to use in datediff functions)
21
+ */
22
+ private formatInterval;
10
23
  newFilter(filter: any): any;
11
24
  dateSeriesSql(timeDimension: BaseTimeDimension): string;
12
25
  seriesSql(timeDimension: BaseTimeDimension): string;
@@ -1 +1 @@
1
- {"version":3,"file":"BigqueryQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmCxD,qBAAa,aAAc,SAAQ,SAAS;IACnC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,SAAS,CAAC,MAAM,KAAA;IAIhB,aAAa,CAAC,aAAa,EAAE,iBAAiB;IAI9C,SAAS,CAAC,aAAa,EAAE,iBAAiB;IAO1C,eAAe;IAIf,kBAAkB,IAAI,MAAM;IAI5B,oBAAoB,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,oBAAoB,KAAA,EAAE,cAAc,KAAA;IAoBvG,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI1B,yBAAyB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAIxC,oBAAoB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAInC,eAAe;IAIf,gBAAgB;IAKhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAIrD,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,gBAAgB,CAAC,OAAO,KAAA;IAIxB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,YAAY;CAwBpB"}
1
+ {"version":3,"file":"BigqueryQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmCxD,qBAAa,aAAc,SAAQ,SAAS;IACnC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAI/C;;;;OAIG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAWxE;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAmDf,SAAS,CAAC,MAAM,KAAA;IAIhB,aAAa,CAAC,aAAa,EAAE,iBAAiB;IAI9C,SAAS,CAAC,aAAa,EAAE,iBAAiB;IAO1C,eAAe;IAIf,kBAAkB,IAAI,MAAM;IAI5B,oBAAoB,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,oBAAoB,KAAA,EAAE,cAAc,KAAA;IAoBvG,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI1B,yBAAyB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAIxC,oBAAoB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAInC,eAAe;IAIf,gBAAgB;IAKhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAIrD,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,gBAAgB,CAAC,OAAO,KAAA;IAIxB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,YAAY;CAwBpB"}
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.BigqueryQuery = void 0;
4
+ const shared_1 = require("@cubejs-backend/shared");
4
5
  const BaseQuery_1 = require("./BaseQuery");
5
6
  const BaseFilter_1 = require("./BaseFilter");
6
7
  const GRANULARITY_TO_INTERVAL = {
@@ -52,6 +53,92 @@ class BigqueryQuery extends BaseQuery_1.BaseQuery {
52
53
  timeGroupedColumn(granularity, dimension) {
53
54
  return `DATETIME_TRUNC(${dimension}, ${GRANULARITY_TO_INTERVAL[granularity]})`;
54
55
  }
56
+ /**
57
+ * Returns sql for source expression floored to timestamps aligned with
58
+ * intervals relative to origin timestamp point.
59
+ * BigQuery operates with whole intervals as is without measuring them in plain seconds.
60
+ */
61
+ dateBin(interval, source, origin) {
62
+ const [intervalFormatted, timeUnit] = this.formatInterval(interval);
63
+ const beginOfTime = this.dateTimeCast('\'1970-01-01T00:00:00\'');
64
+ return `(${this.dateTimeCast(`'${origin}'`)} + INTERVAL ${intervalFormatted} *
65
+ CAST(FLOOR(
66
+ DATETIME_DIFF(${source}, ${this.dateTimeCast(`'${origin}'`)}, ${timeUnit}) /
67
+ DATETIME_DIFF(${beginOfTime} + INTERVAL ${intervalFormatted}, ${beginOfTime}, ${timeUnit})
68
+ ) AS INT64))`;
69
+ }
70
+ /**
71
+ * The input interval with (possible) plural units, like "2 years", "3 months", "4 weeks", "5 days"...
72
+ * will be converted to BigQuery dialect.
73
+ * @see https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types#interval_type
74
+ * It returns a tuple of (formatted interval, timeUnit to use in datediff functions)
75
+ */
76
+ formatInterval(interval) {
77
+ const intervalParsed = (0, shared_1.parseSqlInterval)(interval);
78
+ const intKeys = Object.keys(intervalParsed).length;
79
+ if (intervalParsed.year && intKeys === 1) {
80
+ return [`${intervalParsed.year} YEAR`, 'YEAR'];
81
+ }
82
+ else if (intervalParsed.year && intervalParsed.month && intKeys === 2) {
83
+ return [`'${intervalParsed.year}-${intervalParsed.month}' YEAR TO MONTH`, 'MONTH'];
84
+ }
85
+ else if (intervalParsed.year && intervalParsed.month && intervalParsed.day && intKeys === 3) {
86
+ return [`'${intervalParsed.year}-${intervalParsed.month} ${intervalParsed.day}' YEAR TO DAY`, 'DAY'];
87
+ }
88
+ else if (intervalParsed.year && intervalParsed.month && intervalParsed.day && intervalParsed.hour && intKeys === 4) {
89
+ return [`'${intervalParsed.year}-${intervalParsed.month} ${intervalParsed.day} ${intervalParsed.hour}' YEAR TO HOUR`, 'HOUR'];
90
+ }
91
+ else if (intervalParsed.year && intervalParsed.month && intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intKeys === 5) {
92
+ return [`'${intervalParsed.year}-${intervalParsed.month} ${intervalParsed.day} ${intervalParsed.hour}:${intervalParsed.minute}' YEAR TO MINUTE`, 'MINUTE'];
93
+ }
94
+ else if (intervalParsed.year && intervalParsed.month && intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 6) {
95
+ return [`'${intervalParsed.year}-${intervalParsed.month} ${intervalParsed.day} ${intervalParsed.hour}:${intervalParsed.minute}:${intervalParsed.second}' YEAR TO SECOND`, 'SECOND'];
96
+ }
97
+ else if (intervalParsed.quarter && intKeys === 1) {
98
+ return [`${intervalParsed.quarter} QUARTER`, 'QUARTER'];
99
+ }
100
+ else if (intervalParsed.month && intKeys === 1) {
101
+ return [`${intervalParsed.month} MONTH`, 'MONTH'];
102
+ }
103
+ else if (intervalParsed.month && intervalParsed.day && intKeys === 2) {
104
+ return [`'${intervalParsed.month} ${intervalParsed.day}' MONTH TO DAY`, 'DAY'];
105
+ }
106
+ else if (intervalParsed.month && intervalParsed.day && intervalParsed.hour && intKeys === 3) {
107
+ return [`'${intervalParsed.month} ${intervalParsed.day} ${intervalParsed.hour}' MONTH TO HOUR`, 'HOUR'];
108
+ }
109
+ else if (intervalParsed.month && intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intKeys === 4) {
110
+ return [`'${intervalParsed.month} ${intervalParsed.day} ${intervalParsed.hour}:${intervalParsed.minute}' MONTH TO MINUTE`, 'MINUTE'];
111
+ }
112
+ else if (intervalParsed.month && intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 5) {
113
+ return [`'${intervalParsed.month} ${intervalParsed.day} ${intervalParsed.hour}:${intervalParsed.minute}:${intervalParsed.second}' MONTH TO SECOND`, 'SECOND'];
114
+ }
115
+ else if (intervalParsed.week && intKeys === 1) {
116
+ return [`${intervalParsed.week} WEEK`, 'DAY'];
117
+ }
118
+ else if (intervalParsed.day && intKeys === 1) {
119
+ return [`${intervalParsed.day} DAY`, 'DAY'];
120
+ }
121
+ else if (intervalParsed.day && intervalParsed.hour && intKeys === 2) {
122
+ return [`'${intervalParsed.day} ${intervalParsed.hour}' DAY TO HOUR`, 'HOUR'];
123
+ }
124
+ else if (intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intKeys === 3) {
125
+ return [`'${intervalParsed.day} ${intervalParsed.hour}:${intervalParsed.minute}' DAY TO MINUTE`, 'MINUTE'];
126
+ }
127
+ else if (intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 4) {
128
+ return [`'${intervalParsed.day} ${intervalParsed.hour}:${intervalParsed.minute}:${intervalParsed.second}' DAY TO SECOND`, 'SECOND'];
129
+ }
130
+ else if (intervalParsed.hour && intervalParsed.minute && intKeys === 2) {
131
+ return [`'${intervalParsed.hour}:${intervalParsed.minute}' HOUR TO MINUTE`, 'MINUTE'];
132
+ }
133
+ else if (intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 3) {
134
+ return [`'${intervalParsed.hour}:${intervalParsed.minute}:${intervalParsed.second}' HOUR TO SECOND`, 'SECOND'];
135
+ }
136
+ else if (intervalParsed.minute && intervalParsed.second && intKeys === 2) {
137
+ return [`'${intervalParsed.minute}:${intervalParsed.second}' MINUTE TO SECOND`, 'SECOND'];
138
+ }
139
+ // No need to support microseconds.
140
+ throw new Error(`Cannot transform interval expression "${interval}" to BigQuery dialect`);
141
+ }
55
142
  newFilter(filter) {
56
143
  return new BigqueryFilter(this, filter);
57
144
  }
@@ -86,16 +173,16 @@ class BigqueryQuery extends BaseQuery_1.BaseQuery {
86
173
  `;
87
174
  }
88
175
  subtractInterval(date, interval) {
89
- return `DATETIME_SUB(${date}, INTERVAL ${interval})`;
176
+ return `DATETIME_SUB(${date}, INTERVAL ${this.formatInterval(interval)[0]})`;
90
177
  }
91
178
  addInterval(date, interval) {
92
- return `DATETIME_ADD(${date}, INTERVAL ${interval})`;
179
+ return `DATETIME_ADD(${date}, INTERVAL ${this.formatInterval(interval)[0]})`;
93
180
  }
94
181
  subtractTimestampInterval(date, interval) {
95
- return `TIMESTAMP_SUB(${date}, INTERVAL ${interval})`;
182
+ return `TIMESTAMP_SUB(${date}, INTERVAL ${this.formatInterval(interval)[0]})`;
96
183
  }
97
184
  addTimestampInterval(date, interval) {
98
- return `TIMESTAMP_ADD(${date}, INTERVAL ${interval})`;
185
+ return `TIMESTAMP_ADD(${date}, INTERVAL ${this.formatInterval(interval)[0]})`;
99
186
  }
100
187
  nowTimestampSql() {
101
188
  return 'CURRENT_TIMESTAMP()';
@@ -1 +1 @@
1
- {"version":3,"file":"BigqueryQuery.js","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,6CAA0C;AAG1C,MAAM,uBAAuB,GAAG;IAC9B,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,MAAM;CACb,CAAC;AAEF,MAAM,cAAe,SAAQ,uBAAU;IAC9B,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI;QAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,SAAS,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,YAAY,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;IAClH,CAAC;IAEM,aAAa;QAClB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,KAAK,SAAS,EAAE;YACxC,OAAO,iBAAiB,CAAC;SAC1B;aAAM,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC9D,mDAAmD;YACnD,OAAO,oBAAoB,CAAC;SAC7B;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,YAAY,CAAC,GAAG;QACrB,OAAO,QAAQ,GAAG,aAAa,CAAC;IAClC,CAAC;CACF;AAED,MAAa,aAAc,SAAQ,qBAAS;IACnC,YAAY,CAAC,GAAG;QACrB,OAAO,QAAQ,GAAG,aAAa,CAAC;IAClC,CAAC;IAEM,SAAS,CAAC,KAAK;QACpB,OAAO,YAAY,KAAK,MAAM,IAAI,CAAC,QAAQ,IAAI,CAAC;IAClD,CAAC;IAEM,aAAa,CAAC,KAAK;QACxB,OAAO,aAAa,KAAK,GAAG,CAAC;IAC/B,CAAC;IAEM,YAAY,CAAC,KAAK;QACvB,OAAO,sBAAsB,KAAK,IAAI,CAAC;IACzC,CAAC;IAEM,gBAAgB,CAAC,IAAI;QAC1B,OAAO,KAAK,IAAI,IAAI,CAAC;IACvB,CAAC;IAEM,iBAAiB,CAAC,WAAW,EAAE,SAAS;QAC7C,OAAO,kBAAkB,SAAS,KAAK,uBAAuB,CAAC,WAAW,CAAC,GAAG,CAAC;IACjF,CAAC;IAEM,SAAS,CAAC,MAAM;QACrB,OAAO,IAAI,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAEM,aAAa,CAAC,aAAgC;QACnD,OAAO,GAAG,aAAa,CAAC,mBAAmB,EAAE,QAAQ,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC;IACxF,CAAC;IAEM,SAAS,CAAC,aAAgC;QAC/C,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC,GAAG,CAC3C,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,WAAW,IAAI,SAAS,EAAE,KAAK,CAChD,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtB,OAAO,UAAU,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,kBAAkB,MAAM,YAAY,CAAC;IAC/H,CAAC;IAEM,eAAe;QACpB,OAAO,iCAAiC,CAAC;IAC3C,CAAC;IAEM,kBAAkB;QACvB,OAAO,CAAC,CAAC;IACX,CAAC;IAEM,oBAAoB,CAAC,kBAAkB,EAAE,aAAa,EAAE,SAAS,EAAE,oBAAoB,EAAE,cAAc;QAC5G,MAAM,SAAS,GAAG,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;QACnE,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC/C,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3F,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CACtG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CACnE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvG,OAAO;WACA,aAAa,WAAW,gBAAgB;MAC7C,eAAe,IAAI,gBAAgB;;eAE1B,SAAS,SAAS,eAAe;oBAC5B,SAAS,QAAQ,cAAc,OAAO,oBAAoB;QACtE,IAAI,CAAC,aAAa,EAAE;WACjB,SAAS,OAAO,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,MAAM,SAAS,IAAI,kBAAkB;KACjH,CAAC;IACJ,CAAC;IAEM,gBAAgB,CAAC,IAAI,EAAE,QAAQ;QACpC,OAAO,gBAAgB,IAAI,cAAc,QAAQ,GAAG,CAAC;IACvD,CAAC;IAEM,WAAW,CAAC,IAAI,EAAE,QAAQ;QAC/B,OAAO,gBAAgB,IAAI,cAAc,QAAQ,GAAG,CAAC;IACvD,CAAC;IAEM,yBAAyB,CAAC,IAAI,EAAE,QAAQ;QAC7C,OAAO,iBAAiB,IAAI,cAAc,QAAQ,GAAG,CAAC;IACxD,CAAC;IAEM,oBAAoB,CAAC,IAAI,EAAE,QAAQ;QACxC,OAAO,iBAAiB,IAAI,cAAc,QAAQ,GAAG,CAAC;IACxD,CAAC;IAEM,eAAe;QACpB,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAEM,gBAAgB;QACrB,OAAO,gBAAgB,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC;IACnD,CAAC;IAED,0CAA0C;IACnC,qBAAqB,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS;QAC1D,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACtD,CAAC;IAEM,OAAO,CAAC,GAAG;QAChB,OAAO,kBAAkB,GAAG,GAAG,CAAC;IAClC,CAAC;IAEM,QAAQ,CAAC,GAAG;QACjB,OAAO,mBAAmB,GAAG,GAAG,CAAC;IACnC,CAAC;IAEM,mBAAmB,CAAC,GAAG;QAC5B,OAAO,yBAAyB,GAAG,GAAG,CAAC;IACzC,CAAC;IAEM,gBAAgB,CAAC,OAAO;QAC7B,OAAO,UAAU,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IACzC,CAAC;IAEM,iCAAiC;QACtC,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,sBAAsB;QAC3B,OAAO;YACL,KAAK,EAAE,WAAW;SACnB,CAAC;IACJ,CAAC;IAEM,YAAY;QACjB,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;QACvC,SAAS,CAAC,MAAM,CAAC,WAAW,GAAG,GAAG,CAAC;QACnC,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;QAChC,SAAS,CAAC,SAAS,CAAC,SAAS,GAAG,kEAAkE,CAAC;QACnG,SAAS,CAAC,SAAS,CAAC,GAAG,GAAG,oEAAoE,CAAC;QAC/F,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,yBAAyB,CAAC;QACtD,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,2BAA2B,CAAC;QACzD,SAAS,CAAC,SAAS,CAAC,QAAQ,GAAG,kGAAkG,CAAC;QAClI,yCAAyC;QACzC,2HAA2H;QAC3H,SAAS,CAAC,SAAS,CAAC,WAAW,GAAG,cAAc,CAAC;QACjD,OAAO,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;QACnC,SAAS,CAAC,WAAW,CAAC,MAAM,GAAG,wGAAwG,CAAC;QACxI,SAAS,CAAC,WAAW,CAAC,QAAQ,GAAG,yBAAyB,CAAC;QAC3D,SAAS,CAAC,WAAW,CAAC,OAAO,GAAG,6IAA6I,CAAC;QAC9K,SAAS,CAAC,WAAW,CAAC,iBAAiB,GAAG,4BAA4B,CAAC;QACvE,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;QACjC,SAAS,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC;QAClC,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC;QACnC,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,yCAAyC,CAAC;QACpE,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAnJD,sCAmJC"}
1
+ {"version":3,"file":"BigqueryQuery.js","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":"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"}
@@ -5,11 +5,21 @@ export declare class ClickHouseQuery extends BaseQuery {
5
5
  escapeColumnName(name: any): string;
6
6
  convertTz(field: any): string;
7
7
  timeGroupedColumn(granularity: any, dimension: any): string;
8
- calcInterval(operation: any, date: any, interval: any): string;
9
- subtractInterval(date: any, interval: any): string;
10
- addInterval(date: any, interval: any): string;
11
- timeStampCast(value: any): string;
12
- dateTimeCast(value: any): string;
8
+ /**
9
+ * Returns sql for source expression floored to timestamps aligned with
10
+ * intervals relative to origin timestamp point.
11
+ */
12
+ dateBin(interval: string, source: string, origin: string): string;
13
+ subtractInterval(date: string, interval: string): string;
14
+ addInterval(date: string, interval: string): string;
15
+ /**
16
+ * The input interval with (possible) plural units, like "2 years", "3 months", "4 weeks", "5 days"...
17
+ * will be converted to ClickHouse form of sum of single intervals.
18
+ * @see https://clickhouse.com/docs/en/sql-reference/data-types/special-data-types/interval
19
+ */
20
+ private formatInterval;
21
+ timeStampCast(value: string): string;
22
+ dateTimeCast(value: string): string;
13
23
  dimensionsJoinCondition(leftAlias: any, rightAlias: any): string;
14
24
  getFieldAlias(id: any): any;
15
25
  orderHashToString(hash: any): string | null;
@@ -1 +1 @@
1
- {"version":3,"file":"ClickHouseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA4BxD,qBAAa,eAAgB,SAAQ,SAAS;IACrC,SAAS,CAAC,MAAM,KAAA;IAIhB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,KAAK,KAAA;IAWf,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAYxC,YAAY,CAAC,SAAS,KAAA,EAAE,IAAI,KAAA,EAAE,QAAQ,KAAA;IAOtC,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI1B,aAAa,CAAC,KAAK,KAAA;IAWnB,YAAY,CAAC,KAAK,KAAA;IAWlB,uBAAuB,CAAC,SAAS,KAAA,EAAE,UAAU,KAAA;IAU7C,aAAa,CAAC,EAAE,KAAA;IA0BhB,iBAAiB,CAAC,IAAI,KAAA;IAmBtB,aAAa;IAYb,eAAe,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA;IAYlC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,aAAa,EAAE,iBAAiB;IA2C1C,gBAAgB,CAAC,OAAO,KAAA;IAKxB,gBAAgB;IAIhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAUrD,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC,cAAc,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA;IAInD,YAAY;CAgBpB"}
1
+ {"version":3,"file":"ClickHouseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA4BxD,qBAAa,eAAgB,SAAQ,SAAS;IACrC,SAAS,CAAC,MAAM,KAAA;IAIhB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,KAAK,KAAA;IAWf,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAY/C;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAcjE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI1D;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAQf,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIpC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAQnC,uBAAuB,CAAC,SAAS,KAAA,EAAE,UAAU,KAAA;IAU7C,aAAa,CAAC,EAAE,KAAA;IA0BhB,iBAAiB,CAAC,IAAI,KAAA;IAmBtB,aAAa;IAYb,eAAe,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA;IAYlC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,aAAa,EAAE,iBAAiB;IA2C1C,gBAAgB,CAAC,OAAO,KAAA;IAKxB,gBAAgB;IAIhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAUrD,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC,cAAc,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA;IAInD,YAAY;CAgBpB"}
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ClickHouseQuery = void 0;
4
+ const shared_1 = require("@cubejs-backend/shared");
4
5
  const BaseQuery_1 = require("./BaseQuery");
5
6
  const BaseFilter_1 = require("./BaseFilter");
6
7
  const UserError_1 = require("../compiler/UserError");
@@ -56,32 +57,45 @@ class ClickHouseQuery extends BaseQuery_1.BaseQuery {
56
57
  return `toDateTime64(${internalConversion}, 0, '${this.timezone}')`;
57
58
  }
58
59
  }
59
- calcInterval(operation, date, interval) {
60
- const [intervalValue, intervalUnit] = interval.split(' ');
61
- // eslint-disable-next-line prefer-template
62
- const fn = operation + intervalUnit[0].toUpperCase() + intervalUnit.substring(1) + 's';
63
- return `${fn}(${date}, ${intervalValue})`;
60
+ /**
61
+ * Returns sql for source expression floored to timestamps aligned with
62
+ * intervals relative to origin timestamp point.
63
+ */
64
+ dateBin(interval, source, origin) {
65
+ const intervalFormatted = this.formatInterval(interval);
66
+ const timeUnit = this.diffTimeUnitForInterval(interval);
67
+ const beginOfTime = 'fromUnixTimestamp(0)';
68
+ return `date_add(${timeUnit},
69
+ FLOOR(
70
+ date_diff(${timeUnit}, ${this.timeStampCast(`'${origin}'`)}, ${source}) /
71
+ date_diff(${timeUnit}, ${beginOfTime}, ${beginOfTime} + ${intervalFormatted})
72
+ ) * date_diff(${timeUnit}, ${beginOfTime}, ${beginOfTime} + ${intervalFormatted}),
73
+ ${this.timeStampCast(`'${origin}'`)}
74
+ )`;
64
75
  }
65
76
  subtractInterval(date, interval) {
66
- return this.calcInterval('subtract', date, interval);
77
+ return `subDate(${date}, ${this.formatInterval(interval)})`;
67
78
  }
68
79
  addInterval(date, interval) {
69
- return this.calcInterval('add', date, interval);
80
+ return `addDate(${date}, ${this.formatInterval(interval)})`;
81
+ }
82
+ /**
83
+ * The input interval with (possible) plural units, like "2 years", "3 months", "4 weeks", "5 days"...
84
+ * will be converted to ClickHouse form of sum of single intervals.
85
+ * @see https://clickhouse.com/docs/en/sql-reference/data-types/special-data-types/interval
86
+ */
87
+ formatInterval(interval) {
88
+ const intervalParsed = (0, shared_1.parseSqlInterval)(interval);
89
+ return Object.entries(intervalParsed)
90
+ .map(([key, value]) => `INTERVAL ${value} ${key.toUpperCase()}`)
91
+ .join(' + ');
70
92
  }
71
93
  timeStampCast(value) {
72
- // value yields a string formatted in ISO8601, so this function returns a expression to parse a string to a DateTime
73
- //
74
- // ClickHouse provides toDateTime which expects dates in UTC in format YYYY-MM-DD HH:MM:SS
75
- //
76
- // However parseDateTimeBestEffort works with ISO8601
77
- //
78
- return `parseDateTimeBestEffort(${value})`;
94
+ return this.dateTimeCast(value);
79
95
  }
80
96
  dateTimeCast(value) {
81
97
  // value yields a string formatted in ISO8601, so this function returns a expression to parse a string to a DateTime
82
- //
83
98
  // ClickHouse provides toDateTime which expects dates in UTC in format YYYY-MM-DD HH:MM:SS
84
- //
85
99
  // However parseDateTimeBestEffort works with ISO8601
86
100
  //
87
101
  return `parseDateTimeBestEffort(${value})`;
@@ -1 +1 @@
1
- {"version":3,"file":"ClickHouseQuery.js","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ClickHouseQuery.js","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"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"}
@@ -12,9 +12,19 @@ export declare class CubeStoreQuery extends BaseQuery {
12
12
  timeStampCast(value: any): string;
13
13
  timestampFormat(): string;
14
14
  dateTimeCast(value: any): string;
15
- subtractInterval(date: any, interval: any): string;
16
- addInterval(date: any, interval: any): string;
17
- timeGroupedColumn(granularity: any, dimension: any): string;
15
+ subtractInterval(date: string, interval: string): string;
16
+ addInterval(date: string, interval: string): string;
17
+ timeGroupedColumn(granularity: string, dimension: string): string;
18
+ /**
19
+ * Returns sql for source expression floored to timestamps aligned with
20
+ * intervals relative to origin timestamp point.
21
+ */
22
+ dateBin(interval: string, source: string, origin: string): string;
23
+ /**
24
+ * The input interval with (possible) plural units, like "2 years", "3 months", "4 weeks", "5 days"...
25
+ * will be converted to CubeStore (DataFusion) dialect.
26
+ */
27
+ private formatInterval;
18
28
  escapeColumnName(name: any): string;
19
29
  seriesSql(timeDimension: any): any;
20
30
  concatStringsSql(strings: any): string;
@@ -1 +1 @@
1
- {"version":3,"file":"CubeStoreQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/CubeStoreQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAqB5C,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;CAC1B,CAAC;AAEF,qBAAa,cAAe,SAAQ,SAAS;IACpC,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,cAAc;IAId,aAAa,CAAC,KAAK,KAAA;IAInB,eAAe;IAIf,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI1B,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,aAAa,KAAA;IAOvB,gBAAgB,CAAC,OAAO,KAAA;IAIxB,gBAAgB;IAIhB,6BAA6B,CAAC,GAAG,KAAA;IAIjC,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,cAAc,CAAC,GAAG,KAAA;IAIlB,YAAY,CAAC,GAAG,KAAA;IAIhB,mBAAmB,CAAC,GAAG,KAAA;IAKvB,+BAA+B,CACpC,eAAe,EAAE,WAAW,EAAE,EAC9B,kBAAkB,EAAE,WAAW,EAAE,EACjC,kBAAkB,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,EACjD,sBAAsB,EAAE,GAAG;IA6CtB,0BAA0B,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA,EAAE,aAAa,KAAA,EAAE,sBAAsB,KAAA;IAW9H,UAAU,CAAC,QAAQ,KAAA;IAQnB,gBAAgB,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;IAyCnE,6BAA6B,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,aAAa,KAAA,EAAE,sBAAsB,KAAA;CA8C9G"}
1
+ {"version":3,"file":"CubeStoreQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/CubeStoreQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAqB5C,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;CAC1B,CAAC;AAEF,qBAAa,cAAe,SAAQ,SAAS;IACpC,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,cAAc;IAId,aAAa,CAAC,KAAK,KAAA;IAInB,eAAe;IAIf,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAI/C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAI1C,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAI/D;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAIxE;;;OAGG;IACH,OAAO,CAAC,cAAc;IA+Cf,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,aAAa,KAAA;IAOvB,gBAAgB,CAAC,OAAO,KAAA;IAIxB,gBAAgB;IAIhB,6BAA6B,CAAC,GAAG,KAAA;IAIjC,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,cAAc,CAAC,GAAG,KAAA;IAIlB,YAAY,CAAC,GAAG,KAAA;IAIhB,mBAAmB,CAAC,GAAG,KAAA;IAKvB,+BAA+B,CACpC,eAAe,EAAE,WAAW,EAAE,EAC9B,kBAAkB,EAAE,WAAW,EAAE,EACjC,kBAAkB,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,EACjD,sBAAsB,EAAE,GAAG;IA6CtB,0BAA0B,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA,EAAE,aAAa,KAAA,EAAE,sBAAsB,KAAA;IAW9H,UAAU,CAAC,QAAQ,KAAA;IAQnB,gBAAgB,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;IAyCnE,6BAA6B,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,aAAa,KAAA,EAAE,sBAAsB,KAAA;CA8C9G"}