@cubejs-backend/schema-compiler 0.29.21 → 0.29.22
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/CHANGELOG.md +8 -0
- package/dist/src/scaffolding/ScaffoldingSchema.d.ts +3 -2
- package/dist/src/scaffolding/ScaffoldingSchema.d.ts.map +1 -1
- package/dist/src/scaffolding/ScaffoldingSchema.js.map +1 -1
- package/dist/src/scaffolding/ScaffoldingTemplate.d.ts +3 -3
- package/dist/src/scaffolding/ScaffoldingTemplate.d.ts.map +1 -1
- package/dist/src/scaffolding/ScaffoldingTemplate.js +2 -2
- package/dist/src/scaffolding/ScaffoldingTemplate.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
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.29.22](https://github.com/cube-js/cube.js/compare/v0.29.21...v0.29.22) (2022-01-21)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @cubejs-backend/schema-compiler
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
## [0.29.21](https://github.com/cube-js/cube.js/compare/v0.29.20...v0.29.21) (2022-01-17)
|
|
7
15
|
|
|
8
16
|
|
|
@@ -35,6 +35,7 @@ export declare type CubeDescriptor = {
|
|
|
35
35
|
members: CubeDescriptorMember[];
|
|
36
36
|
joins: Join[];
|
|
37
37
|
};
|
|
38
|
+
export declare type DatabaseSchema = Record<string, Record<string, any>>;
|
|
38
39
|
declare type ScaffoldingSchemaOptions = {
|
|
39
40
|
includeNonDictionaryMeasures?: boolean;
|
|
40
41
|
};
|
|
@@ -42,7 +43,7 @@ export declare class ScaffoldingSchema {
|
|
|
42
43
|
private readonly dbSchema;
|
|
43
44
|
private readonly options;
|
|
44
45
|
private tableNamesToTables;
|
|
45
|
-
constructor(dbSchema:
|
|
46
|
+
constructor(dbSchema: DatabaseSchema, options?: ScaffoldingSchemaOptions);
|
|
46
47
|
cubeDescriptors(tableNames: TableName[]): CubeDescriptor[];
|
|
47
48
|
generateForTables(tableNames: TableName[]): {
|
|
48
49
|
cube: string;
|
|
@@ -56,7 +57,7 @@ export declare class ScaffoldingSchema {
|
|
|
56
57
|
}[];
|
|
57
58
|
protected prepareTableNamesToTables(tableNames: TableName[]): void;
|
|
58
59
|
resolveTableDefinition(tableName: TableName): any;
|
|
59
|
-
protected tableSchema(tableName: TableName, includeJoins:
|
|
60
|
+
protected tableSchema(tableName: TableName, includeJoins: boolean): {
|
|
60
61
|
cube: string;
|
|
61
62
|
tableName: TableName;
|
|
62
63
|
schema: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaffoldingSchema.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":"AAIA,aAAK,UAAU;IACb,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,oBAAY,UAAU;IACpB,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,IAAI,SAAS;CACd;AAED,oBAAY,SAAS,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAElD,aAAK,gBAAgB,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,CAAC;AAE3D,oBAAY,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,aAAK,IAAI,GAAG;IACV,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,gBAAgB,CAAC;CAChC,CAAC;AAEF,oBAAY,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,oBAAoB,EAAE,CAAC;IAChC,KAAK,EAAE,IAAI,EAAE,CAAC;CACf,CAAC;AAmCF,aAAK,wBAAwB,GAAG;IAC9B,4BAA4B,CAAC,EAAE,OAAO,CAAC;CACxC,CAAC;AAEF,qBAAa,iBAAiB;IAI1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJ1B,OAAO,CAAC,kBAAkB,CAAM;gBAGb,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"ScaffoldingSchema.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":"AAIA,aAAK,UAAU;IACb,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,oBAAY,UAAU;IACpB,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,IAAI,SAAS;CACd;AAED,oBAAY,SAAS,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAElD,aAAK,gBAAgB,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,CAAC;AAE3D,oBAAY,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,aAAK,IAAI,GAAG;IACV,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,gBAAgB,CAAC;CAChC,CAAC;AAEF,oBAAY,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,oBAAoB,EAAE,CAAC;IAChC,KAAK,EAAE,IAAI,EAAE,CAAC;CACf,CAAC;AAmCF,oBAAY,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;AAEjE,aAAK,wBAAwB,GAAG;IAC9B,4BAA4B,CAAC,EAAE,OAAO,CAAC;CACxC,CAAC;AAEF,qBAAa,iBAAiB;IAI1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJ1B,OAAO,CAAC,kBAAkB,CAAM;gBAGb,QAAQ,EAAE,cAAc,EACxB,OAAO,GAAE,wBAA6B;IAIlD,eAAe,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,cAAc,EAAE;IAqB1D,iBAAiB,CAAC,UAAU,EAAE,SAAS,EAAE;;;;;;;;;;IAKhD,SAAS,CAAC,yBAAyB,CAAC,UAAU,EAAE,SAAS,EAAE;IAuBpD,sBAAsB,CAAC,SAAS,EAAE,SAAS;IAWlD,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO;;;;;;;;;;IAiBjE,SAAS,CAAC,cAAc,CAAC,SAAS,KAAA;IAalC,SAAS,CAAC,UAAU,CAAC,eAAe,KAAA;IAgBpC,SAAS,CAAC,cAAc,CAAC,eAAe,KAAA;IAaxC,SAAS,CAAC,qBAAqB,CAAC,MAAM,KAAA;IAItC,SAAS,CAAC,gBAAgB,CAAC,eAAe,EAAE,GAAG;IAmB/C,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,eAAe,KAAA;IAuCrD,SAAS,CAAC,YAAY,CAAC,UAAU,KAAA;IAIjC,SAAS,CAAC,0BAA0B,CAAC,SAAS,KAAA;IAI9C,SAAS,CAAC,eAAe,CAAC,MAAM,KAAA,GAAG,MAAM;IAWzC,SAAS,CAAC,UAAU,CAAC,MAAM,KAAA,GAAG,UAAU;CAWzC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaffoldingSchema.js","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;AACpC,kDAAsB;AACtB,0CAAwC;AAExC,IAAK,UAIJ;AAJD,WAAK,UAAU;IACb,2BAAa,CAAA;IACb,+BAAiB,CAAA;IACjB,+BAAiB,CAAA;AACnB,CAAC,EAJI,UAAU,KAAV,UAAU,QAId;AAED,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,iCAAmB,CAAA;IACnB,qCAAuB,CAAA;IACvB,2BAAa,CAAA;AACf,CAAC,EAJW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAIrB;AAkCD,MAAM,kBAAkB,GAAG;IACzB,QAAQ;IACR,OAAO;IACP,OAAO;IACP,SAAS;IACT,OAAO;IACP,QAAQ;IACR,MAAM;IACN,KAAK;IACL,UAAU;IACV,UAAU;IACV,OAAO;CACR,CAAC;AAEF,MAAM,wBAAwB,GAAG;IAC/B,IAAI;IACJ,MAAM;IACN,OAAO;IACP,WAAW;IACX,YAAY;IACZ,UAAU;IACV,WAAW;IACX,WAAW;IACX,YAAY;IACZ,SAAS;IACT,WAAW;IACX,MAAM;IACN,SAAS;IACT,MAAM;CACP,CAAC;AAEF,MAAM,OAAO,GAAG,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"ScaffoldingSchema.js","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CubeDescriptor, TableName } from './ScaffoldingSchema';
|
|
1
|
+
import { CubeDescriptor, DatabaseSchema, TableName } from './ScaffoldingSchema';
|
|
2
2
|
import { ValueWithComments } from './ValueWithComments';
|
|
3
3
|
declare type SchemaContext = {
|
|
4
4
|
dataSource?: string;
|
|
@@ -7,14 +7,14 @@ export declare class ScaffoldingTemplate {
|
|
|
7
7
|
private readonly dbSchema;
|
|
8
8
|
private readonly driver;
|
|
9
9
|
private readonly scaffoldingSchema;
|
|
10
|
-
constructor(dbSchema:
|
|
10
|
+
constructor(dbSchema: DatabaseSchema, driver: any);
|
|
11
11
|
protected escapeName(name: any): any;
|
|
12
12
|
protected eligibleIdentifier(name: string): boolean;
|
|
13
13
|
generateFilesByTableNames(tableNames: TableName[], schemaContext?: SchemaContext): {
|
|
14
14
|
fileName: string;
|
|
15
15
|
content: string;
|
|
16
16
|
}[];
|
|
17
|
-
generateFilesByCubeDescriptors(cubeDescriptors: CubeDescriptor[], schemaContext?:
|
|
17
|
+
generateFilesByCubeDescriptors(cubeDescriptors: CubeDescriptor[], schemaContext?: SchemaContext): {
|
|
18
18
|
fileName: string;
|
|
19
19
|
content: string;
|
|
20
20
|
}[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaffoldingTemplate.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"ScaffoldingTemplate.d.ts","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAwB,cAAc,EAAiC,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErI,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,aAAK,aAAa,GAAG;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAaF,qBAAa,mBAAmB;IAGX,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAkB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFrF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;gBAElB,QAAQ,EAAE,cAAc,EAAmB,MAAM,KAAA;IAIrF,SAAS,CAAC,UAAU,CAAC,IAAI,KAAA;IAOzB,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM;IAIlC,yBAAyB,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,aAAa,GAAE,aAAkB;;;;IAUpF,8BAA8B,CAAC,eAAe,EAAE,cAAc,EAAE,EAAE,aAAa,GAAE,aAAkB;;;;IA4B1G,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS;IA8BxC,wBAAwB,CAAC,WAAW,KAAA,EAAE,aAAa,GAAE,aAAkB;;;;;;;;;IAsC9E,SAAS,CAAC,YAAY,CAAC,CAAC,KAAA;IAKxB,SAAS,CAAC,WAAW,CAAC,CAAC,KAAA;IAIvB,SAAS,CAAC,UAAU,CAAC,MAAM,KAAA;IAI3B,SAAS,CAAC,UAAU,CAAC,cAAc,KAAA;IAKnC,SAAS,CAAC,MAAM,CAAC,UAAU,KAAA,EAAE,KAAK,KAAA,EAAE,aAAa,SAAK;CA8BvD"}
|
|
@@ -41,7 +41,7 @@ class ScaffoldingTemplate {
|
|
|
41
41
|
const tableNames = cubeDescriptors.map(({ tableName }) => tableName);
|
|
42
42
|
const generatedSchemaForTables = this.scaffoldingSchema.generateForTables(tableNames.map(n => this.resolveTableName(n)));
|
|
43
43
|
const schemaForTables = cubeDescriptors.map((descriptor) => {
|
|
44
|
-
const generatedDescriptor = generatedSchemaForTables.find(({ cube }) => descriptor.cube);
|
|
44
|
+
const generatedDescriptor = generatedSchemaForTables.find(({ cube }) => cube === descriptor.cube);
|
|
45
45
|
const cubeMembers = descriptor.members.reduce((memo, member) => ({
|
|
46
46
|
measures: [...memo.measures].concat(member.memberType === ScaffoldingSchema_1.MemberType.Measure ? [member] : []),
|
|
47
47
|
dimensions: [...memo.dimensions].concat(member.memberType === ScaffoldingSchema_1.MemberType.Dimension ? [member] : []),
|
|
@@ -50,8 +50,8 @@ class ScaffoldingTemplate {
|
|
|
50
50
|
dimensions: []
|
|
51
51
|
});
|
|
52
52
|
return {
|
|
53
|
-
...descriptor,
|
|
54
53
|
...generatedDescriptor,
|
|
54
|
+
...descriptor,
|
|
55
55
|
...cubeMembers
|
|
56
56
|
};
|
|
57
57
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaffoldingTemplate.js","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingTemplate.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"ScaffoldingTemplate.js","sourceRoot":"","sources":["../../../src/scaffolding/ScaffoldingTemplate.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/schema-compiler",
|
|
3
3
|
"description": "Cube.js schema compiler",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.29.
|
|
5
|
+
"version": "0.29.22",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.js.git",
|
|
@@ -102,5 +102,5 @@
|
|
|
102
102
|
".*\\.d\\.ts"
|
|
103
103
|
]
|
|
104
104
|
},
|
|
105
|
-
"gitHead": "
|
|
105
|
+
"gitHead": "25d5a284d6a7cdfa8bd9671bd2fa2498f9c79863"
|
|
106
106
|
}
|