@@ -10,8 +10,6 @@ import { CompilerInterface } from './PrepareCompiler';
10
10
11
11
type JoinEdge = {
12
12
join : JoinDefinition ,
13
- from : string ,
14
- to : string ,
15
13
originalFrom : string ,
16
14
originalTo : string ,
17
15
} ;
@@ -86,8 +84,8 @@ export class JoinGraph implements CompilerInterface {
86
84
> (
87
85
// This requires @types /[email protected] or newer
88
86
// @ts -ignore
89
- R . map ( groupedByFrom => R . fromPairs ( groupedByFrom . map ( join => [ join . to , 1 ] ) ) ) ,
90
- R . groupBy ( ( join : JoinEdge ) => join . from ) ,
87
+ R . map ( groupedByFrom => R . fromPairs ( groupedByFrom . map ( join => [ join . originalTo , 1 ] ) ) ) ,
88
+ R . groupBy ( ( join : JoinEdge ) => join . originalFrom ) ,
91
89
R . map ( v => v [ 1 ] ) ,
92
90
R . toPairs
93
91
// @ts -ignore
@@ -96,12 +94,12 @@ export class JoinGraph implements CompilerInterface {
96
94
// @ts -ignore
97
95
this . undirectedNodes = R . compose (
98
96
// @ts -ignore
99
- R . map ( groupedByFrom => R . fromPairs ( groupedByFrom . map ( join => [ join . from , 1 ] ) ) ) ,
97
+ R . map ( groupedByFrom => R . fromPairs ( groupedByFrom . map ( join => [ join . originalFrom , 1 ] ) ) ) ,
100
98
// @ts -ignore
101
- R . groupBy ( join => join . to ) ,
99
+ R . groupBy ( join => join . originalTo ) ,
102
100
R . unnest ,
103
101
// @ts -ignore
104
- R . map ( v => [ v [ 1 ] , { from : v [ 1 ] . to , to : v [ 1 ] . from } ] ) ,
102
+ R . map ( v => [ v [ 1 ] , { originalFrom : v [ 1 ] . originalTo , originalTo : v [ 1 ] . originalFrom } ] ) ,
105
103
R . toPairs
106
104
// @ts -ignore
107
105
) ( this . edges ) ;
@@ -149,8 +147,6 @@ export class JoinGraph implements CompilerInterface {
149
147
. map ( join => {
150
148
const joinEdge : JoinEdge = {
151
149
join,
152
- from : cube . name ,
153
- to : join . name ,
154
150
originalFrom : cube . name ,
155
151
originalTo : join . name
156
152
} ;
@@ -295,9 +291,9 @@ export class JoinGraph implements CompilerInterface {
295
291
}
296
292
visited [ currentCube ] = true ;
297
293
function nextNode ( nextJoin : JoinEdge ) : string {
298
- return nextJoin . from === currentCube ? nextJoin . to : nextJoin . from ;
294
+ return nextJoin . originalFrom === currentCube ? nextJoin . originalTo : nextJoin . originalFrom ;
299
295
}
300
- const nextJoins = joins . filter ( j => j . from === currentCube || j . to === currentCube ) ;
296
+ const nextJoins = joins . filter ( j => j . originalFrom === currentCube || j . originalTo === currentCube ) ;
301
297
if ( nextJoins . find (
302
298
nextJoin => self . checkIfCubeMultiplied ( currentCube , nextJoin ) && ! visited [ nextNode ( nextJoin ) ]
303
299
) ) {
@@ -311,8 +307,8 @@ export class JoinGraph implements CompilerInterface {
311
307
}
312
308
313
309
protected checkIfCubeMultiplied ( cube : string , join : JoinEdge ) : boolean {
314
- return join . from === cube && join . join . relationship === 'hasMany' ||
315
- join . to === cube && join . join . relationship === 'belongsTo' ;
310
+ return join . originalFrom === cube && join . join . relationship === 'hasMany' ||
311
+ join . originalTo === cube && join . join . relationship === 'belongsTo' ;
316
312
}
317
313
318
314
protected joinsByPath ( path : string [ ] ) : JoinEdge [ ] {
0 commit comments