@cubejs-backend/schema-compiler 0.31.69 → 0.32.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.
- package/dist/src/adapter/BaseQuery.js +2 -3
- package/dist/src/adapter/BaseQuery.js.map +1 -1
- package/dist/src/adapter/CubeStoreQuery.js +5 -7
- package/dist/src/adapter/CubeStoreQuery.js.map +1 -1
- package/dist/src/adapter/PreAggregations.js +5 -7
- package/dist/src/adapter/PreAggregations.js.map +1 -1
- package/dist/src/compiler/CubeEvaluator.js +4 -7
- package/dist/src/compiler/CubeEvaluator.js.map +1 -1
- package/dist/src/compiler/CubeValidator.js +9 -12
- package/dist/src/compiler/CubeValidator.js.map +1 -1
- package/dist/src/compiler/YamlCompiler.js +10 -16
- package/dist/src/compiler/YamlCompiler.js.map +1 -1
- package/dist/src/compiler/converters/CubeSchemaConverter.js +4 -5
- package/dist/src/compiler/converters/CubeSchemaConverter.js.map +1 -1
- package/dist/src/compiler/transpilers/CubePropContextTranspiler.js +9 -10
- package/dist/src/compiler/transpilers/CubePropContextTranspiler.js.map +1 -1
- package/dist/src/parser/PythonParser.js +1 -1
- package/dist/src/parser/PythonParser.js.map +1 -1
- package/dist/src/parser/SqlParser.js +6 -8
- package/dist/src/parser/SqlParser.js.map +1 -1
- package/dist/src/scaffolding/ScaffoldingSchema.js +4 -8
- package/dist/src/scaffolding/ScaffoldingSchema.js.map +1 -1
- package/dist/src/scaffolding/formatters/BaseSchemaFormatter.js +17 -25
- package/dist/src/scaffolding/formatters/BaseSchemaFormatter.js.map +1 -1
- package/package.json +8 -10
- package/adapter/AWSElasticSearchQuery.js +0 -8
- package/adapter/BaseDimension.js +0 -8
- package/adapter/BaseFilter.js +0 -8
- package/adapter/BaseMeasure.js +0 -8
- package/adapter/BaseQuery.js +0 -8
- package/adapter/BaseSegment.js +0 -8
- package/adapter/ElasticSearchQuery.js +0 -8
- package/adapter/MssqlQuery.js +0 -8
- package/adapter/MysqlQuery.js +0 -8
- package/adapter/OracleQuery.js +0 -8
- package/adapter/ParamAllocator.js +0 -8
- package/adapter/PostgresQuery.js +0 -8
- package/adapter/PreAggregations.js +0 -8
- package/adapter/QueryBuilder.js +0 -8
- package/adapter/QueryCache.js +0 -8
- package/adapter/README.md +0 -3
- package/adapter/SqliteQuery.js +0 -8
- package/scaffolding/ScaffoldingSchema.js +0 -3
- package/scaffolding/ScaffoldingTemplate.js +0 -3
|
@@ -44,22 +44,21 @@ class CubeSchemaConverter {
|
|
|
44
44
|
const ast = this.parse(schemaFile);
|
|
45
45
|
(0, traverse_1.default)(ast, {
|
|
46
46
|
CallExpression: (path) => {
|
|
47
|
-
var _a, _b, _c, _d, _e;
|
|
48
47
|
if (t.isIdentifier(path.node.callee)) {
|
|
49
48
|
const args = path.get('arguments');
|
|
50
49
|
if (path.node.callee.name === 'cube') {
|
|
51
|
-
if (args
|
|
50
|
+
if (args?.[args.length - 1]) {
|
|
52
51
|
let cubeName;
|
|
53
52
|
if (args[0].node.type === 'StringLiteral' && args[0].node.value) {
|
|
54
53
|
cubeName = args[0].node.value;
|
|
55
54
|
}
|
|
56
|
-
else if (args[0].node.type === 'TemplateLiteral' &&
|
|
57
|
-
cubeName =
|
|
55
|
+
else if (args[0].node.type === 'TemplateLiteral' && args[0].node.quasis?.[0]?.value.cooked) {
|
|
56
|
+
cubeName = args[0].node.quasis?.[0]?.value.cooked;
|
|
58
57
|
}
|
|
59
58
|
if (cubeName == null) {
|
|
60
59
|
throw new Error(`Error parsing ${schemaFile.fileName}`);
|
|
61
60
|
}
|
|
62
|
-
if (t.isObjectExpression(
|
|
61
|
+
if (t.isObjectExpression(args[1]?.node) && ast != null) {
|
|
63
62
|
this.parsedFiles[cubeName] = {
|
|
64
63
|
fileName: schemaFile.fileName,
|
|
65
64
|
ast,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CubeSchemaConverter.js","sourceRoot":"","sources":["../../../../src/compiler/converters/CubeSchemaConverter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAyC;AACzC,0CAAsC;AACtC,+DAAuC;AACvC,gDAAkC;AAmBlC,MAAa,mBAAmB;IAK9B,YAA6B,cAAmB,EAAY,UAAoC;QAAnE,mBAAc,GAAd,cAAc,CAAK;QAAY,eAAU,GAAV,UAAU,CAA0B;QAJtF,oBAAe,GAAiB,EAAE,CAAC;QAEnC,gBAAW,GAAkB,EAAE,CAAC;IAEyD,CAAC;IAE1F,KAAK,CAAC,OAAO;QACrB,IAAI,CAAC,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;QAEnE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAEnC,IAAA,kBAAQ,EAAC,GAAG,EAAE;gBACZ,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"CubeSchemaConverter.js","sourceRoot":"","sources":["../../../../src/compiler/converters/CubeSchemaConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ exports.transpiledFieldsPatterns = [
|
|
|
41
41
|
/^excludes$/,
|
|
42
42
|
];
|
|
43
43
|
exports.transpiledFields = new Set();
|
|
44
|
-
exports.transpiledFieldsPatterns
|
|
44
|
+
exports.transpiledFieldsPatterns?.forEach((r) => {
|
|
45
45
|
const fields = r.toString().replace(/.*?([_a-zA-Z|][_a-zA-Z0-9|]*)([^_a-zA-Z0-9|]*)$/, '$1').split('|');
|
|
46
46
|
fields.forEach((f) => exports.transpiledFields.add(f));
|
|
47
47
|
});
|
|
@@ -56,7 +56,7 @@ class CubePropContextTranspiler {
|
|
|
56
56
|
if (t.isIdentifier(path.node.callee)) {
|
|
57
57
|
const args = path.get('arguments');
|
|
58
58
|
if (path.node.callee.name === 'cube' || path.node.callee.name === 'view') {
|
|
59
|
-
if (args
|
|
59
|
+
if (args?.[args.length - 1]) {
|
|
60
60
|
const cubeName = args[0].node.type === 'StringLiteral' && args[0].node.value ||
|
|
61
61
|
args[0].node.type === 'TemplateLiteral' &&
|
|
62
62
|
args[0].node.quasis.length &&
|
|
@@ -99,20 +99,19 @@ class CubePropContextTranspiler {
|
|
|
99
99
|
};
|
|
100
100
|
}
|
|
101
101
|
fullPath(path) {
|
|
102
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
103
102
|
// @ts-ignore
|
|
104
|
-
let fp =
|
|
105
|
-
let pp = path
|
|
103
|
+
let fp = path?.node?.key?.name || '';
|
|
104
|
+
let pp = path?.parentPath;
|
|
106
105
|
while (pp) {
|
|
107
|
-
if (
|
|
106
|
+
if (pp?.parentPath?.node?.type === 'ArrayExpression') {
|
|
108
107
|
fp = `0.${fp}`;
|
|
109
|
-
pp = pp
|
|
108
|
+
pp = pp?.parentPath;
|
|
110
109
|
// @ts-ignore
|
|
111
110
|
}
|
|
112
|
-
else if (
|
|
111
|
+
else if (pp?.parentPath?.node?.key?.type === 'Identifier') {
|
|
113
112
|
// @ts-ignore
|
|
114
|
-
fp = `${
|
|
115
|
-
pp =
|
|
113
|
+
fp = `${pp?.parentPath?.node?.key?.name || '0'}.${fp}`;
|
|
114
|
+
pp = pp?.parentPath?.parentPath;
|
|
116
115
|
}
|
|
117
116
|
else
|
|
118
117
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CubePropContextTranspiler.js","sourceRoot":"","sources":["../../../../src/compiler/transpilers/CubePropContextTranspiler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,kDAAsB;AAOtB,uDAAuD;AAC1C,QAAA,wBAAwB,GAAkB;IACrD,QAAQ;IACR,MAAM;IACN,0EAA0E;IAC1E,qFAAqF;IACrF,iMAAiM;IACjM,kBAAkB;IAClB,YAAY;IACZ,YAAY;CACb,CAAC;AAEW,QAAA,gBAAgB,GAAgB,IAAI,GAAG,EAAU,CAAC;AAE/D,gCAAwB,
|
|
1
|
+
{"version":3,"file":"CubePropContextTranspiler.js","sourceRoot":"","sources":["../../../../src/compiler/transpilers/CubePropContextTranspiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -159,7 +159,7 @@ class PythonParser {
|
|
|
159
159
|
if (name) {
|
|
160
160
|
return t.identifier(name.text);
|
|
161
161
|
}
|
|
162
|
-
else if (string
|
|
162
|
+
else if (string?.length) {
|
|
163
163
|
return t.stringLiteral(string.map(s => this.stripQuotes(s.text)).join(''));
|
|
164
164
|
}
|
|
165
165
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PythonParser.js","sourceRoot":"","sources":["../../../src/parser/PythonParser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PythonParser.js","sourceRoot":"","sources":["../../../src/parser/PythonParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,7 +132,6 @@ class SqlParser {
|
|
|
132
132
|
let originalAlias;
|
|
133
133
|
const whereBuildingVisitor = nodeVisitor({
|
|
134
134
|
visitNode(ctx) {
|
|
135
|
-
var _a, _b, _c, _d, _e;
|
|
136
135
|
if (ctx instanceof GenericSqlParser_1.IdPathContext) {
|
|
137
136
|
result += sql.substring(cursor, ctx.start.startIndex);
|
|
138
137
|
cursor = ctx.start.startIndex;
|
|
@@ -140,22 +139,21 @@ class SqlParser {
|
|
|
140
139
|
if (child && child.text === originalAlias) {
|
|
141
140
|
const withoutFirst = ramda_1.default.drop(1, ctx.children);
|
|
142
141
|
result += [tableAlias].concat(withoutFirst.map(c => c.text)).join('');
|
|
143
|
-
cursor =
|
|
142
|
+
cursor = ctx.stop?.stopIndex + 1;
|
|
144
143
|
}
|
|
145
144
|
else if (ctx.childCount === 1) {
|
|
146
|
-
result += [tableAlias, '.'].concat(
|
|
147
|
-
cursor =
|
|
145
|
+
result += [tableAlias, '.'].concat(ctx.children?.map(c => c.text)).join('');
|
|
146
|
+
cursor = ctx.stop?.stopIndex + 1;
|
|
148
147
|
}
|
|
149
148
|
else {
|
|
150
|
-
result += sql.substring(cursor,
|
|
151
|
-
cursor =
|
|
149
|
+
result += sql.substring(cursor, ctx.stop?.stopIndex);
|
|
150
|
+
cursor = ctx.stop?.stopIndex;
|
|
152
151
|
}
|
|
153
152
|
}
|
|
154
153
|
}
|
|
155
154
|
});
|
|
156
155
|
this.ast.accept(nodeVisitor({
|
|
157
156
|
visitNode(ctx) {
|
|
158
|
-
var _a;
|
|
159
157
|
if (ctx instanceof GenericSqlParser_1.QueryContext && ctx._from && ctx._where) {
|
|
160
158
|
const aliasField = ctx._from.getRuleContext(0, GenericSqlParser_1.AliasFieldContext);
|
|
161
159
|
const lastNode = aliasField.getChild(aliasField.childCount - 1);
|
|
@@ -166,7 +164,7 @@ class SqlParser {
|
|
|
166
164
|
originalAlias = lastNode.text;
|
|
167
165
|
}
|
|
168
166
|
cursor = ctx._where.start.startIndex;
|
|
169
|
-
end =
|
|
167
|
+
end = ctx._where.stop?.stopIndex + 1;
|
|
170
168
|
ctx._where.accept(whereBuildingVisitor);
|
|
171
169
|
}
|
|
172
170
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlParser.js","sourceRoot":"","sources":["../../../src/parser/SqlParser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SqlParser.js","sourceRoot":"","sources":["../../../src/parser/SqlParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -161,14 +161,13 @@ class ScaffoldingSchema {
|
|
|
161
161
|
}
|
|
162
162
|
dimensions(tableDefinition) {
|
|
163
163
|
return this.dimensionColumns(tableDefinition).map(column => {
|
|
164
|
-
var _a;
|
|
165
164
|
const res = {
|
|
166
165
|
name: column.name,
|
|
167
166
|
types: [column.columnType || this.columnType(column)],
|
|
168
167
|
title: inflection_1.default.titleize(column.name),
|
|
169
168
|
};
|
|
170
169
|
if (column.columnType !== 'time') {
|
|
171
|
-
res.isPrimaryKey =
|
|
170
|
+
res.isPrimaryKey = column.attributes?.includes('primaryKey') ||
|
|
172
171
|
column.name.toLowerCase() === 'id';
|
|
173
172
|
}
|
|
174
173
|
return res;
|
|
@@ -188,12 +187,9 @@ class ScaffoldingSchema {
|
|
|
188
187
|
return !column.name.match(new RegExp(idRegex, 'i')) && !!MEASURE_DICTIONARY.find(word => column.name.toLowerCase().endsWith(word));
|
|
189
188
|
}
|
|
190
189
|
dimensionColumns(tableDefinition) {
|
|
191
|
-
const dimensionColumns = tableDefinition.filter(column =>
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
((_a = column.attributes) === null || _a === void 0 ? void 0 : _a.includes('primaryKey')) ||
|
|
195
|
-
column.name.toLowerCase() === 'id';
|
|
196
|
-
});
|
|
190
|
+
const dimensionColumns = tableDefinition.filter(column => !column.name.startsWith('_') && this.columnType(column) === 'string' ||
|
|
191
|
+
column.attributes?.includes('primaryKey') ||
|
|
192
|
+
column.name.toLowerCase() === 'id');
|
|
197
193
|
const timeColumns = ramda_1.default.pipe(
|
|
198
194
|
// @ts-ignore
|
|
199
195
|
ramda_1.default.filter(column => !column.name.startsWith('_') && this.columnType(column) === 'time'), ramda_1.default.sortBy(column => this.timeColumnIndex(column)),
|
|
@@ -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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"}
|
|
@@ -52,10 +52,9 @@ class BaseSchemaFormatter {
|
|
|
52
52
|
return !!name.match(/^[a-z0-9_]+$/);
|
|
53
53
|
}
|
|
54
54
|
schemaDescriptorForTable(tableSchema, schemaContext = {}) {
|
|
55
|
-
var _a;
|
|
56
55
|
return {
|
|
57
56
|
cube: tableSchema.cube,
|
|
58
|
-
sql: `SELECT * FROM ${
|
|
57
|
+
sql: `SELECT * FROM ${tableSchema.schema?.length ? `${this.escapeName(tableSchema.schema)}.` : ''}${this.escapeName(tableSchema.table)}`,
|
|
59
58
|
preAggregations: new ValueWithComments_1.ValueWithComments(null, [
|
|
60
59
|
'Pre-Aggregations definitions go here',
|
|
61
60
|
'Learn more here: https://cube.dev/docs/caching/pre-aggregations/getting-started'
|
|
@@ -66,32 +65,26 @@ class BaseSchemaFormatter {
|
|
|
66
65
|
relationship: j.relationship
|
|
67
66
|
}
|
|
68
67
|
})).reduce((a, b) => ({ ...a, ...b }), {}),
|
|
69
|
-
measures: tableSchema.measures.map(m => {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
}
|
|
77
|
-
});
|
|
78
|
-
}).reduce((a, b) => ({ ...a, ...b }), {
|
|
68
|
+
measures: tableSchema.measures.map(m => ({
|
|
69
|
+
[this.memberName(m)]: {
|
|
70
|
+
sql: this.sqlForMember(m),
|
|
71
|
+
type: m.type ?? m.types[0],
|
|
72
|
+
title: this.memberTitle(m)
|
|
73
|
+
}
|
|
74
|
+
})).reduce((a, b) => ({ ...a, ...b }), {
|
|
79
75
|
count: {
|
|
80
76
|
type: 'count',
|
|
81
77
|
drillMembers: (tableSchema.drillMembers || []).map(m => new MemberReference_1.MemberReference(this.memberName(m)))
|
|
82
78
|
}
|
|
83
79
|
}),
|
|
84
|
-
dimensions: tableSchema.dimensions.map(m => {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
}
|
|
93
|
-
});
|
|
94
|
-
}).reduce((a, b) => ({ ...a, ...b }), {}),
|
|
80
|
+
dimensions: tableSchema.dimensions.map(m => ({
|
|
81
|
+
[this.memberName(m)]: {
|
|
82
|
+
sql: this.sqlForMember(m),
|
|
83
|
+
type: m.type ?? m.types[0],
|
|
84
|
+
title: this.memberTitle(m),
|
|
85
|
+
primaryKey: m.isPrimaryKey ? true : undefined
|
|
86
|
+
}
|
|
87
|
+
})).reduce((a, b) => ({ ...a, ...b }), {}),
|
|
95
88
|
...schemaContext
|
|
96
89
|
};
|
|
97
90
|
}
|
|
@@ -99,7 +92,6 @@ class BaseSchemaFormatter {
|
|
|
99
92
|
const tableNames = cubeDescriptors.map(({ tableName }) => tableName);
|
|
100
93
|
const generatedSchemaForTables = this.scaffoldingSchema.generateForTables(tableNames.map((n) => this.scaffoldingSchema.resolveTableName(n)));
|
|
101
94
|
return cubeDescriptors.map((descriptor) => {
|
|
102
|
-
var _a;
|
|
103
95
|
const generatedDescriptor = generatedSchemaForTables.find(({ cube }) => cube === descriptor.cube);
|
|
104
96
|
const cubeMembers = descriptor.members.reduce((memo, member) => ({
|
|
105
97
|
measures: [...memo.measures].concat(member.memberType === ScaffoldingSchema_1.MemberType.Measure ? [member] : []),
|
|
@@ -115,7 +107,7 @@ class BaseSchemaFormatter {
|
|
|
115
107
|
...generatedDescriptor,
|
|
116
108
|
...descriptor,
|
|
117
109
|
...cubeMembers,
|
|
118
|
-
drillMembers:
|
|
110
|
+
drillMembers: generatedDescriptor?.drillMembers?.filter((dm) => dimensionNames.includes(dm.name)),
|
|
119
111
|
};
|
|
120
112
|
});
|
|
121
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseSchemaFormatter.js","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;AAEpC,4DAA8H;AAC9H,oEAAiE;AACjE,wEAAqE;AAOrE,MAAsB,mBAAmB;IAGvC,YACqB,QAAwB,EACxB,MAAW;QADX,aAAQ,GAAR,QAAQ,CAAgB;QACxB,WAAM,GAAN,MAAM,CAAK;QAE9B,IAAI,CAAC,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IAQM,yBAAyB,CAC9B,UAAuB,EACvB,gBAA+B,EAAE;QAEjC,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAC9D,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAClE,CAAC;QAEF,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAC3C,QAAQ,EAAE,GAAG,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;YACvD,OAAO,EAAE,IAAI,CAAC,UAAU,CACtB,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,aAAa,CAAC,CAC1D;SACF,CAAC,CAAC,CAAC;IACN,CAAC;IAEM,8BAA8B,CACnC,eAAiC,EACjC,gBAA+B,EAAE;QAEjC,OAAO,IAAI,CAAC,gCAAgC,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAClF,QAAQ,EAAE,GAAG,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;YACvD,OAAO,EAAE,IAAI,CAAC,UAAU,CACtB,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,aAAa,CAAC,CAC1D;SACF,CAAC,CAAC,CAAC;IACN,CAAC;IAES,YAAY,CAAC,CAAC;QACtB,OAAO,GACL,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC;YACpE,CAAC;gBACD,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG;YAChC,CAAC,CAAC,EACN,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;IAC/B,CAAC;IAES,WAAW,CAAC,CAAC;QACrB,OAAO,oBAAU,CAAC,QAAQ,CAAC,oBAAU,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YACnE,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,CAAC,CAAC,KAAK;YACT,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAES,UAAU,CAAC,MAAM;QACzB,OAAO,oBAAU,CAAC,QAAQ,CACxB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,EACzD,IAAI,CACL,CAAC;IACJ,CAAC;IAES,UAAU,CAAC,IAAI;QACvB,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAES,kBAAkB,CAAC,IAAY;QACvC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACtC,CAAC;IAEM,wBAAwB,CAAC,WAAwB,EAAE,gBAA+B,EAAE
|
|
1
|
+
{"version":3,"file":"BaseSchemaFormatter.js","sourceRoot":"","sources":["../../../../src/scaffolding/formatters/BaseSchemaFormatter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,19 +2,17 @@
|
|
|
2
2
|
"name": "@cubejs-backend/schema-compiler",
|
|
3
3
|
"description": "Cube.js schema compiler",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.
|
|
5
|
+
"version": "0.32.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.js.git",
|
|
9
9
|
"directory": "packages/cubejs-schema-compiler"
|
|
10
10
|
},
|
|
11
11
|
"engines": {
|
|
12
|
-
"node": "^
|
|
12
|
+
"node": "^14.0.0 || ^16.0.0 || >=17.0.0"
|
|
13
13
|
},
|
|
14
14
|
"files": [
|
|
15
|
-
"dist/src"
|
|
16
|
-
"adapter",
|
|
17
|
-
"scaffolding"
|
|
15
|
+
"dist/src"
|
|
18
16
|
],
|
|
19
17
|
"main": "dist/src/index.js",
|
|
20
18
|
"typings": "dist/src/index.d.ts",
|
|
@@ -42,7 +40,7 @@
|
|
|
42
40
|
"@babel/standalone": "^7.12.10",
|
|
43
41
|
"@babel/traverse": "^7.12.10",
|
|
44
42
|
"@babel/types": "^7.12.12",
|
|
45
|
-
"@cubejs-backend/shared": "^0.
|
|
43
|
+
"@cubejs-backend/shared": "^0.32.0",
|
|
46
44
|
"@hapi/joi": "^17.1.1",
|
|
47
45
|
"antlr4ts": "0.5.0-alpha.4",
|
|
48
46
|
"camelcase": "^6.2.0",
|
|
@@ -59,8 +57,8 @@
|
|
|
59
57
|
},
|
|
60
58
|
"devDependencies": {
|
|
61
59
|
"@apla/clickhouse": "^1.5.5",
|
|
62
|
-
"@cubejs-backend/linter": "^0.
|
|
63
|
-
"@cubejs-backend/query-orchestrator": "^0.
|
|
60
|
+
"@cubejs-backend/linter": "^0.32.0",
|
|
61
|
+
"@cubejs-backend/query-orchestrator": "^0.32.0",
|
|
64
62
|
"@types/babel__code-frame": "^7.0.2",
|
|
65
63
|
"@types/babel__generator": "^7.6.2",
|
|
66
64
|
"@types/babel__parser": "^7.1.1",
|
|
@@ -69,7 +67,7 @@
|
|
|
69
67
|
"@types/inflection": "^1.5.28",
|
|
70
68
|
"@types/jest": "^26.0.20",
|
|
71
69
|
"@types/lru-cache": "^5.1.0",
|
|
72
|
-
"@types/node": "^
|
|
70
|
+
"@types/node": "^14",
|
|
73
71
|
"@types/ramda": "^0.27.34",
|
|
74
72
|
"@types/sqlstring": "^2.3.0",
|
|
75
73
|
"@types/syntax-error": "^1.4.1",
|
|
@@ -103,5 +101,5 @@
|
|
|
103
101
|
".*\\.d\\.ts"
|
|
104
102
|
]
|
|
105
103
|
},
|
|
106
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "42f54aed393b75c93704f6205c123bf325639923"
|
|
107
105
|
}
|
package/adapter/BaseDimension.js
DELETED
package/adapter/BaseFilter.js
DELETED
package/adapter/BaseMeasure.js
DELETED
package/adapter/BaseQuery.js
DELETED
package/adapter/BaseSegment.js
DELETED
package/adapter/MssqlQuery.js
DELETED
package/adapter/MysqlQuery.js
DELETED
package/adapter/OracleQuery.js
DELETED
package/adapter/PostgresQuery.js
DELETED