@cubejs-backend/schema-compiler 0.33.21 → 0.33.25
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.
- package/dist/src/compiler/YamlCompiler.d.ts.map +1 -1
- package/dist/src/compiler/YamlCompiler.js +5 -2
- package/dist/src/compiler/YamlCompiler.js.map +1 -1
- package/dist/src/scaffolding/ScaffoldingSchema.d.ts +1 -0
- package/dist/src/scaffolding/ScaffoldingSchema.d.ts.map +1 -1
- package/dist/src/scaffolding/ScaffoldingSchema.js +19 -11
- package/dist/src/scaffolding/ScaffoldingSchema.js.map +1 -1
- package/dist/src/scaffolding/formatters/BaseSchemaFormatter.js +1 -1
- package/dist/src/scaffolding/formatters/BaseSchemaFormatter.js.map +1 -1
- package/dist/src/scaffolding/utils.d.ts +6 -1
- package/dist/src/scaffolding/utils.d.ts.map +1 -1
- package/dist/src/scaffolding/utils.js +24 -6
- package/dist/src/scaffolding/utils.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YamlCompiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/YamlCompiler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAUhD,qBAAa,YAAY;IAGJ,OAAO,CAAC,WAAW;IAAe,OAAO,CAAC,cAAc;IAFpE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;gBAEjC,WAAW,EAAE,WAAW,EAAU,cAAc,EAAE,cAAc;IAGpF,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,KAAK,KAAA,EAAE,QAAQ,KAAA,EAAE,OAAO,KAAA,EAAE,YAAY,KAAA,EAAE,SAAS,KAAA,EAAE,aAAa,KAAA;IA2BvI,OAAO,CAAC,yBAAyB;IAYjC,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,aAAa;IAgDrB,OAAO,CAAC,kBAAkB;IAiD1B,OAAO,CAAC,4BAA4B;IAKpC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,oBAAoB;IAyB5B,OAAO,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"YamlCompiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/YamlCompiler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAUhD,qBAAa,YAAY;IAGJ,OAAO,CAAC,WAAW;IAAe,OAAO,CAAC,cAAc;IAFpE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;gBAEjC,WAAW,EAAE,WAAW,EAAU,cAAc,EAAE,cAAc;IAGpF,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,KAAK,KAAA,EAAE,QAAQ,KAAA,EAAE,OAAO,KAAA,EAAE,YAAY,KAAA,EAAE,SAAS,KAAA,EAAE,aAAa,KAAA;IA2BvI,OAAO,CAAC,yBAAyB;IAYjC,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,aAAa;IAgDrB,OAAO,CAAC,kBAAkB;IAiD1B,OAAO,CAAC,4BAA4B;IAKpC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,oBAAoB;IAyB5B,OAAO,CAAC,cAAc;CAoBvB"}
|
|
@@ -82,7 +82,7 @@ class YamlCompiler {
|
|
|
82
82
|
cubeObj.measures = this.yamlArrayToObj(cubeObj.measures || [], 'measure', errorsReport);
|
|
83
83
|
cubeObj.dimensions = this.yamlArrayToObj(cubeObj.dimensions || [], 'dimension', errorsReport);
|
|
84
84
|
cubeObj.segments = this.yamlArrayToObj(cubeObj.segments || [], 'segment', errorsReport);
|
|
85
|
-
cubeObj.preAggregations = this.yamlArrayToObj(cubeObj.preAggregations || [], '
|
|
85
|
+
cubeObj.preAggregations = this.yamlArrayToObj(cubeObj.preAggregations || [], 'preAggregation', errorsReport);
|
|
86
86
|
cubeObj.joins = this.yamlArrayToObj(cubeObj.joins || [], 'join', errorsReport);
|
|
87
87
|
return this.transpileYaml(cubeObj, [], cubeObj.name, errorsReport);
|
|
88
88
|
}
|
|
@@ -233,7 +233,10 @@ class YamlCompiler {
|
|
|
233
233
|
errorsReport.error(`${memberType}s must be defined as array`);
|
|
234
234
|
return {};
|
|
235
235
|
}
|
|
236
|
-
const remapped = yamlArray.map(({ name, ...rest }) => {
|
|
236
|
+
const remapped = yamlArray.map(({ name, indexes, ...rest }) => {
|
|
237
|
+
if (memberType === 'preAggregation' && indexes) {
|
|
238
|
+
indexes = this.yamlArrayToObj(indexes || [], `${memberType}.index`, errorsReport);
|
|
239
|
+
}
|
|
237
240
|
if (!name) {
|
|
238
241
|
errorsReport.error(`name isn't defined for ${memberType}: ${js_yaml_1.default.stringify(rest)}`);
|
|
239
242
|
return {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YamlCompiler.js","sourceRoot":"","sources":["../../../src/compiler/YamlCompiler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"YamlCompiler.js","sourceRoot":"","sources":["../../../src/compiler/YamlCompiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,6 +73,7 @@ export declare class ScaffoldingSchema {
|
|
|
73
73
|
protected numberMeasures(tableDefinition: any): any;
|
|
74
74
|
protected fromMeasureDictionary(column: any): boolean;
|
|
75
75
|
protected dimensionColumns(tableDefinition: any): any;
|
|
76
|
+
private fixCase;
|
|
76
77
|
protected joins(tableName: TableName, tableDefinition: any): any[];
|
|
77
78
|
protected timeColumnIndex(column: any): number;
|
|
78
79
|
protected columnType(column: any): ColumnType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaffoldingSchema.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ScaffoldingSchema.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,7 +99,7 @@ class ScaffoldingSchema {
|
|
|
99
99
|
const definition = {
|
|
100
100
|
schema, table, tableDefinition, tableName
|
|
101
101
|
};
|
|
102
|
-
const tableizeName = inflection_1.default.tableize(table);
|
|
102
|
+
const tableizeName = inflection_1.default.tableize(this.fixCase(table));
|
|
103
103
|
const parts = tableizeName.split('_');
|
|
104
104
|
const tableNamesFromParts = ramda_1.default.range(0, parts.length - 1).map(toDrop => inflection_1.default.tableize(ramda_1.default.drop(toDrop, parts).join('_')));
|
|
105
105
|
const names = ramda_1.default.uniq([table, tableizeName].concat(tableNamesFromParts));
|
|
@@ -152,7 +152,7 @@ class ScaffoldingSchema {
|
|
|
152
152
|
};
|
|
153
153
|
if (column.columnType !== 'time') {
|
|
154
154
|
res.isPrimaryKey = column.attributes?.includes('primaryKey') ||
|
|
155
|
-
column.name
|
|
155
|
+
this.fixCase(column.name) === 'id';
|
|
156
156
|
}
|
|
157
157
|
return res;
|
|
158
158
|
});
|
|
@@ -160,7 +160,7 @@ class ScaffoldingSchema {
|
|
|
160
160
|
numberMeasures(tableDefinition) {
|
|
161
161
|
return tableDefinition.filter(column => (!column.name.startsWith('_') &&
|
|
162
162
|
(this.columnType(column) === 'number') &&
|
|
163
|
-
(this.options.includeNonDictionaryMeasures ? column.name
|
|
163
|
+
(this.options.includeNonDictionaryMeasures ? this.fixCase(column.name) !== 'id' : this.fromMeasureDictionary(column)))).map(column => ({
|
|
164
164
|
name: column.name,
|
|
165
165
|
types: ['sum', 'avg', 'min', 'max'],
|
|
166
166
|
title: inflection_1.default.titleize(column.name),
|
|
@@ -168,12 +168,12 @@ class ScaffoldingSchema {
|
|
|
168
168
|
}));
|
|
169
169
|
}
|
|
170
170
|
fromMeasureDictionary(column) {
|
|
171
|
-
return !column.name.match(new RegExp(idRegex, 'i')) && !!MEASURE_DICTIONARY.find(word => column.name
|
|
171
|
+
return !column.name.match(new RegExp(idRegex, 'i')) && !!MEASURE_DICTIONARY.find(word => this.fixCase(column.name).endsWith(word));
|
|
172
172
|
}
|
|
173
173
|
dimensionColumns(tableDefinition) {
|
|
174
174
|
const dimensionColumns = tableDefinition.filter(column => !column.name.startsWith('_') && this.columnType(column) === 'string' ||
|
|
175
175
|
column.attributes?.includes('primaryKey') ||
|
|
176
|
-
column.name
|
|
176
|
+
this.fixCase(column.name) === 'id');
|
|
177
177
|
const timeColumns = ramda_1.default.pipe(
|
|
178
178
|
// @ts-ignore
|
|
179
179
|
ramda_1.default.filter(column => !column.name.startsWith('_') && this.columnType(column) === 'time'), ramda_1.default.sortBy(column => this.timeColumnIndex(column)),
|
|
@@ -183,13 +183,21 @@ class ScaffoldingSchema {
|
|
|
183
183
|
)(tableDefinition);
|
|
184
184
|
return dimensionColumns.concat(timeColumns);
|
|
185
185
|
}
|
|
186
|
+
fixCase(value) {
|
|
187
|
+
if (this.options.snakeCase) {
|
|
188
|
+
return (0, utils_1.toSnakeCase)(value);
|
|
189
|
+
}
|
|
190
|
+
return value.toLocaleLowerCase();
|
|
191
|
+
}
|
|
186
192
|
joins(tableName, tableDefinition) {
|
|
187
193
|
return ramda_1.default.unnest(tableDefinition
|
|
188
|
-
.filter(column => (column.name.match(new RegExp(idRegex, 'i')) && column.name
|
|
194
|
+
.filter(column => (column.name.match(new RegExp(idRegex, 'i')) && this.fixCase(column.name) !== 'id'))
|
|
189
195
|
.map(column => {
|
|
190
196
|
const withoutId = column.name.replace(new RegExp(idRegex, 'i'), '');
|
|
191
197
|
const tablesToJoin = this.tableNamesToTables[withoutId] ||
|
|
192
|
-
this.tableNamesToTables[inflection_1.default.tableize(withoutId)]
|
|
198
|
+
this.tableNamesToTables[inflection_1.default.tableize(withoutId)] ||
|
|
199
|
+
this.tableNamesToTables[this.fixCase(withoutId)] ||
|
|
200
|
+
this.tableNamesToTables[(inflection_1.default.tableize(this.fixCase(withoutId)))];
|
|
193
201
|
if (!tablesToJoin) {
|
|
194
202
|
return null;
|
|
195
203
|
}
|
|
@@ -197,8 +205,8 @@ class ScaffoldingSchema {
|
|
|
197
205
|
if (tableName === definition.tableName) {
|
|
198
206
|
return null;
|
|
199
207
|
}
|
|
200
|
-
let columnForJoin = definition.tableDefinition.find(c => c.name
|
|
201
|
-
columnForJoin = columnForJoin || definition.tableDefinition.find(c => c.name
|
|
208
|
+
let columnForJoin = definition.tableDefinition.find(c => this.fixCase(c.name) === this.fixCase(column.name));
|
|
209
|
+
columnForJoin = columnForJoin || definition.tableDefinition.find(c => this.fixCase(c.name) === 'id');
|
|
202
210
|
if (!columnForJoin) {
|
|
203
211
|
return null;
|
|
204
212
|
}
|
|
@@ -219,7 +227,7 @@ class ScaffoldingSchema {
|
|
|
219
227
|
.filter(ramda_1.default.identity));
|
|
220
228
|
}
|
|
221
229
|
timeColumnIndex(column) {
|
|
222
|
-
const name = column.name
|
|
230
|
+
const name = this.fixCase(column.name);
|
|
223
231
|
if (name.indexOf('create') !== -1) {
|
|
224
232
|
return 0;
|
|
225
233
|
}
|
|
@@ -231,7 +239,7 @@ class ScaffoldingSchema {
|
|
|
231
239
|
}
|
|
232
240
|
}
|
|
233
241
|
columnType(column) {
|
|
234
|
-
const type = column.type
|
|
242
|
+
const type = this.fixCase(column.type);
|
|
235
243
|
if (['time', 'date'].find(t => type.indexOf(t) !== -1)) {
|
|
236
244
|
return ColumnType.Time;
|
|
237
245
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaffoldingSchema.js","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ScaffoldingSchema.js","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,7 @@ class BaseSchemaFormatter {
|
|
|
57
57
|
return this.driver.quoteIdentifier(name);
|
|
58
58
|
}
|
|
59
59
|
eligibleIdentifier(name) {
|
|
60
|
-
return !!name.match(/^[a-z0-9_]+$/);
|
|
60
|
+
return !!name.match(/^[a-z0-9_]+$/i);
|
|
61
61
|
}
|
|
62
62
|
schemaDescriptorForTable(tableSchema, schemaContext = {}) {
|
|
63
63
|
const table = `${tableSchema.schema?.length ? `${this.escapeName(tableSchema.schema)}.` : ''}${this.escapeName(tableSchema.table)}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseSchemaFormatter.js","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"BaseSchemaFormatter.js","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/utils.ts"],"names":[],"mappings":"AA0BA,KAAK,OAAO,GAAG;IACb,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,WAAW,CAAC,KAAK,SAAK,EAAE,OAAO,GAAE,OAAY,UAQ5D"}
|
|
@@ -1,13 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.toSnakeCase = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
const PUNCTUATION = /[^\p{L}\p{N}]+/ug;
|
|
5
|
+
const REGEX = /([\p{Lu}]+[\p{Ll}\p{N}]*|[\p{Ll}\p{N}]+)/gu;
|
|
6
|
+
const LAZY_UPPERCASE_REGEX = /([\p{Lu}]{2,}(?![\p{Ll}\p{N}])|[\p{Lu}]+[\p{Ll}\p{N}]*|[\p{Ll}\p{N}]+)/gu;
|
|
7
|
+
const PRESERVE_UPPERCASE_REGEX = /([\p{Lu}]{2,}|[\p{Lu}][\p{Ll}]*|[\p{Ll}\p{N}]+)/gu;
|
|
8
|
+
const splitString = (value, options = {}) => {
|
|
9
|
+
// eslint-disable-next-line no-nested-ternary
|
|
10
|
+
const regex = options.preserveConsecutiveUppercase
|
|
11
|
+
? PRESERVE_UPPERCASE_REGEX
|
|
12
|
+
: (options.lazyUppercase !== false ? LAZY_UPPERCASE_REGEX : REGEX);
|
|
13
|
+
const input = value.trim();
|
|
14
|
+
const words = value ? (input.match(regex) || []).filter(Boolean) : [];
|
|
15
|
+
const output = words.filter(Boolean);
|
|
16
|
+
if (output.length === 0 && value.length > 0) {
|
|
17
|
+
return [value.replace(PUNCTUATION, '')];
|
|
8
18
|
}
|
|
9
|
-
return
|
|
10
|
-
|
|
19
|
+
return output;
|
|
20
|
+
};
|
|
21
|
+
const transformWords = (input, options, joinChar = '', transformFn = s => s) => (input ? splitString(input, options).map(transformFn).join(joinChar) : '');
|
|
22
|
+
const lowercase = (input = '', options) => input.toLocaleLowerCase(options?.locale);
|
|
23
|
+
function toSnakeCase(input = '', options = {}) {
|
|
24
|
+
const output = lowercase(transformWords(input, options, '_'), options);
|
|
25
|
+
if (options?.uppercase) {
|
|
26
|
+
return output.toLocaleUpperCase(options?.locale);
|
|
27
|
+
}
|
|
28
|
+
return output;
|
|
11
29
|
}
|
|
12
30
|
exports.toSnakeCase = toSnakeCase;
|
|
13
31
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/scaffolding/utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/scaffolding/utils.ts"],"names":[],"mappings":";;;AAAA,MAAM,WAAW,GAAG,kBAAkB,CAAC;AACvC,MAAM,KAAK,GAAG,4CAA4C,CAAC;AAC3D,MAAM,oBAAoB,GAAG,0EAA0E,CAAC;AACxG,MAAM,wBAAwB,GAAG,mDAAmD,CAAC;AAErF,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,UAAe,EAAE,EAAE,EAAE;IACvD,6CAA6C;IAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,4BAA4B;QAChD,CAAC,CAAC,wBAAwB;QAC1B,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAErE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAErC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;KACzC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,OAAO,EAAE,QAAQ,GAAG,EAAE,EAAE,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAEnK,MAAM,SAAS,GAAG,CAAC,KAAK,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAOpF,SAAgB,WAAW,CAAC,KAAK,GAAG,EAAE,EAAE,UAAmB,EAAE;IAC3D,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;IAEvE,IAAI,OAAO,EAAE,SAAS,EAAE;QACtB,OAAO,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAClD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AARD,kCAQC"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/schema-compiler",
|
|
3
3
|
"description": "Cube schema compiler",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.33.
|
|
5
|
+
"version": "0.33.25",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"@babel/standalone": "^7.12.10",
|
|
41
41
|
"@babel/traverse": "^7.12.10",
|
|
42
42
|
"@babel/types": "^7.12.12",
|
|
43
|
-
"@cubejs-backend/shared": "^0.33.
|
|
43
|
+
"@cubejs-backend/shared": "^0.33.24",
|
|
44
44
|
"antlr4ts": "0.5.0-alpha.4",
|
|
45
45
|
"camelcase": "^6.2.0",
|
|
46
46
|
"cron-parser": "^3.5.0",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"devDependencies": {
|
|
59
59
|
"@apla/clickhouse": "^1.5.5",
|
|
60
60
|
"@cubejs-backend/linter": "^0.33.0",
|
|
61
|
-
"@cubejs-backend/query-orchestrator": "^0.33.
|
|
61
|
+
"@cubejs-backend/query-orchestrator": "^0.33.25",
|
|
62
62
|
"@types/babel__code-frame": "^7.0.2",
|
|
63
63
|
"@types/babel__generator": "^7.6.2",
|
|
64
64
|
"@types/babel__parser": "^7.1.1",
|
|
@@ -100,5 +100,5 @@
|
|
|
100
100
|
".*\\.d\\.ts"
|
|
101
101
|
]
|
|
102
102
|
},
|
|
103
|
-
"gitHead": "
|
|
103
|
+
"gitHead": "b858d30f55e130c9afdef5dea339125af1752ad9"
|
|
104
104
|
}
|