@cubejs-backend/schema-compiler 1.7.39 → 1.7.40

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 (5) hide show
  1. package/dist/src/compiler/JoinGraph.d.ts +5 -0
  2. package/dist/src/compiler/JoinGraph.d.ts.map +1 -1
  3. package/dist/src/compiler/JoinGraph.js +39 -0
  4. package/dist/src/compiler/JoinGraph.js.map +1 -1
  5. package/package.json +7 -7
package/dist/src/compiler/JoinGraph.d.ts CHANGED
@@ -32,6 +32,11 @@ export declare class JoinGraph implements CompilerInterface {
32
32
  constructor(cubeValidator: CubeValidator, cubeEvaluator: CubeEvaluator);
33
33
  compile(cubes: unknown, errorReporter: ErrorReporter): void;
34
34
  protected buildJoinEdges(cube: CubeDefinition, errorReporter: ErrorReporter): Array<[string, JoinEdge]>;
35
+ /**
36
+ * Only one edge per pair of cubes fits into the graph, so several declarations
37
+ * for the same pair would leave the join path ambiguous.
38
+ */
39
+ protected reportDuplicateJoinTargets(cube: CubeDefinition, errorReporter: ErrorReporter): Set<string>;
35
40
  protected buildJoinNode(cube: CubeDefinition): Record<string, 1>;
36
41
  buildJoin(cubesToJoin: JoinHints): FinishedJoinTree | null;
37
42
  protected cubeFromPath(cubePath: any): any;
package/dist/src/compiler/JoinGraph.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"JoinGraph.d.ts","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAqB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,aAAa,GAAG,QAAQ,EAAE,CAAC;AAEhC,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,aAAa,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IACxC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;AAEzC,MAAM,MAAM,SAAS,GAAG,QAAQ,EAAE,CAAC;AAEnC,qBAAa,SAAU,YAAW,iBAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAE9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAG9C,OAAO,CAAC,KAAK,CAAoC;IAGjD,OAAO,CAAC,eAAe,CAAoC;IAE3D,OAAO,CAAC,KAAK,CAA2B;IAExC,OAAO,CAAC,UAAU,CAAmC;IAErD,OAAO,CAAC,KAAK,CAAe;IAE5B,OAAO,CAAC,yBAAyB,CAAgC;gBAE9C,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa;IAWtE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,GAAG,IAAI;IAgDlE,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAkDvG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAWzD,SAAS,CAAC,WAAW,EAAE,SAAS,GAAG,gBAAgB,GAAG,IAAI;IAuCjE,SAAS,CAAC,YAAY,CAAC,QAAQ,KAAA;IAO/B,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI;IAiFvF,SAAS,CAAC,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO;IAwBlF,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO;IAKtE,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE;IAI1C,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAapD,SAAS,CAAC,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;CAU9G"}
1
+ {"version":3,"file":"JoinGraph.d.ts","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAqB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,aAAa,GAAG,QAAQ,EAAE,CAAC;AAEhC,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,aAAa,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IACxC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;AAEzC,MAAM,MAAM,SAAS,GAAG,QAAQ,EAAE,CAAC;AAEnC,qBAAa,SAAU,YAAW,iBAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAE9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAG9C,OAAO,CAAC,KAAK,CAAoC;IAGjD,OAAO,CAAC,eAAe,CAAoC;IAE3D,OAAO,CAAC,KAAK,CAA2B;IAExC,OAAO,CAAC,UAAU,CAAmC;IAErD,OAAO,CAAC,KAAK,CAAe;IAE5B,OAAO,CAAC,yBAAyB,CAAgC;gBAE9C,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa;IAWtE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,GAAG,IAAI;IAgDlE,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IA0DvG;;;OAGG;IACH,SAAS,CAAC,0BAA0B,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC;IAsCrG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAWzD,SAAS,CAAC,WAAW,EAAE,SAAS,GAAG,gBAAgB,GAAG,IAAI;IAuCjE,SAAS,CAAC,YAAY,CAAC,QAAQ,KAAA;IAO/B,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI;IAiFvF,SAAS,CAAC,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO;IAwBlF,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO;IAKtE,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE;IAI1C,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAapD,SAAS,CAAC,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;CAU9G"}
package/dist/src/compiler/JoinGraph.js CHANGED
@@ -62,8 +62,14 @@ class JoinGraph {
62
62
  ['sum', 'avg', 'count', 'number'].includes(m.type));
63
63
  };
64
64
  const joinRequired = (v) => `primary key for '${v}' is required when join is defined in order to make aggregates work properly`;
65
+ const duplicates = this.reportDuplicateJoinTargets(cube, errorReporter);
65
66
  return cube.joins
66
67
  .filter(join => {
68
+ // Which of the conflicting declarations was meant is unknowable, so none
69
+ // of them becomes an edge
70
+ if (duplicates.has(join.name)) {
71
+ return false;
72
+ }
67
73
  if (!this.cubeEvaluator.cubeExists(join.name)) {
68
74
  errorReporter.error(`Cube ${join.name} doesn't exist`);
69
75
  return false;
@@ -91,6 +97,39 @@ class JoinGraph {
91
97
  return [`${cube.name}-${join.name}`, joinEdge];
92
98
  });
93
99
  }
100
+ /**
101
+ * Only one edge per pair of cubes fits into the graph, so several declarations
102
+ * for the same pair would leave the join path ambiguous.
103
+ */
104
+ reportDuplicateJoinTargets(cube, errorReporter) {
105
+ const duplicates = new Set();
106
+ // The raw definition, not `cube.joins`: `extends` merges the parent's joins
107
+ // in, and a child redeclaring one of them is a supported override. Duplicates
108
+ // a parent declares are reported and dropped on the parent's own edges; a
109
+ // cube extending it still resolves through one of them
110
+ const ownJoins = this.cubeEvaluator.cubeDefinitions[cube.name]?.joins;
111
+ // The map form is keyed by the joined cube name and can not hold duplicates
112
+ if (!Array.isArray(ownJoins)) {
113
+ return duplicates;
114
+ }
115
+ const declarationsByCube = new Map();
116
+ ownJoins.forEach((join, index) => {
117
+ if (!join?.name) {
118
+ return;
119
+ }
120
+ const declarations = declarationsByCube.get(join.name) ?? [];
121
+ declarations.push(index);
122
+ declarationsByCube.set(join.name, declarations);
123
+ });
124
+ for (const [joinedCube, indexes] of declarationsByCube.entries()) {
125
+ if (indexes.length > 1) {
126
+ duplicates.add(joinedCube);
127
+ const declarations = indexes.map(index => `joins[${index}]`).join(', ');
128
+ errorReporter.error(`Cube '${cube.name}' declares ${indexes.length} joins to '${joinedCube}' (${declarations}). Only one join per pair of cubes is supported. Keep a single join to '${joinedCube}', or use extends to create a child cube of '${joinedCube}' and join that instead`, cube.fileName);
129
+ }
130
+ }
131
+ return duplicates;
132
+ }
94
133
  buildJoinNode(cube) {
95
134
  if (!cube.joins) {
96
135
  return {};
package/dist/src/compiler/JoinGraph.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"JoinGraph.js","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JoinGraph.js","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.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 schema compiler",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "1.7.39",
5
+ "version": "1.7.40",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/cube-js/cube.git",
@@ -38,8 +38,8 @@
38
38
  "@babel/standalone": "^7.24",
39
39
  "@babel/traverse": "^7.24",
40
40
  "@babel/types": "^7.24",
41
- "@cubejs-backend/native": "1.7.39",
42
- "@cubejs-backend/shared": "1.7.39",
41
+ "@cubejs-backend/native": "1.7.40",
42
+ "@cubejs-backend/shared": "1.7.40",
43
43
  "antlr4": "^4.13.2",
44
44
  "camelcase": "^6.2.0",
45
45
  "cron-parser": "^4.9.0",
@@ -58,9 +58,9 @@
58
58
  },
59
59
  "devDependencies": {
60
60
  "@clickhouse/client": "^1.23.1",
61
- "@cubejs-backend/linter": "1.7.39",
62
- "@cubejs-backend/mssql-driver": "1.7.39",
63
- "@cubejs-backend/query-orchestrator": "1.7.39",
61
+ "@cubejs-backend/linter": "1.7.40",
62
+ "@cubejs-backend/mssql-driver": "1.7.40",
63
+ "@cubejs-backend/query-orchestrator": "1.7.40",
64
64
  "@types/babel__code-frame": "^7.0.6",
65
65
  "@types/babel__generator": "^7.6.8",
66
66
  "@types/babel__traverse": "^7.20.5",
@@ -83,5 +83,5 @@
83
83
  "typescript": "~6.0.3"
84
84
  },
85
85
  "license": "Apache-2.0",
86
- "gitHead": "1acb83d943046de04efa488429a8312d05ecf204"
86
+ "gitHead": "c4f66278c24bf634aca1c1b23c0c2e7d06d901b6"
87
87
  }