@cubejs-backend/server-core 0.30.30 → 0.30.33

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 (19) hide show
  1. package/CHANGELOG.md +30 -0
  2. package/dist/src/core/DevServer.d.ts.map +1 -1
  3. package/dist/src/core/DevServer.js +9 -0
  4. package/dist/src/core/DevServer.js.map +1 -1
  5. package/dist/src/core/OptsHandler.d.ts +5 -0
  6. package/dist/src/core/OptsHandler.d.ts.map +1 -1
  7. package/dist/src/core/OptsHandler.js +69 -20
  8. package/dist/src/core/OptsHandler.js.map +1 -1
  9. package/package.json +4 -4
  10. package/playground/asset-manifest.json +10 -10
  11. package/playground/index.html +1 -1
  12. package/playground/static/js/11.3740081b.chunk.js +2 -0
  13. package/playground/static/js/{11.3972813f.chunk.js.LICENSE.txt → 11.3740081b.chunk.js.LICENSE.txt} +8 -0
  14. package/playground/static/js/{12.40c39d00.chunk.js → 12.389644bb.chunk.js} +2 -2
  15. package/playground/static/js/{12.40c39d00.chunk.js.LICENSE.txt → 12.389644bb.chunk.js.LICENSE.txt} +0 -0
  16. package/playground/static/js/{19.b17c127a.chunk.js → 19.3419f27c.chunk.js} +1 -1
  17. package/playground/static/js/{main.15367b8b.chunk.js → main.8e63e9b2.chunk.js} +1 -1
  18. package/playground/static/js/{runtime-main.38a4f12f.js → runtime-main.7118c4c3.js} +1 -1
  19. package/playground/static/js/11.3972813f.chunk.js +0 -2
package/CHANGELOG.md CHANGED
@@ -3,6 +3,36 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [0.30.33](https://github.com/cube-js/cube.js/compare/v0.30.32...v0.30.33) (2022-07-07)
7
+
8
+
9
+ ### Bug Fixes
10
+
11
+ * **server-core:** original dbType behavior restored ([#4874](https://github.com/cube-js/cube.js/issues/4874)) ([e4231e0](https://github.com/cube-js/cube.js/commit/e4231e0c43d8057a2e100b616ea22a09dca6ee0d))
12
+
13
+
14
+
15
+
16
+
17
+ ## [0.30.32](https://github.com/cube-js/cube.js/compare/v0.30.31...v0.30.32) (2022-07-07)
18
+
19
+ **Note:** Version bump only for package @cubejs-backend/server-core
20
+
21
+
22
+
23
+
24
+
25
+ ## [0.30.31](https://github.com/cube-js/cube.js/compare/v0.30.30...v0.30.31) (2022-07-07)
26
+
27
+
28
+ ### Bug Fixes
29
+
30
+ * **server-core:** dbType assertion ([237f920](https://github.com/cube-js/cube.js/commit/237f92013ec4d8ed34f958018fb85ae8e5b41600))
31
+
32
+
33
+
34
+
35
+
6
36
  ## [0.30.30](https://github.com/cube-js/cube.js/compare/v0.30.29...v0.30.30) (2022-07-05)
7
37
 
8
38
 
package/dist/src/core/DevServer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DevServer.d.ts","sourceRoot":"","sources":["../../../src/core/DevServer.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,KAAK,EAAE,WAAW,IAAI,kBAAkB,EAAqB,MAAM,SAAS,CAAC;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAMlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAC;AAQzE,aAAK,gBAAgB,GAAG;IACtB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,yBAAyB,EAAE,MAAM,OAAO,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,qBAAa,SAAS;IAQlB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,gBAAgB;IACjD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB;IAR9C,SAAS,CAAC,4BAA4B,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAEnE,SAAS,CAAC,mBAAmB,EAAE,YAAY,GAAG;QAAE,mBAAmB,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,GAAG,IAAI,CAAQ;IAEnG,SAAS,CAAC,kBAAkB,qBAA4B;gBAGnC,YAAY,EAAE,gBAAgB,EAC9B,OAAO,EAAE,gBAAgB;IAIvC,UAAU,CAAC,GAAG,EAAE,kBAAkB,EAAE,OAAO,EAAE,4BAA4B;IA4dhF,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAOnD"}
1
+ {"version":3,"file":"DevServer.d.ts","sourceRoot":"","sources":["../../../src/core/DevServer.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,KAAK,EAAE,WAAW,IAAI,kBAAkB,EAAqB,MAAM,SAAS,CAAC;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAMlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAC;AAQzE,aAAK,gBAAgB,GAAG;IACtB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,yBAAyB,EAAE,MAAM,OAAO,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,qBAAa,SAAS;IAQlB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,gBAAgB;IACjD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB;IAR9C,SAAS,CAAC,4BAA4B,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAEnE,SAAS,CAAC,mBAAmB,EAAE,YAAY,GAAG;QAAE,mBAAmB,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,GAAG,IAAI,CAAQ;IAEnG,SAAS,CAAC,kBAAkB,qBAA4B;gBAGnC,YAAY,EAAE,gBAAgB,EAC9B,OAAO,EAAE,gBAAgB;IAIvC,UAAU,CAAC,GAAG,EAAE,kBAAkB,EAAE,OAAO,EAAE,4BAA4B;IAyehF,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAOnD"}
package/dist/src/core/DevServer.js CHANGED
@@ -380,6 +380,15 @@ class DevServer {
380
380
  fs_extra_1.default.mkdirSync(repositoryPath);
381
381
  }
382
382
  fs_extra_1.default.writeFileSync(path_1.default.join(process.cwd(), '.env'), variables.join('\n'));
383
+ if (!fs_extra_1.default.existsSync(path_1.default.join(process.cwd(), 'package.json'))) {
384
+ fs_extra_1.default.writeFileSync(path_1.default.join(process.cwd(), 'package.json'), JSON.stringify({
385
+ name: 'cube-docker',
386
+ version: '0.0.1',
387
+ private: true,
388
+ createdAt: new Date().toJSON(),
389
+ dependencies: {}
390
+ }, null, 2));
391
+ }
383
392
  dotenv_1.default.config({ override: true });
384
393
  await this.cubejsServer.resetInstanceState();
385
394
  res.status(200).json(req.body.variables || {});
package/dist/src/core/DevServer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DevServer.js","sourceRoot":"","sources":["../../../src/core/DevServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DevServer.js","sourceRoot":"","sources":["../../../src/core/DevServer.ts"],"names":[],"mappings":"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"}
package/dist/src/core/OptsHandler.d.ts CHANGED
@@ -19,6 +19,11 @@ export declare class OptsHandler {
19
19
  * Decorated driverFactory flag.
20
20
  */
21
21
  private decoratedFactory;
22
+ /**
23
+ * Map to store driverFactory function result type. This map needs to be
24
+ * removed after dbType deprecation period will be passed.
25
+ */
26
+ private driverFactoryType;
22
27
  /**
23
28
  * Initialized options.
24
29
  */
package/dist/src/core/OptsHandler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OptsHandler.d.ts","sourceRoot":"","sources":["../../../src/core/OptsHandler.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,aAAa,EACb,aAAa,EAEb,4BAA4B,EAC5B,cAAc,EAMd,mBAAmB,EACnB,yBAAyB,EAE1B,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAKjD;;GAEG;AACH,qBAAa,WAAW;IAKpB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,aAAa,CAAC;IANxB;;OAEG;gBAEO,IAAI,EAAE,gBAAgB,EACtB,aAAa,EAAE,aAAa,EAC5B,aAAa,CAAC,EAAE,aAAa;IASvC;;OAEG;IACH,OAAO,CAAC,aAAa,CAAS;IAE9B;;OAEG;IACH,OAAO,CAAC,gBAAgB,CAAS;IAEjC;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAA+B;IAEzD;;OAEG;IACH,OAAO,CAAC,aAAa;IA6BrB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IA+BjC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;OAEG,CACH,OAAO,CAAC,oBAAoB;IAM5B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAgBxB;;OAEG;IACH,OAAO,CAAC,SAAS;IAkBjB;;OAEG;YACW,oBAAoB;IAgBlC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA2C3B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAqN7B;;;OAGG;IACI,qBAAqB,IAAI,OAAO;IAQvC;;;OAGG;IACI,4BAA4B,IAAI,OAAO;IAgB9C;;OAEG;IACI,yBAAyB,IAAI,4BAA4B;IAIhE;;;OAGG;IACI,iCAAiC,CACtC,OAAO,EAAE,cAAc,EACvB,mBAAmB,EAAE,mBAAmB,GACvC,yBAAyB;CAgB7B"}
1
+ {"version":3,"file":"OptsHandler.d.ts","sourceRoot":"","sources":["../../../src/core/OptsHandler.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,aAAa,EACb,aAAa,EAEb,4BAA4B,EAC5B,cAAc,EAMd,mBAAmB,EACnB,yBAAyB,EAE1B,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAKjD;;GAEG;AACH,qBAAa,WAAW;IAKpB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,aAAa,CAAC;IANxB;;OAEG;gBAEO,IAAI,EAAE,gBAAgB,EACtB,aAAa,EAAE,aAAa,EAC5B,aAAa,CAAC,EAAE,aAAa;IASvC;;OAEG;IACH,OAAO,CAAC,aAAa,CAAS;IAE9B;;OAEG;IACH,OAAO,CAAC,gBAAgB,CAAS;IAEjC;;;OAGG;IACH,OAAO,CAAC,iBAAiB,CAAkC;IAE3D;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAA+B;IAEzD;;OAEG;IACH,OAAO,CAAC,aAAa;IAgCrB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IA2CjC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;OAEG,CACH,OAAO,CAAC,oBAAoB;IAM5B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAmBxB;;OAEG;IACH,OAAO,CAAC,SAAS;IAyCjB;;OAEG;YACW,oBAAoB;IAgBlC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA2C3B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAqN7B;;;OAGG;IACI,qBAAqB,IAAI,OAAO;IAQvC;;;OAGG;IACI,4BAA4B,IAAI,OAAO;IAgB9C;;OAEG;IACI,yBAAyB,IAAI,4BAA4B;IAIhE;;;OAGG;IACI,iCAAiC,CACtC,OAAO,EAAE,cAAc,EACvB,mBAAmB,EAAE,mBAAmB,GACvC,yBAAyB;CAgB7B"}
package/dist/src/core/OptsHandler.js CHANGED
@@ -32,6 +32,11 @@ class OptsHandler {
32
32
  * Decorated driverFactory flag.
33
33
  */
34
34
  this.decoratedFactory = false;
35
+ /**
36
+ * Map to store driverFactory function result type. This map needs to be
37
+ * removed after dbType deprecation period will be passed.
38
+ */
39
+ this.driverFactoryType = new Map();
35
40
  this.assertOptions(createOptions);
36
41
  const options = lodash_clonedeep_1.default(this.createOptions);
37
42
  options.driverFactory = this.getDriverFactory(options);
@@ -50,33 +55,55 @@ class OptsHandler {
50
55
  throw new Error('Either CUBEJS_DB_TYPE, CreateOptions.dbType or CreateOptions.driverFactory ' +
51
56
  'must be specified');
52
57
  }
53
- if (opts.dbType) {
54
- this.core.logger('Cube.js `CreateOptions.dbType` Property Deprecation', {
55
- warning: (
56
- // TODO (buntarb): add https://github.com/cube-js/cube.js/blob/master/DEPRECATION.md#dbType
57
- // link once it will be created.
58
- 'CreateOptions.dbType property is now deprecated, please migrate.'),
59
- });
60
- }
58
+ // TODO (buntarb): this assertion should be restored after documentation
59
+ // will be added.
60
+ //
61
+ // if (opts.dbType) {
62
+ // this.core.logger(
63
+ // 'Cube.js `CreateOptions.dbType` Property Deprecation',
64
+ // {
65
+ // warning: (
66
+ // // TODO (buntarb): add https://github.com/cube-js/cube.js/blob/master/DEPRECATION.md#dbType
67
+ // // link once it will be created.
68
+ // 'CreateOptions.dbType property is now deprecated, please migrate.'
69
+ // ),
70
+ // },
71
+ // );
72
+ // }
61
73
  }
62
74
  /**
63
75
  * Assert value returned from the driver factory.
64
76
  */
65
- assertDriverFactoryResult(val) {
77
+ assertDriverFactoryResult(val, ctx) {
66
78
  if (val instanceof query_orchestrator_1.BaseDriver) {
67
- if (this.decoratedType) {
68
- throw new Error('CreateOptions.dbType is required if CreateOptions.driverFactory ' +
69
- 'returns driver instance');
79
+ // TODO (buntarb): these assertions should be restored after dbType
80
+ // deprecation period will be passed.
81
+ //
82
+ // if (this.decoratedType) {
83
+ // throw new Error(
84
+ // 'CreateOptions.dbType is required if CreateOptions.driverFactory ' +
85
+ // 'returns driver instance'
86
+ // );
87
+ // }
88
+ // this.core.logger(
89
+ // 'Cube.js CreateOptions.driverFactory Property Deprecation',
90
+ // {
91
+ // warning: (
92
+ // // TODO (buntarb): add https://github.com/cube-js/cube.js/blob/master/DEPRECATION.md#driverFactory
93
+ // // link once it will be created.
94
+ // 'CreateOptions.driverFactory should return DriverConfig object instead of driver instance, please migrate.'
95
+ // ),
96
+ // },
97
+ // );
98
+ if (!this.driverFactoryType.has(ctx.dataSource)) {
99
+ this.driverFactoryType.set(ctx.dataSource, 'BaseDriver');
70
100
  }
71
- this.core.logger('Cube.js CreateOptions.driverFactory Property Deprecation', {
72
- warning: (
73
- // TODO (buntarb): add https://github.com/cube-js/cube.js/blob/master/DEPRECATION.md#driverFactory
74
- // link once it will be created.
75
- 'CreateOptions.driverFactory should return DriverConfig object instead of driver instance, please migrate.'),
76
- });
77
101
  return val;
78
102
  }
79
103
  else if (val && val.type && typeof val.type === 'string') {
104
+ if (!this.driverFactoryType.has(ctx.dataSource)) {
105
+ this.driverFactoryType.set(ctx.dataSource, 'DriverConfig');
106
+ }
80
107
  return val;
81
108
  }
82
109
  else {
@@ -110,10 +137,13 @@ class OptsHandler {
110
137
  this.decoratedFactory = !driverFactory;
111
138
  return async (ctx) => {
112
139
  if (!driverFactory) {
140
+ if (!this.driverFactoryType.has(ctx.dataSource)) {
141
+ this.driverFactoryType.set(ctx.dataSource, 'DriverConfig');
142
+ }
113
143
  return this.defaultDriverFactory(ctx);
114
144
  }
115
145
  else {
116
- return this.assertDriverFactoryResult(await driverFactory(ctx));
146
+ return this.assertDriverFactoryResult(await driverFactory(ctx), ctx);
117
147
  }
118
148
  };
119
149
  }
@@ -124,7 +154,26 @@ class OptsHandler {
124
154
  const { dbType, driverFactory } = opts;
125
155
  return async (ctx) => {
126
156
  if (!dbType) {
127
- const { type } = (await driverFactory(ctx));
157
+ // TODO (buntarb): this should be restored after dbType deprecation
158
+ // period will be passed.
159
+ // const { type } = <DriverConfig>(await driverFactory(ctx));
160
+ let val;
161
+ let type;
162
+ if (!this.driverFactoryType.has(ctx.dataSource)) {
163
+ val = await driverFactory(ctx);
164
+ }
165
+ switch (this.driverFactoryType.get(ctx.dataSource)) {
166
+ case 'BaseDriver':
167
+ if (process.env.CUBEJS_DB_TYPE) {
168
+ type = process.env.CUBEJS_DB_TYPE;
169
+ }
170
+ break;
171
+ case 'DriverConfig':
172
+ type = (val || await driverFactory(ctx)).type;
173
+ break;
174
+ default:
175
+ break;
176
+ }
128
177
  return type;
129
178
  }
130
179
  else if (typeof dbType === 'function') {
package/dist/src/core/OptsHandler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OptsHandler.js","sourceRoot":"","sources":["../../../src/core/OptsHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OptsHandler.js","sourceRoot":"","sources":["../../../src/core/OptsHandler.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/server-core",
3
3
  "description": "Cube.js base component to wire all backend components together",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "0.30.30",
5
+ "version": "0.30.33",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/cube-js/cube.js.git",
@@ -31,7 +31,7 @@
31
31
  "tst": "clear && yarn tsc && jest --runInBand --coverage dist/test/unit/OptsHandler.test.js"
32
32
  },
33
33
  "dependencies": {
34
- "@cubejs-backend/api-gateway": "^0.30.30",
34
+ "@cubejs-backend/api-gateway": "^0.30.32",
35
35
  "@cubejs-backend/cloud": "^0.30.30",
36
36
  "@cubejs-backend/dotenv": "^9.0.2",
37
37
  "@cubejs-backend/query-orchestrator": "^0.30.30",
@@ -59,7 +59,7 @@
59
59
  "devDependencies": {
60
60
  "@cubejs-backend/cubestore-driver": "^0.30.30",
61
61
  "@cubejs-backend/linter": "^0.30.0",
62
- "@cubejs-client/playground": "^0.30.30",
62
+ "@cubejs-client/playground": "^0.30.31",
63
63
  "@types/cross-spawn": "^6.0.2",
64
64
  "@types/express": "^4.17.9",
65
65
  "@types/fs-extra": "^9.0.8",
@@ -92,5 +92,5 @@
92
92
  ".*\\.d\\.ts"
93
93
  ]
94
94
  },
95
- "gitHead": "21d664e571c93dc4bde75ee744f0cdd20a590bff"
95
+ "gitHead": "7d8bd43f3b49cd36c0b2fff3d88ee050da9ec0ad"
96
96
  }
package/playground/asset-manifest.json CHANGED
@@ -9,19 +9,19 @@
9
9
  "static/js/6.232ed74d.chunk.js": "./static/js/6.232ed74d.chunk.js",
10
10
  "static/js/7.7cedaa52.chunk.js": "./static/js/7.7cedaa52.chunk.js",
11
11
  "static/js/8.6435ca8a.chunk.js": "./static/js/8.6435ca8a.chunk.js",
12
- "main.js": "./static/js/main.15367b8b.chunk.js",
13
- "runtime-main.js": "./static/js/runtime-main.38a4f12f.js",
12
+ "main.js": "./static/js/main.8e63e9b2.chunk.js",
13
+ "runtime-main.js": "./static/js/runtime-main.7118c4c3.js",
14
14
  "static/css/11.b984234c.chunk.css": "./static/css/11.b984234c.chunk.css",
15
- "static/js/11.3972813f.chunk.js": "./static/js/11.3972813f.chunk.js",
15
+ "static/js/11.3740081b.chunk.js": "./static/js/11.3740081b.chunk.js",
16
16
  "static/css/12.ea0ece1a.chunk.css": "./static/css/12.ea0ece1a.chunk.css",
17
- "static/js/12.40c39d00.chunk.js": "./static/js/12.40c39d00.chunk.js",
17
+ "static/js/12.389644bb.chunk.js": "./static/js/12.389644bb.chunk.js",
18
18
  "static/js/13.6d3110b5.chunk.js": "./static/js/13.6d3110b5.chunk.js",
19
19
  "static/js/14.1920a2b0.chunk.js": "./static/js/14.1920a2b0.chunk.js",
20
20
  "static/js/15.340ce750.chunk.js": "./static/js/15.340ce750.chunk.js",
21
21
  "static/js/16.f7339eee.chunk.js": "./static/js/16.f7339eee.chunk.js",
22
22
  "static/js/17.f8caaeba.chunk.js": "./static/js/17.f8caaeba.chunk.js",
23
23
  "static/js/18.d0f413e3.chunk.js": "./static/js/18.d0f413e3.chunk.js",
24
- "static/js/19.b17c127a.chunk.js": "./static/js/19.b17c127a.chunk.js",
24
+ "static/js/19.3419f27c.chunk.js": "./static/js/19.3419f27c.chunk.js",
25
25
  "static/js/20.d1f7d9c3.chunk.js": "./static/js/20.d1f7d9c3.chunk.js",
26
26
  "static/js/21.05ee64dd.chunk.js": "./static/js/21.05ee64dd.chunk.js",
27
27
  "static/js/22.36de0e3d.chunk.js": "./static/js/22.36de0e3d.chunk.js",
@@ -35,8 +35,8 @@
35
35
  "index.html": "./index.html",
36
36
  "static/css/11.b984234c.chunk.css.map": "./static/css/11.b984234c.chunk.css.map",
37
37
  "static/css/12.ea0ece1a.chunk.css.map": "./static/css/12.ea0ece1a.chunk.css.map",
38
- "static/js/11.3972813f.chunk.js.LICENSE.txt": "./static/js/11.3972813f.chunk.js.LICENSE.txt",
39
- "static/js/12.40c39d00.chunk.js.LICENSE.txt": "./static/js/12.40c39d00.chunk.js.LICENSE.txt",
38
+ "static/js/11.3740081b.chunk.js.LICENSE.txt": "./static/js/11.3740081b.chunk.js.LICENSE.txt",
39
+ "static/js/12.389644bb.chunk.js.LICENSE.txt": "./static/js/12.389644bb.chunk.js.LICENSE.txt",
40
40
  "static/media/athena.3d08e54a.svg": "./static/media/athena.3d08e54a.svg",
41
41
  "static/media/bigquery.47cbd6db.svg": "./static/media/bigquery.47cbd6db.svg",
42
42
  "static/media/clickhouse.15d7a0f1.svg": "./static/media/clickhouse.15d7a0f1.svg",
@@ -55,9 +55,9 @@
55
55
  "static/media/snowflake.7e110f33.svg": "./static/media/snowflake.7e110f33.svg"
56
56
  },
57
57
  "entrypoints": [
58
- "static/js/runtime-main.38a4f12f.js",
58
+ "static/js/runtime-main.7118c4c3.js",
59
59
  "static/css/11.b984234c.chunk.css",
60
- "static/js/11.3972813f.chunk.js",
61
- "static/js/main.15367b8b.chunk.js"
60
+ "static/js/11.3740081b.chunk.js",
61
+ "static/js/main.8e63e9b2.chunk.js"
62
62
  ]
63
63
  }
package/playground/index.html CHANGED
@@ -1 +1 @@
1
- <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="apple-touch-icon" sizes="180x180" href="./apple-touch-icon.png"><link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16"><link rel="mask-icon" href="./safari-pinned-tab.svg" color="#5bbad5"><link rel="stylesheet" href="./antd.min.css"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><style>#playground-root{height:100%}</style><title>Cube.js Playground</title><link href="./static/css/11.b984234c.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="playground-root"></div><script>!function(){var e=window.analytics=window.analytics||[];if(!e.initialize)if(e.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{e.invoked=!0,e.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on"],e.factory=function(t){return function(){var n=Array.prototype.slice.call(arguments);return n.unshift(t),e.push(n),e}};for(var t=0;t<e.methods.length;t++){var n=e.methods[t];e[n]=e.factory(n)}e.load=function(t,n){var a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src="https://cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var o=document.getElementsByTagName("script")[0];o.parentNode.insertBefore(a,o),e._loadOptions=n},e.SNIPPET_VERSION="4.1.0",e.load("dSR8JiNYIGKyQHKid9OaLYugXLao18hA"),e.page()}}()</script><script>!function(e){function t(t){for(var n,c,f=t[0],d=t[1],u=t[2],i=0,s=[];i<f.length;i++)c=f[i],Object.prototype.hasOwnProperty.call(o,c)&&o[c]&&s.push(o[c][0]),o[c]=0;for(n in d)Object.prototype.hasOwnProperty.call(d,n)&&(e[n]=d[n]);for(l&&l(t);s.length;)s.shift()();return a.push.apply(a,u||[]),r()}function r(){for(var e,t=0;t<a.length;t++){for(var r=a[t],n=!0,c=1;c<r.length;c++){var d=r[c];0!==o[d]&&(n=!1)}n&&(a.splice(t--,1),e=f(f.s=r[0]))}return e}var n={},c={10:0},o={10:0},a=[];function f(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.e=function(e){var t=[];c[e]?t.push(c[e]):0!==c[e]&&{12:1}[e]&&t.push(c[e]=new Promise((function(t,r){for(var n="static/css/"+({}[e]||e)+"."+{0:"31d6cfe0",1:"31d6cfe0",2:"31d6cfe0",3:"31d6cfe0",4:"31d6cfe0",5:"31d6cfe0",6:"31d6cfe0",7:"31d6cfe0",8:"31d6cfe0",12:"ea0ece1a",13:"31d6cfe0",14:"31d6cfe0",15:"31d6cfe0",16:"31d6cfe0",17:"31d6cfe0",18:"31d6cfe0",19:"31d6cfe0",20:"31d6cfe0",21:"31d6cfe0",22:"31d6cfe0",23:"31d6cfe0",24:"31d6cfe0",25:"31d6cfe0",26:"31d6cfe0",27:"31d6cfe0",28:"31d6cfe0",29:"31d6cfe0"}[e]+".chunk.css",o=f.p+n,a=document.getElementsByTagName("link"),d=0;d<a.length;d++){var u=(l=a[d]).getAttribute("data-href")||l.getAttribute("href");if("stylesheet"===l.rel&&(u===n||u===o))return t()}var i=document.getElementsByTagName("style");for(d=0;d<i.length;d++){var l;if((u=(l=i[d]).getAttribute("data-href"))===n||u===o)return t()}var s=document.createElement("link");s.rel="stylesheet",s.type="text/css",s.onload=t,s.onerror=function(t){var n=t&&t.target&&t.target.src||o,a=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");a.code="CSS_CHUNK_LOAD_FAILED",a.request=n,delete c[e],s.parentNode.removeChild(s),r(a)},s.href=o,document.getElementsByTagName("head")[0].appendChild(s)})).then((function(){c[e]=0})));var r=o[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=o[e]=[t,n]}));t.push(r[2]=n);var a,d=document.createElement("script");d.charset="utf-8",d.timeout=120,f.nc&&d.setAttribute("nonce",f.nc),d.src=function(e){return f.p+"static/js/"+({}[e]||e)+"."+{0:"b54326b0",1:"9d9ab345",2:"c807d1e1",3:"5a159973",4:"59594e0b",5:"b30de4e9",6:"232ed74d",7:"7cedaa52",8:"6435ca8a",12:"40c39d00",13:"6d3110b5",14:"1920a2b0",15:"340ce750",16:"f7339eee",17:"f8caaeba",18:"d0f413e3",19:"b17c127a",20:"d1f7d9c3",21:"05ee64dd",22:"36de0e3d",23:"fbb40500",24:"cc29bbe7",25:"2ce3a50b",26:"1c78ec58",27:"54ec55b1",28:"ec979d0e",29:"67ff83b9"}[e]+".chunk.js"}(e);var u=new Error;a=function(t){d.onerror=d.onload=null,clearTimeout(i);var r=o[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),c=t&&t.target&&t.target.src;u.message="Loading chunk "+e+" failed.\n("+n+": "+c+")",u.name="ChunkLoadError",u.type=n,u.request=c,r[1](u)}o[e]=void 0}};var i=setTimeout((function(){a({type:"timeout",target:d})}),12e4);d.onerror=d.onload=a,document.head.appendChild(d)}return Promise.all(t)},f.m=e,f.c=n,f.d=function(e,t,r){f.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,t){if(1&t&&(e=f(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(f.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)f.d(r,n,function(t){return e[t]}.bind(null,n));return r},f.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(t,"a",t),t},f.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},f.p="./",f.oe=function(e){throw console.error(e),e};var d=this["webpackJsonp@cubejs-client/playground"]=this["webpackJsonp@cubejs-client/playground"]||[],u=d.push.bind(d);d.push=t,d=d.slice();for(var i=0;i<d.length;i++)t(d[i]);var l=u;r()}([])</script><script src="./static/js/11.3972813f.chunk.js"></script><script src="./static/js/main.15367b8b.chunk.js"></script></body></html>
1
+ <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="apple-touch-icon" sizes="180x180" href="./apple-touch-icon.png"><link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16"><link rel="mask-icon" href="./safari-pinned-tab.svg" color="#5bbad5"><link rel="stylesheet" href="./antd.min.css"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><style>#playground-root{height:100%}</style><title>Cube.js Playground</title><link href="./static/css/11.b984234c.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="playground-root"></div><script>!function(){var e=window.analytics=window.analytics||[];if(!e.initialize)if(e.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{e.invoked=!0,e.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on"],e.factory=function(t){return function(){var n=Array.prototype.slice.call(arguments);return n.unshift(t),e.push(n),e}};for(var t=0;t<e.methods.length;t++){var n=e.methods[t];e[n]=e.factory(n)}e.load=function(t,n){var a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src="https://cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var o=document.getElementsByTagName("script")[0];o.parentNode.insertBefore(a,o),e._loadOptions=n},e.SNIPPET_VERSION="4.1.0",e.load("dSR8JiNYIGKyQHKid9OaLYugXLao18hA"),e.page()}}()</script><script>!function(e){function t(t){for(var n,c,f=t[0],d=t[1],u=t[2],i=0,s=[];i<f.length;i++)c=f[i],Object.prototype.hasOwnProperty.call(o,c)&&o[c]&&s.push(o[c][0]),o[c]=0;for(n in d)Object.prototype.hasOwnProperty.call(d,n)&&(e[n]=d[n]);for(l&&l(t);s.length;)s.shift()();return a.push.apply(a,u||[]),r()}function r(){for(var e,t=0;t<a.length;t++){for(var r=a[t],n=!0,c=1;c<r.length;c++){var d=r[c];0!==o[d]&&(n=!1)}n&&(a.splice(t--,1),e=f(f.s=r[0]))}return e}var n={},c={10:0},o={10:0},a=[];function f(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.e=function(e){var t=[];c[e]?t.push(c[e]):0!==c[e]&&{12:1}[e]&&t.push(c[e]=new Promise((function(t,r){for(var n="static/css/"+({}[e]||e)+"."+{0:"31d6cfe0",1:"31d6cfe0",2:"31d6cfe0",3:"31d6cfe0",4:"31d6cfe0",5:"31d6cfe0",6:"31d6cfe0",7:"31d6cfe0",8:"31d6cfe0",12:"ea0ece1a",13:"31d6cfe0",14:"31d6cfe0",15:"31d6cfe0",16:"31d6cfe0",17:"31d6cfe0",18:"31d6cfe0",19:"31d6cfe0",20:"31d6cfe0",21:"31d6cfe0",22:"31d6cfe0",23:"31d6cfe0",24:"31d6cfe0",25:"31d6cfe0",26:"31d6cfe0",27:"31d6cfe0",28:"31d6cfe0",29:"31d6cfe0"}[e]+".chunk.css",o=f.p+n,a=document.getElementsByTagName("link"),d=0;d<a.length;d++){var u=(l=a[d]).getAttribute("data-href")||l.getAttribute("href");if("stylesheet"===l.rel&&(u===n||u===o))return t()}var i=document.getElementsByTagName("style");for(d=0;d<i.length;d++){var l;if((u=(l=i[d]).getAttribute("data-href"))===n||u===o)return t()}var s=document.createElement("link");s.rel="stylesheet",s.type="text/css",s.onload=t,s.onerror=function(t){var n=t&&t.target&&t.target.src||o,a=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");a.code="CSS_CHUNK_LOAD_FAILED",a.request=n,delete c[e],s.parentNode.removeChild(s),r(a)},s.href=o,document.getElementsByTagName("head")[0].appendChild(s)})).then((function(){c[e]=0})));var r=o[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=o[e]=[t,n]}));t.push(r[2]=n);var a,d=document.createElement("script");d.charset="utf-8",d.timeout=120,f.nc&&d.setAttribute("nonce",f.nc),d.src=function(e){return f.p+"static/js/"+({}[e]||e)+"."+{0:"b54326b0",1:"9d9ab345",2:"c807d1e1",3:"5a159973",4:"59594e0b",5:"b30de4e9",6:"232ed74d",7:"7cedaa52",8:"6435ca8a",12:"389644bb",13:"6d3110b5",14:"1920a2b0",15:"340ce750",16:"f7339eee",17:"f8caaeba",18:"d0f413e3",19:"3419f27c",20:"d1f7d9c3",21:"05ee64dd",22:"36de0e3d",23:"fbb40500",24:"cc29bbe7",25:"2ce3a50b",26:"1c78ec58",27:"54ec55b1",28:"ec979d0e",29:"67ff83b9"}[e]+".chunk.js"}(e);var u=new Error;a=function(t){d.onerror=d.onload=null,clearTimeout(i);var r=o[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),c=t&&t.target&&t.target.src;u.message="Loading chunk "+e+" failed.\n("+n+": "+c+")",u.name="ChunkLoadError",u.type=n,u.request=c,r[1](u)}o[e]=void 0}};var i=setTimeout((function(){a({type:"timeout",target:d})}),12e4);d.onerror=d.onload=a,document.head.appendChild(d)}return Promise.all(t)},f.m=e,f.c=n,f.d=function(e,t,r){f.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,t){if(1&t&&(e=f(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(f.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)f.d(r,n,function(t){return e[t]}.bind(null,n));return r},f.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(t,"a",t),t},f.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},f.p="./",f.oe=function(e){throw console.error(e),e};var d=this["webpackJsonp@cubejs-client/playground"]=this["webpackJsonp@cubejs-client/playground"]||[],u=d.push.bind(d);d.push=t,d=d.slice();for(var i=0;i<d.length;i++)t(d[i]);var l=u;r()}([])</script><script src="./static/js/11.3740081b.chunk.js"></script><script src="./static/js/main.8e63e9b2.chunk.js"></script></body></html>