@cubejs-backend/api-gateway 1.4.0 → 1.4.2

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 (82) hide show
  1. package/dist/src/{CubejsHandlerError.d.ts → cubejs-handler-error.d.ts} +1 -1
  2. package/dist/src/cubejs-handler-error.d.ts.map +1 -0
  3. package/dist/src/{CubejsHandlerError.js → cubejs-handler-error.js} +1 -1
  4. package/dist/src/cubejs-handler-error.js.map +1 -0
  5. package/dist/src/{dateParser.d.ts → date-parser.d.ts} +1 -1
  6. package/dist/src/date-parser.d.ts.map +1 -0
  7. package/dist/src/{dateParser.js → date-parser.js} +5 -5
  8. package/dist/src/date-parser.js.map +1 -0
  9. package/dist/src/gateway.d.ts +1 -1
  10. package/dist/src/gateway.d.ts.map +1 -1
  11. package/dist/src/gateway.js +55 -53
  12. package/dist/src/gateway.js.map +1 -1
  13. package/dist/src/helpers/{prepareAnnotation.d.ts → prepare-annotation.d.ts} +2 -2
  14. package/dist/src/helpers/prepare-annotation.d.ts.map +1 -0
  15. package/dist/src/helpers/{prepareAnnotation.js → prepare-annotation.js} +3 -3
  16. package/dist/src/helpers/prepare-annotation.js.map +1 -0
  17. package/dist/src/helpers/{toConfigMap.d.ts → to-config-map.d.ts} +1 -1
  18. package/dist/src/helpers/to-config-map.d.ts.map +1 -0
  19. package/dist/src/helpers/{toConfigMap.js → to-config-map.js} +1 -1
  20. package/dist/src/helpers/to-config-map.js.map +1 -0
  21. package/dist/src/helpers/{transformMetaExtended.d.ts → transform-meta-extended.d.ts} +1 -1
  22. package/dist/src/helpers/transform-meta-extended.d.ts.map +1 -0
  23. package/dist/src/helpers/{transformMetaExtended.js → transform-meta-extended.js} +1 -1
  24. package/dist/src/helpers/transform-meta-extended.js.map +1 -0
  25. package/dist/src/index.d.ts +4 -3
  26. package/dist/src/index.d.ts.map +1 -1
  27. package/dist/src/index.js +4 -4
  28. package/dist/src/index.js.map +1 -1
  29. package/dist/src/interfaces.d.ts +1 -1
  30. package/dist/src/interfaces.d.ts.map +1 -1
  31. package/dist/src/query.js +14 -14
  32. package/dist/src/query.js.map +1 -1
  33. package/dist/src/{requestParser.d.ts → request-parser.d.ts} +1 -1
  34. package/dist/src/request-parser.d.ts.map +1 -0
  35. package/dist/src/{requestParser.js → request-parser.js} +1 -1
  36. package/dist/src/request-parser.js.map +1 -0
  37. package/dist/src/types/responses.d.ts +1 -1
  38. package/dist/src/types/responses.d.ts.map +1 -1
  39. package/dist/src/user-error.d.ts +5 -0
  40. package/dist/src/user-error.d.ts.map +1 -0
  41. package/dist/src/{UserError.js → user-error.js} +3 -3
  42. package/dist/src/user-error.js.map +1 -0
  43. package/dist/src/ws/index.d.ts +4 -0
  44. package/dist/src/ws/index.d.ts.map +1 -0
  45. package/dist/src/ws/index.js +20 -0
  46. package/dist/src/ws/index.js.map +1 -0
  47. package/dist/src/ws/local-subscription-store.d.ts +31 -0
  48. package/dist/src/ws/local-subscription-store.d.ts.map +1 -0
  49. package/dist/src/ws/local-subscription-store.js +64 -0
  50. package/dist/src/ws/local-subscription-store.js.map +1 -0
  51. package/dist/src/ws/message-schema.d.ts +53 -0
  52. package/dist/src/ws/message-schema.d.ts.map +1 -0
  53. package/dist/src/ws/message-schema.js +59 -0
  54. package/dist/src/ws/message-schema.js.map +1 -0
  55. package/dist/src/ws/subscription-server.d.ts +25 -0
  56. package/dist/src/ws/subscription-server.d.ts.map +1 -0
  57. package/dist/src/ws/subscription-server.js +187 -0
  58. package/dist/src/ws/subscription-server.js.map +1 -0
  59. package/package.json +8 -7
  60. package/dist/src/CubejsHandlerError.d.ts.map +0 -1
  61. package/dist/src/CubejsHandlerError.js.map +0 -1
  62. package/dist/src/LocalSubscriptionStore.d.ts +0 -19
  63. package/dist/src/LocalSubscriptionStore.d.ts.map +0 -1
  64. package/dist/src/LocalSubscriptionStore.js +0 -57
  65. package/dist/src/LocalSubscriptionStore.js.map +0 -1
  66. package/dist/src/SubscriptionServer.d.ts +0 -19
  67. package/dist/src/SubscriptionServer.d.ts.map +0 -1
  68. package/dist/src/SubscriptionServer.js +0 -133
  69. package/dist/src/SubscriptionServer.js.map +0 -1
  70. package/dist/src/UserError.d.ts +0 -5
  71. package/dist/src/UserError.d.ts.map +0 -1
  72. package/dist/src/UserError.js.map +0 -1
  73. package/dist/src/dateParser.d.ts.map +0 -1
  74. package/dist/src/dateParser.js.map +0 -1
  75. package/dist/src/helpers/prepareAnnotation.d.ts.map +0 -1
  76. package/dist/src/helpers/prepareAnnotation.js.map +0 -1
  77. package/dist/src/helpers/toConfigMap.d.ts.map +0 -1
  78. package/dist/src/helpers/toConfigMap.js.map +0 -1
  79. package/dist/src/helpers/transformMetaExtended.d.ts.map +0 -1
  80. package/dist/src/helpers/transformMetaExtended.js.map +0 -1
  81. package/dist/src/requestParser.d.ts.map +0 -1
  82. package/dist/src/requestParser.js.map +0 -1
@@ -4,4 +4,4 @@ export declare class CubejsHandlerError extends Error {
4
4
  readonly originalError?: Error | undefined;
5
5
  constructor(status: number, type: string, message: string, originalError?: Error | undefined);
6
6
  }
7
- //# sourceMappingURL=CubejsHandlerError.d.ts.map
7
+ //# sourceMappingURL=cubejs-handler-error.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cubejs-handler-error.d.ts","sourceRoot":"","sources":["../../src/cubejs-handler-error.ts"],"names":[],"mappings":"AAAA,qBAAa,kBAAmB,SAAQ,KAAK;aAEzB,MAAM,EAAE,MAAM;aACd,IAAI,EAAE,MAAM;aAEZ,aAAa,CAAC;gBAHd,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EAC5B,OAAO,EAAE,MAAM,EACC,aAAa,CAAC,mBAAO;CAIxC"}
@@ -13,4 +13,4 @@ class CubejsHandlerError extends Error {
13
13
  }
14
14
  }
15
15
  exports.CubejsHandlerError = CubejsHandlerError;
16
- //# sourceMappingURL=CubejsHandlerError.js.map
16
+ //# sourceMappingURL=cubejs-handler-error.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cubejs-handler-error.js","sourceRoot":"","sources":["../../src/cubejs-handler-error.ts"],"names":[],"mappings":";;;AAAA,MAAa,kBAAmB,SAAQ,KAAK;IAEzB;IACA;IAEA;IAJlB,YACkB,MAAc,EACd,IAAY,EAC5B,OAAe,EACC,aAAqB;QAErC,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;QALP,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAQ;QAEZ,kBAAa,GAAb,aAAa,CAAQ;IAGvC,CAAC;CACF;AATD,gDASC"}
@@ -1,2 +1,2 @@
1
1
  export function dateParser(dateString: any, timezone: any, now?: Date): string[];
2
- //# sourceMappingURL=dateParser.d.ts.map
2
+ //# sourceMappingURL=date-parser.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"date-parser.d.ts","sourceRoot":"","sources":["../../src/date-parser.js"],"names":[],"mappings":"AAmBA,iFA2FC"}
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.dateParser = void 0;
7
7
  const moment_timezone_1 = __importDefault(require("moment-timezone"));
8
8
  const chrono_node_1 = require("chrono-node");
9
- const UserError_1 = require("./UserError");
9
+ const user_error_1 = require("./user-error");
10
10
  const momentFromResult = (result, timezone) => {
11
11
  const dateMoment = (0, moment_timezone_1.default)().tz(timezone);
12
12
  dateMoment.set('year', result.get('year'));
@@ -74,10 +74,10 @@ function dateParser(dateString, timezone, now = new Date()) {
74
74
  const fromResults = (0, chrono_node_1.parse)(from.trim(), new Date(current.format(moment_timezone_1.default.HTML5_FMT.DATETIME_LOCAL_MS)));
75
75
  const toResults = (0, chrono_node_1.parse)(to.trim(), new Date(current.format(moment_timezone_1.default.HTML5_FMT.DATETIME_LOCAL_MS)));
76
76
  if (!Array.isArray(fromResults) || !fromResults.length) {
77
- throw new UserError_1.UserError(`Can't parse date: '${from}'`);
77
+ throw new user_error_1.UserError(`Can't parse date: '${from}'`);
78
78
  }
79
79
  if (!Array.isArray(toResults) || !toResults.length) {
80
- throw new UserError_1.UserError(`Can't parse date: '${to}'`);
80
+ throw new user_error_1.UserError(`Can't parse date: '${to}'`);
81
81
  }
82
82
  const exactGranularity = ['second', 'minute', 'hour'].find(g => dateString.indexOf(g) !== -1) || 'day';
83
83
  momentRange = [
@@ -90,7 +90,7 @@ function dateParser(dateString, timezone, now = new Date()) {
90
90
  const current = (0, moment_timezone_1.default)(now).tz(timezone);
91
91
  const results = (0, chrono_node_1.parse)(dateString, new Date(current.format(moment_timezone_1.default.HTML5_FMT.DATETIME_LOCAL_MS)));
92
92
  if (!results?.length) {
93
- throw new UserError_1.UserError(`Can't parse date: '${dateString}'`);
93
+ throw new user_error_1.UserError(`Can't parse date: '${dateString}'`);
94
94
  }
95
95
  const exactGranularity = ['second', 'minute', 'hour'].find(g => dateString.indexOf(g) !== -1) || 'day';
96
96
  momentRange = results[0].end ? [
@@ -105,4 +105,4 @@ function dateParser(dateString, timezone, now = new Date()) {
105
105
  return momentRange.map(d => d.format(moment_timezone_1.default.HTML5_FMT.DATETIME_LOCAL_MS));
106
106
  }
107
107
  exports.dateParser = dateParser;
108
- //# sourceMappingURL=dateParser.js.map
108
+ //# sourceMappingURL=date-parser.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"date-parser.js","sourceRoot":"","sources":["../../src/date-parser.js"],"names":[],"mappings":";;;;;;AAAA,sEAAqC;AACrC,6CAAoC;AAEpC,6CAAyC;AAEzC,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;IAC5C,MAAM,UAAU,GAAG,IAAA,yBAAM,GAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IAEzC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1C,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IAEzD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,SAAgB,UAAU,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI,IAAI,EAAE;IAC/D,IAAI,WAAW,CAAC;IAChB,UAAU,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;IAEtC,IAAI,UAAU,CAAC,KAAK,CAAC,qEAAqE,CAAC,EAAE;QAC3F,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,qEAAqE,CAAC,CAAC;QACtG,IAAI,KAAK,GAAG,yBAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAChC,IAAI,GAAG,GAAG,yBAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE;YACvB,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7B;QACD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE;YACvB,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5B;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACxD,WAAW,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;KACtD;SAAM,IAAI,UAAU,CAAC,KAAK,CAAC,wEAAwE,CAAC,EAAE;QACrG,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC;QAEzG,IAAI,KAAK,GAAG,yBAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAChC,IAAI,GAAG,GAAG,yBAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE;YACvB,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACrD,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7B;QACD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE;YACvB,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7C,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SACjD;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACxD,WAAW,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;KACtD;SAAM,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACpC,WAAW,GAAG,CAAC,yBAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,yBAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;KACtF;SAAM,IAAI,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;QACxC,WAAW,GAAG;YACZ,yBAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;YACjD,yBAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;SAChD,CAAC;KACH;SAAM,IAAI,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;QACvC,WAAW,GAAG;YACZ,yBAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC;YAChD,yBAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC;SAC/C,CAAC;KACH;SAAM,IAAI,UAAU,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE;QAClD,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAClE,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACnB,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;QAEf,MAAM,OAAO,GAAG,IAAA,yBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,WAAW,GAAG,IAAA,mBAAK,EAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;QACrG,MAAM,SAAS,GAAG,IAAA,mBAAK,EAAC,EAAE,CAAC,IAAI,EAAE,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAEjG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YACtD,MAAM,IAAI,sBAAS,CAAC,sBAAsB,IAAI,GAAG,CAAC,CAAC;SACpD;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;YAClD,MAAM,IAAI,sBAAS,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;SAClD;QAED,MAAM,gBAAgB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;QACvG,WAAW,GAAG;YACZ,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC;YAChD,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC;SAC/C,CAAC;QAEF,WAAW,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;KAClG;SAAM;QACL,MAAM,OAAO,GAAG,IAAA,yBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,IAAA,mBAAK,EAAC,UAAU,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAEhG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE;YACpB,MAAM,IAAI,sBAAS,CAAC,sBAAsB,UAAU,GAAG,CAAC,CAAC;SAC1D;QAED,MAAM,gBAAgB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;QACvG,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7B,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC;YAC5C,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC;SAC3C,CAAC,CAAC,CAAC;YACF,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC;YAC5C,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC;SAC7C,CAAC;QACF,WAAW,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;KAClG;IAED,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,yBAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAC5E,CAAC;AA3FD,gCA2FC"}
@@ -8,7 +8,7 @@ import { CheckAuthInternalOptions, JWTOptions, CheckAuthFn, ContextToApiScopesFn
8
8
  import { Query, NormalizedQuery } from './types/query';
9
9
  import { UserBackgroundContext, ApiGatewayOptions } from './types/gateway';
10
10
  import { RequestLoggerMiddlewareFn, ContextRejectionMiddlewareFn, ContextAcceptorFn } from './interfaces';
11
- import { SubscriptionServer, WebSocketSendMessageFn } from './SubscriptionServer';
11
+ import { SubscriptionServer, WebSocketSendMessageFn } from './ws/subscription-server';
12
12
  import { SQLServer, SQLServerConstructorOptions } from './sql-server';
13
13
  type HandleErrorOptions = {
14
14
  e: any;
@@ -1 +1 @@
1
- {"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/gateway.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAQjC,OAAO,EAKL,SAAS,EACV,MAAM,wBAAwB,CAAC;AAMhC,OAAO,KAAK,EACV,WAAW,IAAI,kBAAkB,EACjC,mBAAmB,EAEnB,cAAc,EAEd,QAAQ,IAAI,eAAe,EAC5B,MAAM,SAAS,CAAC;AAIjB,OAAO,EACL,SAAS,EACT,SAAS,EACV,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EACL,WAAW,EACX,cAAc,EACd,sBAAsB,EACtB,OAAO,EACP,cAAc,EACd,0BAA0B,EAC1B,eAAe,EACf,gBAAgB,EAChB,YAAY,EAMZ,aAAa,EACb,oBAAoB,EACpB,YAAY,EACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,wBAAwB,EACxB,UAAU,EACV,WAAW,EACX,oBAAoB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,KAAK,EACL,eAAe,EAGhB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,yBAAyB,EACzB,4BAA4B,EAC5B,iBAAiB,EAClB,MAAM,cAAc,CAAC;AAItB,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAelF,OAAO,EAAE,SAAS,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAYtE,KAAK,kBAAkB,GAAG;IACtB,CAAC,EAAE,GAAG,CAAC;IACP,GAAG,EAAE,gBAAgB,CAAC;IACtB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,cAAc,CAAC,EAAE,IAAI,CAAA;CACxB,CAAC;AAeF,KAAK,mBAAmB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACvE,eAAe,EAAE,GAAG,CAAC;CACtB,CAAC,CAAC;AAEH,cAAM,UAAU;IAgDZ,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM;IACpC;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,GAAG,CAAC;IACrE;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,GAAG,CAAC;IACpE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,iBAAiB;IAzD/C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC;IAEzC,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,iBAAiB,CAAC,0BAA0B,CAAC,CAAC;IAE3F,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,2BAA2B,CAAC,CAAC;IAE7F,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAEpC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAC;IAEhD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAEvC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,eAAe,CAAC;IAEnD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC;IAE1C,SAAgB,WAAW,EAAE,mBAAmB,CAAC;IAEjD,SAAgB,iBAAiB,EAAE,mBAAmB,CAAC;IAEvD,SAAgB,oBAAoB,EAAE,oBAAoB,CAAC;IAE3D,SAAgB,uBAAuB,EAAE,oBAAoB,CACZ;IAEjD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,yBAAyB,CAAC;IAEtE,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,0BAA0B,CAAC;IAExE,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,4BAA4B,CAAC;IAE5E,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAM;IAExD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAEjE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;gBAGnB,SAAS,EAAE,MAAM;IACpC;;OAEG;IACgB,WAAW,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,GAAG,CAAC;IACrE;;OAEG;IACgB,UAAU,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,GAAG,CAAC,EACjD,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,iBAAiB;IA6BxC,YAAY,IAAI,SAAS;IAIhC,SAAS,CAAC,uBAAuB,CAAC,OAAO,EAAE,2BAA2B,GAAG,SAAS;IAM3E,OAAO,CAAC,GAAG,EAAE,kBAAkB;IAoVtC,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,kBAAkB;IAYjD,sBAAsB,CAAC,WAAW,EAAE,sBAAsB;IAIjE,SAAS,CAAC,QAAQ,CAAC,cAAc,KAAA;IAIjC,OAAO,CAAC,wBAAwB;IAiBnB,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB,EAAE,cAAc,EAAE,EAAE;QACrE,OAAO,EAAE,cAAc,CAAC;QACxB,GAAG,EAAE,oBAAoB,CAAC;QAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,cAAc,CAAC,EAAE,OAAO,CAAA;KACzB;IAoCY,YAAY,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAAE,OAAO,EAAE,sBAAsB,CAAC;QAAC,GAAG,EAAE,gBAAgB,CAAA;KAAE;IAsCzF,kBAAkB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,cAAc,CAAC;QAAC,GAAG,EAAE,gBAAgB,CAAA;KAAE;IA8BrJ,2BAA2B,CACtC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,OAAO,EAAE,cAAc,CAAC;QAAC,GAAG,EAAE,gBAAgB,CAAA;KAAE;IA8D5E,wBAAwB,CACnC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,OAAO,EAAE,cAAc,CAAC;QAAC,GAAG,EAAE,gBAAgB,CAAA;KAAE;IAiC5E,oBAAoB,CAC/B,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,OAAO,EAAE,cAAc,CAAC;QAAC,GAAG,EAAE,gBAAgB,CAAA;KAAE;IAmBzF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAuCG;YACW,mBAAmB;IAkDjC;;OAEG;YACW,uBAAuB;IAwCrC;;OAEG;YACW,4BAA4B;IAmC1C;;OAEG;YACW,sBAAsB;IA+FpC;;OAEG;YACW,uBAAuB;IAmCrC;;OAEG;YACW,wBAAwB;IA6BzB,yBAAyB,CACpC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAAE,OAAO,EAAE,cAAc,CAAC;QAAC,GAAG,EAAE,gBAAgB,CAAA;KAAE;IAezD,8BAA8B,CACzC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,OAAO,EAAE,cAAc,CAAC;QAAC,GAAG,EAAE,gBAAgB,CAAA;KAAE;IAgBzF;;;OAGG;cACa,oBAAoB,CAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EACvD,OAAO,EAAE,cAAc,EACvB,UAAU,UAAQ,EAClB,iBAAiB,GAAE,OAAe,EAClC,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;cA6G7C,OAAO,CAAC,EACtB,KAAK,EACL,qBAAqB,EACrB,OAAO,EACP,GAAG,GACJ,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,qBAAqB,EAAE,OAAO,CAAA;KAAC,GAAG,WAAW;IAgBnD,GAAG,CAAC,EACf,KAAK,EACL,OAAO,EACP,GAAG,EACH,aAAa,EACb,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,8BAA8B,EAC9B,qBAAqB,GACtB,EAAE,YAAY;IAkCf,OAAO,CAAC,qBAAqB;IAW7B,OAAO,CAAC,6BAA6B;IAarC,OAAO,CAAC,qBAAqB;IA6C7B,OAAO,CAAC,4BAA4B;IAapC,OAAO,CAAC,oBAAoB;IA2Bf,aAAa,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAAE,OAAO,EAAE,cAAc,CAAC;QAAC,GAAG,EAAE,gBAAgB,CAAA;KAAE;IAuB/F,SAAS,CAAC,8BAA8B,CAAC,OAAO,CAAC,EAAE,UAAU,GAAG,0BAA0B;IA8C1F,SAAS,CAAC,iBAAiB,CAAC,KAAK,KAAA,EAAE,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC;cAWpD,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,YAAY;IAiC5D;;;;OAIG;YACW,qBAAqB;IA2BnC;;;OAGG;YACW,sBAAsB;IAmDpC;;;;;OAKG;IACH,OAAO,CAAC,8BAA8B;IAMtC;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;IAiElC;;;OAGG;IACU,MAAM,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,GAAG;QACzE,aAAa,EAAE,KAAK,CAAC;QACrB,eAAe,EAAE,eAAe,CAAC;QACjC,cAAc,EAAE,OAAO,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC;KACzB,CAAC;IAsCF;;;;OAIG;IACU,IAAI,CAAC,OAAO,EAAE,YAAY;IAqH1B,UAAU,CAAC,OAAO,EAAE,aAAa;IAuIjC,SAAS,CAAC,EACrB,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,EAAE,SAAS,EAAE,OAAO,EACtE;;;;;;;;KAAA;IA4CD,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,eAAe;;;IAe5C,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,WAAW,GAAG,KAAK,GAAG,KAAK,EAAE;cAgB7D,cAAc,CAAC,OAAO,EAAE,cAAc;cAItC,aAAa,CAAC,OAAO,EAAE,cAAc;IAIxC,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,KAAA,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAa5G,SAAS,CAAC,qBAAqB,EAAE,mBAAmB,CASlD;IAEK,WAAW,CAAC,EACjB,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,cAAc,EACvC,EAAE,kBAAkB;IA0DrB,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,WAAW,GAAG,mBAAmB;IAgD7D,SAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,EAAE,wBAAwB,GAAG,mBAAmB;IAuFvH,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,mBAAmB;IA6B5E,SAAS,CAAC,uBAAuB,IAAI,mBAAmB;IAkBxD,SAAS,CAAC,0BAA0B,CAClC,OAAO,EAAE,iBAAiB,GACzB,oBAAoB;cAiCP,cAAc,CAC5B,KAAK,EAAE,SAAS,EAChB,eAAe,CAAC,EAAE,GAAG,GACpB,OAAO,CAAC,IAAI,CAAC;IAgBhB,SAAS,CAAC,oCAAoC,CAAC,GAAG,EAAE,OAAO;cAe3C,gBAAgB,CAAC,WAAW,EAAE,mBAAmB,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,KAAA;IAoC3G,SAAS,CAAC,SAAS,EAAE,cAAc,CAEjC;IAEF,SAAS,CAAC,yBAAyB,EAAE,cAAc,CAEjD;IAEF,SAAS,CAAC,wBAAwB,EAAE,cAAc,CAchD;IAEF,SAAS,CAAC,aAAa,EAAE,cAAc,CAQrC;IAEF,SAAS,CAAC,eAAe,EAAE,cAAc,CAkBvC;IAEF,SAAS,CAAC,2BAA2B,CAAC,KAAK,KAAA;IAoCpC,GAAG,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC;IAezF,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,GAAG,MAAM;IAMxE,SAAS,CAAC,0BAA0B,aAAc,MAAM,KAAG,cAAc,CAUvE;IAEF,OAAO,CAAC,aAAa;IASrB,SAAS,CAAC,SAAS,EAAE,cAAc,CAkBjC;IAEF,SAAS,CAAC,QAAQ,EAAE,cAAc,CAahC;IAEK,OAAO;CAKf;AACD,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,UAAU,GACX,CAAC"}
1
+ {"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/gateway.ts"],"names":[],"mappings":"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"}
@@ -15,18 +15,18 @@ const shared_1 = require("@cubejs-backend/shared");
15
15
  const native_1 = require("@cubejs-backend/native");
16
16
  const http_proxy_middleware_1 = require("http-proxy-middleware");
17
17
  const enums_1 = require("./types/enums");
18
- const requestParser_1 = require("./requestParser");
19
- const UserError_1 = require("./UserError");
20
- const CubejsHandlerError_1 = require("./CubejsHandlerError");
21
- const SubscriptionServer_1 = require("./SubscriptionServer");
22
- const LocalSubscriptionStore_1 = require("./LocalSubscriptionStore");
18
+ const request_parser_1 = require("./request-parser");
19
+ const user_error_1 = require("./user-error");
20
+ const cubejs_handler_error_1 = require("./cubejs-handler-error");
21
+ const subscription_server_1 = require("./ws/subscription-server");
22
+ const local_subscription_store_1 = require("./ws/local-subscription-store");
23
23
  const query_1 = require("./query");
24
24
  const cached_handler_1 = require("./cached-handler");
25
25
  const jwk_1 = require("./jwk");
26
26
  const sql_server_1 = require("./sql-server");
27
27
  const graphql_1 = require("./graphql");
28
- const prepareAnnotation_1 = require("./helpers/prepareAnnotation");
29
- const transformMetaExtended_1 = require("./helpers/transformMetaExtended");
28
+ const prepare_annotation_1 = require("./helpers/prepare-annotation");
29
+ const transform_meta_extended_1 = require("./helpers/transform-meta-extended");
30
30
  function userAsyncHandler(handler) {
31
31
  return (req, res, next) => {
32
32
  handler(req, res).catch(next);
@@ -88,7 +88,7 @@ class ApiGateway {
88
88
  this.basePath = options.basePath;
89
89
  this.playgroundAuthSecret = options.playgroundAuthSecret;
90
90
  this.queryRewrite = options.queryRewrite || (async (query) => query);
91
- this.subscriptionStore = options.subscriptionStore || new LocalSubscriptionStore_1.LocalSubscriptionStore();
91
+ this.subscriptionStore = options.subscriptionStore || new local_subscription_store_1.LocalSubscriptionStore();
92
92
  this.enforceSecurityChecks = options.enforceSecurityChecks || (process.env.NODE_ENV === 'production');
93
93
  this.extendContext = options.extendContext;
94
94
  this.checkAuthFn = this.createCheckAuthFn(options);
@@ -385,7 +385,7 @@ class ApiGateway {
385
385
  app.use(`${this.basePath}/v2`, proxyMiddleware);
386
386
  }
387
387
  initSubscriptionServer(sendMessage) {
388
- return new SubscriptionServer_1.SubscriptionServer(this, sendMessage, this.subscriptionStore, this.wsContextAcceptor);
388
+ return new subscription_server_1.SubscriptionServer(this, sendMessage, this.subscriptionStore, this.wsContextAcceptor);
389
389
  }
390
390
  duration(requestStarted) {
391
391
  return requestStarted && (new Date().getTime() - requestStarted.getTime());
@@ -452,20 +452,20 @@ class ApiGateway {
452
452
  const cubes = this.filterVisibleItemsInMeta(context, metaConfig)
453
453
  .map((meta) => meta.config)
454
454
  .map((cube) => ({
455
- ...(0, transformMetaExtended_1.transformCube)(cube, cubeDefinitions),
455
+ ...(0, transform_meta_extended_1.transformCube)(cube, cubeDefinitions),
456
456
  measures: cube.measures?.map((measure) => ({
457
- ...(0, transformMetaExtended_1.transformMeasure)(measure, cubeDefinitions),
457
+ ...(0, transform_meta_extended_1.transformMeasure)(measure, cubeDefinitions),
458
458
  })),
459
459
  dimensions: cube.dimensions?.map((dimension) => ({
460
- ...(0, transformMetaExtended_1.transformDimension)(dimension, cubeDefinitions),
460
+ ...(0, transform_meta_extended_1.transformDimension)(dimension, cubeDefinitions),
461
461
  })),
462
462
  segments: cube.segments?.map((segment) => ({
463
- ...(0, transformMetaExtended_1.transformSegment)(segment, cubeDefinitions),
463
+ ...(0, transform_meta_extended_1.transformSegment)(segment, cubeDefinitions),
464
464
  })),
465
- joins: (0, transformMetaExtended_1.transformJoins)(cubeDefinitions[cube.name]?.joins),
466
- preAggregations: (0, transformMetaExtended_1.transformPreAggregations)(cubeDefinitions[cube.name]?.preAggregations),
465
+ joins: (0, transform_meta_extended_1.transformJoins)(cubeDefinitions[cube.name]?.joins),
466
+ preAggregations: (0, transform_meta_extended_1.transformPreAggregations)(cubeDefinitions[cube.name]?.preAggregations),
467
467
  }));
468
- res({ cubes });
468
+ await res({ cubes });
469
469
  }
470
470
  catch (e) {
471
471
  this.handleError({
@@ -534,7 +534,7 @@ class ApiGateway {
534
534
  } : {}),
535
535
  })),
536
536
  });
537
- res({
537
+ await res({
538
538
  preAggregationPartitions: preAggregationPartitions.map(mergePartitionsAndVersionEntries())
539
539
  });
540
540
  }
@@ -557,7 +557,7 @@ class ApiGateway {
557
557
  });
558
558
  const { partitions } = (preAggregationPartitions?.[0] || {});
559
559
  const preAggregationPartition = partitions?.find(p => p?.tableName === versionEntry.table_name);
560
- res({
560
+ await res({
561
561
  preview: preAggregationPartition && await orchestratorApi.getPreAggregationPreview(context, preAggregationPartition)
562
562
  });
563
563
  }
@@ -573,7 +573,7 @@ class ApiGateway {
573
573
  query = (0, query_1.normalizeQueryPreAggregations)(this.parseQueryParam(query));
574
574
  const result = await this.refreshScheduler()
575
575
  .buildPreAggregations(context, query);
576
- res({ result });
576
+ await res({ result });
577
577
  }
578
578
  catch (e) {
579
579
  this.handleError({
@@ -630,17 +630,17 @@ class ApiGateway {
630
630
  try {
631
631
  await this.assertApiScope('jobs', req?.context?.securityContext);
632
632
  if (!query || Object.keys(query).length === 0) {
633
- throw new UserError_1.UserError('No job description provided');
633
+ throw new user_error_1.UserError('No job description provided');
634
634
  }
635
635
  const { error } = query_1.preAggsJobsRequestSchema.validate(query);
636
636
  if (error) {
637
- throw new UserError_1.UserError(`Invalid Job query format: ${error.message || error.toString()}`);
637
+ throw new user_error_1.UserError(`Invalid Job query format: ${error.message || error.toString()}`);
638
638
  }
639
639
  switch (query.action) {
640
640
  case 'post':
641
641
  result = await this.preAggregationsJobsPOST(context, query.selector);
642
642
  if (result.length === 0) {
643
- throw new UserError_1.UserError('A user\'s selector doesn\'t match any of the ' +
643
+ throw new user_error_1.UserError('A user\'s selector doesn\'t match any of the ' +
644
644
  'pre-aggregations defined in the data model.');
645
645
  }
646
646
  break;
@@ -672,7 +672,7 @@ class ApiGateway {
672
672
  const start = (0, shared_1.parseUtcIntoLocalDate)([{ val: selector.dateRange[0] }], 'UTC');
673
673
  const end = (0, shared_1.parseUtcIntoLocalDate)([{ val: selector.dateRange[1] }], 'UTC');
674
674
  if (!start || !end) {
675
- throw new UserError_1.UserError(`Cannot parse selector date range ${selector.dateRange}`);
675
+ throw new user_error_1.UserError(`Cannot parse selector date range ${selector.dateRange}`);
676
676
  }
677
677
  selector.dateRange = [start, end];
678
678
  }
@@ -842,7 +842,7 @@ class ApiGateway {
842
842
  const requestStarted = new Date();
843
843
  try {
844
844
  const orchestratorApi = await this.getAdapterApi(context);
845
- res({
845
+ await res({
846
846
  result: await orchestratorApi.getPreAggregationQueueStates()
847
847
  });
848
848
  }
@@ -857,7 +857,7 @@ class ApiGateway {
857
857
  try {
858
858
  const { queryKeys, dataSource } = (0, query_1.normalizeQueryCancelPreAggregations)(this.parseQueryParam(query));
859
859
  const orchestratorApi = await this.getAdapterApi(context);
860
- res({
860
+ await res({
861
861
  result: await orchestratorApi.cancelPreAggregationQueriesFromQueue(queryKeys, dataSource)
862
862
  });
863
863
  }
@@ -923,7 +923,7 @@ class ApiGateway {
923
923
  rewrittenQuery = this.parseMemberExpressionsInQuery(rewrittenQuery);
924
924
  rewrittenQuery = this.evalMemberExpressionsInQuery(rewrittenQuery);
925
925
  }
926
- return (0, query_1.normalizeQuery)(rewrittenQuery, persistent);
926
+ return (0, query_1.normalizeQuery)(rewrittenQuery, persistent, cacheMode);
927
927
  }));
928
928
  this.log({
929
929
  type: 'Query Rewrite completed',
@@ -939,10 +939,10 @@ class ApiGateway {
939
939
  if (queryType === enums_1.QueryType.BLENDING_QUERY) {
940
940
  const queryGranularity = (0, query_1.getQueryGranularity)(normalizedQueries);
941
941
  if (queryGranularity.length > 1) {
942
- throw new UserError_1.UserError('Data blending query granularities must match');
942
+ throw new user_error_1.UserError('Data blending query granularities must match');
943
943
  }
944
944
  if (queryGranularity.length === 0) {
945
- throw new UserError_1.UserError('Data blending query without granularity is not supported');
945
+ throw new user_error_1.UserError('Data blending query without granularity is not supported');
946
946
  }
947
947
  }
948
948
  return [queryType, normalizedQueries, queryNormalizationResult.map((it) => (0, query_1.remapToQueryAdapterFormat)(it.normalizedQuery))];
@@ -951,7 +951,7 @@ class ApiGateway {
951
951
  try {
952
952
  await this.assertApiScope('sql', context.securityContext);
953
953
  const result = await this.sqlServer.sql4sql(query, disablePostProcessing, context.securityContext);
954
- res({ sql: result });
954
+ await res({ sql: result });
955
955
  }
956
956
  catch (e) {
957
957
  this.handleError({
@@ -975,7 +975,7 @@ class ApiGateway {
975
975
  ...sqlQuery,
976
976
  order: ramda_1.default.fromPairs(sqlQuery.order.map(({ id: key, desc }) => [key, desc ? 'desc' : 'asc']))
977
977
  });
978
- res(queryType === enums_1.QueryType.REGULAR_QUERY ?
978
+ await res(queryType === enums_1.QueryType.REGULAR_QUERY ?
979
979
  { sql: toQuery(sqlQueries[0]) } :
980
980
  sqlQueries.map((sqlQuery) => ({ sql: toQuery(sqlQuery) })));
981
981
  }
@@ -1094,7 +1094,7 @@ class ApiGateway {
1094
1094
  const memberToDataSource = await compilerApi.memberToDataSource(query);
1095
1095
  const dataSources = new Set(Object.values(memberToDataSource));
1096
1096
  const dataSourceToSqlGenerator = (await Promise.all([...dataSources].map(async (dataSource) => ({ [dataSource]: (await compilerApi.getSqlGenerator(query, dataSource)).sqlGenerator })))).reduce((a, b) => ({ ...a, ...b }), {});
1097
- res({ memberToDataSource, dataSourceToSqlGenerator });
1097
+ await res({ memberToDataSource, dataSourceToSqlGenerator });
1098
1098
  }
1099
1099
  catch (e) {
1100
1100
  this.handleError({
@@ -1156,7 +1156,7 @@ class ApiGateway {
1156
1156
  const sqlQueries = await Promise.all(normalizedQueries.map(async (normalizedQuery) => (await this.getCompilerApi(context)).getSql(this.coerceForSqlQuery(normalizedQuery, context), {
1157
1157
  includeDebugInfo: (0, shared_1.getEnv)('devMode') || context.signedWithPlaygroundAuthSecret
1158
1158
  })));
1159
- res({
1159
+ await res({
1160
1160
  queryType,
1161
1161
  normalizedQueries,
1162
1162
  queryOrder: sqlQueries.map((sqlQuery) => ramda_1.default.fromPairs(sqlQuery.order.map(({ id: member, desc }) => [member, desc ? 'desc' : 'asc']))),
@@ -1349,7 +1349,7 @@ class ApiGateway {
1349
1349
  const [queryType, normalizedQueries] = await this.getNormalizedQueries(query, context, false, false, cacheMode);
1350
1350
  if (queryType !== enums_1.QueryType.REGULAR_QUERY &&
1351
1351
  props.queryType == null) {
1352
- throw new UserError_1.UserError(`'${queryType}' query type is not supported by the client.` +
1352
+ throw new user_error_1.UserError(`'${queryType}' query type is not supported by the client.` +
1353
1353
  'Please update the client.');
1354
1354
  }
1355
1355
  let metaConfigResult = await (await this
@@ -1363,7 +1363,7 @@ class ApiGateway {
1363
1363
  slowQuery = slowQuery ||
1364
1364
  Boolean(sqlQueries[index].slowQuery);
1365
1365
  const response = await this.getSqlResponseInternal(context, normalizedQuery, sqlQueries[index]);
1366
- const annotation = (0, prepareAnnotation_1.prepareAnnotation)(metaConfigResult, normalizedQuery);
1366
+ const annotation = (0, prepare_annotation_1.prepareAnnotation)(metaConfigResult, normalizedQuery);
1367
1367
  return this.prepareResultTransformData(context, queryType, normalizedQuery, sqlQueries[index], annotation, response, resType);
1368
1368
  }));
1369
1369
  this.log({
@@ -1381,12 +1381,12 @@ class ApiGateway {
1381
1381
  dbType: results.map(r => r.getRootResultObject()[0].dbType),
1382
1382
  }, context);
1383
1383
  if (props.queryType === 'multi') {
1384
- // We prepare the final json result on native side
1384
+ // We prepare the final JSON result on the native side
1385
1385
  const resultMulti = new native_1.ResultMultiWrapper(results, { queryType, slowQuery });
1386
1386
  await res(resultMulti);
1387
1387
  }
1388
1388
  else {
1389
- // We prepare the full final json result on native side
1389
+ // We prepare the full final JSON result on the native side
1390
1390
  await res(results[0]);
1391
1391
  }
1392
1392
  }
@@ -1450,7 +1450,7 @@ class ApiGateway {
1450
1450
  else {
1451
1451
  const adapterApi = await this.getAdapterApi(context);
1452
1452
  const response = await adapterApi.executeQuery(finalQuery);
1453
- const annotation = (0, prepareAnnotation_1.prepareAnnotation)(metaConfigResult, normalizedQueries[0]);
1453
+ const annotation = (0, prepare_annotation_1.prepareAnnotation)(metaConfigResult, normalizedQueries[0]);
1454
1454
  // TODO Can we just pass through data? Ensure hidden members can't be queried
1455
1455
  results = [{
1456
1456
  data: response.data,
@@ -1463,7 +1463,7 @@ class ApiGateway {
1463
1463
  results = await Promise.all(normalizedQueries.map(async (normalizedQuery, index) => {
1464
1464
  slowQuery = slowQuery ||
1465
1465
  Boolean(sqlQueries[index].slowQuery);
1466
- const annotation = (0, prepareAnnotation_1.prepareAnnotation)(metaConfigResult, normalizedQuery);
1466
+ const annotation = (0, prepare_annotation_1.prepareAnnotation)(metaConfigResult, normalizedQuery);
1467
1467
  if (request.streaming) {
1468
1468
  return streamResponse(sqlQueries[index]);
1469
1469
  }
@@ -1516,10 +1516,12 @@ class ApiGateway {
1516
1516
  });
1517
1517
  const state = await subscriptionState();
1518
1518
  if (result && (!state || JSON.stringify(state.result) !== JSON.stringify(result))) {
1519
- res(result.message, result.opts);
1519
+ // We prepare the full final JSON result on the native side
1520
+ await res(result.message, result.opts);
1520
1521
  }
1521
1522
  else if (error) {
1522
- res(error.message, error.opts);
1523
+ // We prepare the full final JSON result on the native side
1524
+ await res(error.message, error.opts);
1523
1525
  }
1524
1526
  await subscribe({ error, result });
1525
1527
  }
@@ -1545,14 +1547,14 @@ class ApiGateway {
1545
1547
  }
1546
1548
  parseQueryParam(query) {
1547
1549
  if (!query || query === 'undefined') {
1548
- throw new UserError_1.UserError('Query param is required');
1550
+ throw new user_error_1.UserError('Query param is required');
1549
1551
  }
1550
1552
  if (typeof query === 'string') {
1551
1553
  try {
1552
1554
  return JSON.parse(query);
1553
1555
  }
1554
1556
  catch (e) {
1555
- throw new UserError_1.UserError(`Unable to decode query param as JSON, error: ${e.message}`);
1557
+ throw new user_error_1.UserError(`Unable to decode query param as JSON, error: ${e.message}`);
1556
1558
  }
1557
1559
  }
1558
1560
  return query;
@@ -1587,7 +1589,7 @@ class ApiGateway {
1587
1589
  const requestId = (0, shared_1.getEnv)('devMode') || context?.signedWithPlaygroundAuthSecret ? context?.requestId : undefined;
1588
1590
  const stack = (0, shared_1.getEnv)('devMode') ? e.stack : undefined;
1589
1591
  const plainError = e.plainMessages;
1590
- if (e instanceof CubejsHandlerError_1.CubejsHandlerError) {
1592
+ if (e instanceof cubejs_handler_error_1.CubejsHandlerError) {
1591
1593
  this.log({
1592
1594
  type: e.type,
1593
1595
  query,
@@ -1701,14 +1703,14 @@ class ApiGateway {
1701
1703
  checkAuthFn = async (auth) => {
1702
1704
  const decoded = jsonwebtoken_1.default.decode(auth, { complete: true });
1703
1705
  if (!decoded) {
1704
- throw new CubejsHandlerError_1.CubejsHandlerError(403, 'Forbidden', 'Unable to decode JWT key');
1706
+ throw new cubejs_handler_error_1.CubejsHandlerError(403, 'Forbidden', 'Unable to decode JWT key');
1705
1707
  }
1706
1708
  if (!decoded.header || !decoded.header.kid) {
1707
- throw new CubejsHandlerError_1.CubejsHandlerError(403, 'Forbidden', 'JWT without kid inside headers');
1709
+ throw new cubejs_handler_error_1.CubejsHandlerError(403, 'Forbidden', 'JWT without kid inside headers');
1708
1710
  }
1709
1711
  const jwk = await jwks.getJWKbyKid(typeof options.jwkUrl === 'function' ? await options.jwkUrl(decoded) : options.jwkUrl, decoded.header.kid);
1710
1712
  if (!jwk) {
1711
- throw new CubejsHandlerError_1.CubejsHandlerError(403, 'Forbidden', `Unable to verify, JWK with kid: "${decoded.header.kid}" not found`);
1713
+ throw new cubejs_handler_error_1.CubejsHandlerError(403, 'Forbidden', `Unable to verify, JWK with kid: "${decoded.header.kid}" not found`);
1712
1714
  }
1713
1715
  return verifyToken(auth, jwk);
1714
1716
  };
@@ -1722,13 +1724,13 @@ class ApiGateway {
1722
1724
  }
1723
1725
  catch (e) {
1724
1726
  if (this.enforceSecurityChecks) {
1725
- throw new CubejsHandlerError_1.CubejsHandlerError(403, 'Forbidden', 'Invalid token', e);
1727
+ throw new cubejs_handler_error_1.CubejsHandlerError(403, 'Forbidden', 'Invalid token', e);
1726
1728
  }
1727
1729
  }
1728
1730
  }
1729
1731
  else if (this.enforceSecurityChecks) {
1730
1732
  // @todo Move it to 401 or 400
1731
- throw new CubejsHandlerError_1.CubejsHandlerError(403, 'Forbidden', 'Authorization header isn\'t set');
1733
+ throw new cubejs_handler_error_1.CubejsHandlerError(403, 'Forbidden', 'Authorization header isn\'t set');
1732
1734
  }
1733
1735
  return {
1734
1736
  securityContext: req.securityContext
@@ -1804,7 +1806,7 @@ class ApiGateway {
1804
1806
  const scopes = await this.contextToApiScopesFn(securityContext || {}, (0, shared_1.getEnv)('defaultApiScope') || await this.contextToApiScopesDefFn());
1805
1807
  const permited = scopes.indexOf(scope) >= 0;
1806
1808
  if (!permited) {
1807
- throw new CubejsHandlerError_1.CubejsHandlerError(403, 'Forbidden', `API scope is missing: ${scope}`);
1809
+ throw new cubejs_handler_error_1.CubejsHandlerError(403, 'Forbidden', `API scope is missing: ${scope}`);
1808
1810
  }
1809
1811
  }
1810
1812
  extractAuthorizationHeaderWithSchema(req) {
@@ -1827,7 +1829,7 @@ class ApiGateway {
1827
1829
  }
1828
1830
  }
1829
1831
  catch (e) {
1830
- if (e instanceof CubejsHandlerError_1.CubejsHandlerError) {
1832
+ if (e instanceof cubejs_handler_error_1.CubejsHandlerError) {
1831
1833
  const error = e.originalError || e;
1832
1834
  const stack = (0, shared_1.getEnv)('devMode') ? error.stack : undefined;
1833
1835
  this.log({
@@ -1860,7 +1862,7 @@ class ApiGateway {
1860
1862
  };
1861
1863
  requestContextMiddleware = async (req, res, next) => {
1862
1864
  try {
1863
- req.context = await this.contextByReq(req, req.securityContext, (0, requestParser_1.getRequestIdFromRequest)(req));
1865
+ req.context = await this.contextByReq(req, req.securityContext, (0, request_parser_1.getRequestIdFromRequest)(req));
1864
1866
  req.requestStarted = new Date();
1865
1867
  if (next) {
1866
1868
  next();
@@ -1876,7 +1878,7 @@ class ApiGateway {
1876
1878
  }
1877
1879
  };
1878
1880
  requestLogger = async (req, res, next) => {
1879
- const details = (0, requestParser_1.requestParser)(req, res);
1881
+ const details = (0, request_parser_1.requestParser)(req, res);
1880
1882
  this.log({ type: 'REST API Request', ...details }, req.context);
1881
1883
  if (next) {
1882
1884
  next();
@@ -1907,7 +1909,7 @@ class ApiGateway {
1907
1909
  (query.timeDimensions || []).forEach((td, index) => {
1908
1910
  if (td.compareDateRange != null) {
1909
1911
  if (queryCompareDateRange != null) {
1910
- throw new UserError_1.UserError('compareDateRange can only exist for one timeDimension');
1912
+ throw new user_error_1.UserError('compareDateRange can only exist for one timeDimension');
1911
1913
  }
1912
1914
  queryCompareDateRange = td.compareDateRange;
1913
1915
  compareDateRangeTDIndex = index;