@cubejs-backend/schema-compiler 0.35.76 → 0.35.77

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.
@@ -19,6 +19,7 @@ export class JoinGraph {
19
19
  [index: number]: unknown;
20
20
  };
21
21
  buildJoin(cubesToJoin: any): any;
22
+ cubeFromPath(cubePath: any): any;
22
23
  buildJoinTreeForRoot(root: any, cubesToJoin: any): {
23
24
  joins: any[];
24
25
  root: any;
@@ -1 +1 @@
1
- {"version":3,"file":"JoinGraph.d.ts","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.js"],"names":[],"mappings":"AAIA;IACE;;;OAGG;IACH,2BAHW,OAAO,iBAAiB,EAAE,aAAa,iBACvC,OAAO,iBAAiB,EAAE,aAAa,EAQjD;IALC,uDAAkC;IAClC,uDAAkC;IAClC,UAAe;IACf,UAAe;IACf,eAAoB;IAGtB,8CAqBC;IARC;;oBAMa;IACb,WAAkC;IAGpC,mDA+CC;IAED;;MAMC;IAED,iCAwBC;IAED;;;aAkDC;IAED,4DAsBC;IAED,qDAGC;IAED,8BAEC;IAED,0BAWC;IAHG,0CAA2C;IAK/C,2EASC;CACF"}
1
+ {"version":3,"file":"JoinGraph.d.ts","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.js"],"names":[],"mappings":"AAIA;IACE;;;OAGG;IACH,2BAHW,OAAO,iBAAiB,EAAE,aAAa,iBACvC,OAAO,iBAAiB,EAAE,aAAa,EAQjD;IALC,uDAAkC;IAClC,uDAAkC;IAClC,UAAe;IACf,UAAe;IACf,eAAoB;IAGtB,8CAqBC;IARC;;oBAMa;IACb,WAAkC;IAGpC,mDA+CC;IAED;;MAMC;IAED,iCAwBC;IAED,iCAKC;IAED;;;aAmDC;IAED,4DAsBC;IAED,qDAGC;IAED,8BAEC;IAED,0BAWC;IAHG,0CAA2C;IAK/C,2EASC;CACF"}
@@ -71,11 +71,17 @@ class JoinGraph {
71
71
  throw new UserError_1.UserError(`Can't find join path to join ${cubesToJoin.map(v => `'${v}'`).join(', ')}`);
72
72
  }
73
73
  this.builtJoins[key] = Object.assign(join, {
74
- multiplicationFactor: ramda_1.default.compose(ramda_1.default.fromPairs, ramda_1.default.map(v => [v, this.findMultiplicationFactorFor(v, join.joins)]))(cubesToJoin)
74
+ multiplicationFactor: ramda_1.default.compose(ramda_1.default.fromPairs, ramda_1.default.map(v => [this.cubeFromPath(v), this.findMultiplicationFactorFor(this.cubeFromPath(v), join.joins)]))(cubesToJoin)
75
75
  });
76
76
  }
77
77
  return this.builtJoins[key];
78
78
  }
79
+ cubeFromPath(cubePath) {
80
+ if (Array.isArray(cubePath)) {
81
+ return cubePath[cubePath.length - 1];
82
+ }
83
+ return cubePath;
84
+ }
79
85
  buildJoinTreeForRoot(root, cubesToJoin) {
80
86
  const self = this;
81
87
  if (Array.isArray(root)) {
@@ -93,6 +99,7 @@ class JoinGraph {
93
99
  let prevNode = root;
94
100
  return joinHints.filter(toJoin => toJoin !== prevNode).map(toJoin => {
95
101
  if (nodesJoined[toJoin]) {
102
+ prevNode = toJoin;
96
103
  return { joins: [] };
97
104
  }
98
105
  const path = this.graph.path(prevNode, toJoin);
@@ -1 +1 @@
1
- {"version":3,"file":"JoinGraph.js","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JoinGraph.js","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.js"],"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": "0.35.76",
5
+ "version": "0.35.77",
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.24",
41
41
  "@babel/traverse": "^7.24",
42
42
  "@babel/types": "^7.24",
43
- "@cubejs-backend/native": "^0.35.76",
43
+ "@cubejs-backend/native": "^0.35.77",
44
44
  "@cubejs-backend/shared": "^0.35.67",
45
45
  "antlr4ts": "0.5.0-alpha.4",
46
46
  "camelcase": "^6.2.0",
@@ -101,5 +101,5 @@
101
101
  ],
102
102
  "globalSetup": "<rootDir>/dist/test/global-setup.js"
103
103
  },
104
- "gitHead": "7538fe6ffc6a68e02a834be680fb9e976b9a8d05"
104
+ "gitHead": "6dce51b3add30d3bf69a6d56e695d9e4d478348e"
105
105
  }