File tree Expand file tree Collapse file tree 12 files changed +71
-67
lines changed Expand file tree Collapse file tree 12 files changed +71
-67
lines changed Original file line number Diff line number Diff line change 1
- import { provide } from "inversify-binding-decorators" ;
2
1
import { DBTGraphType } from "./graphParser" ;
3
2
4
- @provide ( ChildrenParentParser )
5
3
export class ChildrenParentParser {
6
4
createChildrenParentMetaMap (
7
5
nodesMap : any [ ] ,
Original file line number Diff line number Diff line change 1
1
import { readFileSync } from "fs" ;
2
- import { provide } from "inversify-binding-decorators" ;
3
2
import { DBTTerminal } from "../terminal" ;
4
3
import { DocMetaMap } from "../domain" ;
5
- import { inject } from "inversify" ;
6
4
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter" ;
7
5
import { createFullPathForNode } from "./utils" ;
8
6
9
- @provide ( DocParser )
10
7
export class DocParser {
11
- constructor (
12
- @inject ( "DBTTerminal" )
13
- private terminal : DBTTerminal ,
14
- ) { }
8
+ constructor ( private terminal : DBTTerminal ) { }
15
9
16
10
createDocMetaMap (
17
11
docs : any ,
Original file line number Diff line number Diff line change 1
- import { provide } from "inversify-binding-decorators" ;
2
1
import * as path from "path" ;
3
2
import { ExposureMetaMap } from "../domain" ;
4
3
import { DBTTerminal } from "../terminal" ;
5
- import { inject } from "inversify" ;
6
4
import { RESOURCE_TYPE_EXPOSURE } from "../dbtIntegration" ;
7
5
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter" ;
8
6
9
- @provide ( ExposureParser )
10
7
export class ExposureParser {
11
- constructor (
12
- @inject ( "DBTTerminal" )
13
- private terminal : DBTTerminal ,
14
- ) { }
8
+ constructor ( private terminal : DBTTerminal ) { }
15
9
16
10
createExposureMetaMap (
17
11
exposuresMap : any [ ] ,
Original file line number Diff line number Diff line change 1
- import { provide } from "inversify-binding-decorators" ;
2
1
import {
3
2
Analysis ,
4
3
Exposure ,
@@ -17,7 +16,6 @@ import {
17
16
TestMetaMap ,
18
17
} from "../domain" ;
19
18
import { DBTTerminal } from "../terminal" ;
20
- import { inject } from "inversify" ;
21
19
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter" ;
22
20
23
21
const notEmpty = < T > ( value : T | null | undefined ) : value is T => {
@@ -28,12 +26,8 @@ export type DBTGraphType = {
28
26
[ name : string ] : string [ ] ;
29
27
} ;
30
28
31
- @provide ( GraphParser )
32
29
export class GraphParser {
33
- constructor (
34
- @inject ( "DBTTerminal" )
35
- private terminal : DBTTerminal ,
36
- ) { }
30
+ constructor ( private terminal : DBTTerminal ) { }
37
31
38
32
createGraphMetaMap (
39
33
project : DBTIntegrationAdapter ,
Original file line number Diff line number Diff line change 1
1
import { readFileSync } from "fs" ;
2
- import { provide } from "inversify-binding-decorators" ;
3
2
import { DBTTerminal } from "../terminal" ;
4
3
import { MacroMetaMap } from "../domain" ;
5
- import { inject } from "inversify" ;
6
4
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter" ;
7
5
import { createFullPathForNode } from "./utils" ;
8
6
9
- @provide ( MacroParser )
10
7
export class MacroParser {
11
- constructor (
12
- @inject ( "DBTTerminal" )
13
- private terminal : DBTTerminal ,
14
- ) { }
8
+ constructor ( private terminal : DBTTerminal ) { }
15
9
16
10
createMacroMetaMap (
17
11
macros : any [ ] ,
Original file line number Diff line number Diff line change 1
- import { provide } from "inversify-binding-decorators" ;
2
1
import { DBTTerminal } from "../terminal" ;
3
2
import { MetricMetaMap } from "../domain" ;
4
- import { inject } from "inversify" ;
5
3
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter" ;
6
4
7
- @provide ( MetricParser )
8
5
export class MetricParser {
9
- constructor (
10
- @inject ( "DBTTerminal" )
11
- private terminal : DBTTerminal ,
12
- ) { }
6
+ constructor ( private terminal : DBTTerminal ) { }
13
7
14
8
createMetricMetaMap (
15
9
metrics : any [ ] ,
Original file line number Diff line number Diff line change 1
- import { provide } from "inversify-binding-decorators" ;
2
1
import { DBTTerminal } from "../../dbt_integration/terminal" ;
3
2
import { DBTGraphType } from "./graphParser" ;
4
3
import { AltimateRequest } from "../../altimate" ;
5
4
import { workspace } from "vscode" ;
6
- import { inject } from "inversify " ;
5
+ import { DbtIntegrationClient } from "../dbtIntegrationClient " ;
7
6
8
- @provide ( ModelDepthParser )
9
7
export class ModelDepthParser {
10
8
constructor (
11
- @inject ( "DBTTerminal" )
12
9
private terminal : DBTTerminal ,
13
- private altimate : AltimateRequest ,
10
+ private dbtIntegrationClient : DbtIntegrationClient ,
14
11
) { }
15
12
16
13
public createModelDepthsMap (
@@ -30,8 +27,9 @@ export class ModelDepthParser {
30
27
return new Map < string , number > ( ) ;
31
28
}
32
29
33
- // Check if API key is available
34
- if ( ! this . altimate . enabled ( ) ) {
30
+ try {
31
+ this . dbtIntegrationClient . throwIfNotAuthenticated ( ) ;
32
+ } catch ( _error ) {
35
33
this . terminal . debug (
36
34
"ModelDepthParser" ,
37
35
"Skipping model depth calculation - Altimate API key not configured" ,
Original file line number Diff line number Diff line change 1
- import { provide } from "inversify-binding-decorators" ;
2
1
import { NodeMetaData , NodeMetaMap } from "../domain" ;
3
2
import { createFullPathForNode } from "./utils" ;
4
3
import { DBTTerminal } from "../../dbt_integration/terminal" ;
5
4
import { getExternalProjectNamesFromDbtLoomConfig } from "../../utils" ;
6
5
import * as path from "path" ;
7
- import { inject } from "inversify" ;
8
6
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter" ;
9
7
import { isResourceNode } from "../dbtIntegration" ;
10
8
@@ -36,12 +34,8 @@ export class NodeMetaMapImpl implements NodeMetaMap {
36
34
}
37
35
}
38
36
39
- @provide ( NodeParser )
40
37
export class NodeParser {
41
- constructor (
42
- @inject ( "DBTTerminal" )
43
- private terminal : DBTTerminal ,
44
- ) { }
38
+ constructor ( private terminal : DBTTerminal ) { }
45
39
46
40
createNodeMetaMap (
47
41
nodesMap : any [ ] ,
Original file line number Diff line number Diff line change 1
- import { provide } from "inversify-binding-decorators" ;
2
1
import * as path from "path" ;
3
2
import { DBTTerminal } from "../../dbt_integration/terminal" ;
4
3
import { SourceMetaMap } from "../domain" ;
5
4
import { getExternalProjectNamesFromDbtLoomConfig } from "../../utils" ;
6
- import { inject } from "inversify" ;
7
5
import { RESOURCE_TYPE_SOURCE } from "../dbtIntegration" ;
8
6
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter" ;
9
7
10
- @provide ( SourceParser )
11
8
export class SourceParser {
12
- constructor (
13
- @inject ( "DBTTerminal" )
14
- private terminal : DBTTerminal ,
15
- ) { }
9
+ constructor ( private terminal : DBTTerminal ) { }
16
10
17
11
createSourceMetaMap (
18
12
sourcesMap : any [ ] ,
Original file line number Diff line number Diff line change 1
- import { provide } from "inversify-binding-decorators" ;
2
1
import * as path from "path" ;
3
2
import { TestMetaMap } from "../domain" ;
4
3
import { DBTTerminal } from "../terminal" ;
5
- import { inject } from "inversify" ;
6
4
import { RESOURCE_TYPE_TEST } from "../dbtIntegration" ;
7
5
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter" ;
8
6
9
- @provide ( TestParser )
10
7
export class TestParser {
11
- constructor (
12
- @inject ( "DBTTerminal" )
13
- private terminal : DBTTerminal ,
14
- ) { }
8
+ constructor ( private terminal : DBTTerminal ) { }
15
9
16
10
private getColumnNameWithoutQuotes ( columnName : string ) : string | undefined {
17
11
if ( ! columnName ) {
You can’t perform that action at this time.
0 commit comments