Skip to content

Commit 8213b1b

Browse files
committed
refactor: remove inversify decorators and simplify constructor injections
1 parent fa0e5de commit 8213b1b

12 files changed

+71
-67
lines changed

src/dbt_integration/parsers/childrenParentParser.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import { provide } from "inversify-binding-decorators";
21
import { DBTGraphType } from "./graphParser";
32

4-
@provide(ChildrenParentParser)
53
export class ChildrenParentParser {
64
createChildrenParentMetaMap(
75
nodesMap: any[],

src/dbt_integration/parsers/docParser.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import { readFileSync } from "fs";
2-
import { provide } from "inversify-binding-decorators";
32
import { DBTTerminal } from "../terminal";
43
import { DocMetaMap } from "../domain";
5-
import { inject } from "inversify";
64
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter";
75
import { createFullPathForNode } from "./utils";
86

9-
@provide(DocParser)
107
export class DocParser {
11-
constructor(
12-
@inject("DBTTerminal")
13-
private terminal: DBTTerminal,
14-
) {}
8+
constructor(private terminal: DBTTerminal) {}
159

1610
createDocMetaMap(
1711
docs: any,

src/dbt_integration/parsers/exposureParser.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
import { provide } from "inversify-binding-decorators";
21
import * as path from "path";
32
import { ExposureMetaMap } from "../domain";
43
import { DBTTerminal } from "../terminal";
5-
import { inject } from "inversify";
64
import { RESOURCE_TYPE_EXPOSURE } from "../dbtIntegration";
75
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter";
86

9-
@provide(ExposureParser)
107
export class ExposureParser {
11-
constructor(
12-
@inject("DBTTerminal")
13-
private terminal: DBTTerminal,
14-
) {}
8+
constructor(private terminal: DBTTerminal) {}
159

1610
createExposureMetaMap(
1711
exposuresMap: any[],

src/dbt_integration/parsers/graphParser.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { provide } from "inversify-binding-decorators";
21
import {
32
Analysis,
43
Exposure,
@@ -17,7 +16,6 @@ import {
1716
TestMetaMap,
1817
} from "../domain";
1918
import { DBTTerminal } from "../terminal";
20-
import { inject } from "inversify";
2119
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter";
2220

2321
const notEmpty = <T>(value: T | null | undefined): value is T => {
@@ -28,12 +26,8 @@ export type DBTGraphType = {
2826
[name: string]: string[];
2927
};
3028

31-
@provide(GraphParser)
3229
export class GraphParser {
33-
constructor(
34-
@inject("DBTTerminal")
35-
private terminal: DBTTerminal,
36-
) {}
30+
constructor(private terminal: DBTTerminal) {}
3731

3832
createGraphMetaMap(
3933
project: DBTIntegrationAdapter,

src/dbt_integration/parsers/macroParser.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import { readFileSync } from "fs";
2-
import { provide } from "inversify-binding-decorators";
32
import { DBTTerminal } from "../terminal";
43
import { MacroMetaMap } from "../domain";
5-
import { inject } from "inversify";
64
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter";
75
import { createFullPathForNode } from "./utils";
86

9-
@provide(MacroParser)
107
export class MacroParser {
11-
constructor(
12-
@inject("DBTTerminal")
13-
private terminal: DBTTerminal,
14-
) {}
8+
constructor(private terminal: DBTTerminal) {}
159

1610
createMacroMetaMap(
1711
macros: any[],

src/dbt_integration/parsers/metricParser.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
import { provide } from "inversify-binding-decorators";
21
import { DBTTerminal } from "../terminal";
32
import { MetricMetaMap } from "../domain";
4-
import { inject } from "inversify";
53
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter";
64

7-
@provide(MetricParser)
85
export class MetricParser {
9-
constructor(
10-
@inject("DBTTerminal")
11-
private terminal: DBTTerminal,
12-
) {}
6+
constructor(private terminal: DBTTerminal) {}
137

148
createMetricMetaMap(
159
metrics: any[],

src/dbt_integration/parsers/modelDepthParser.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
import { provide } from "inversify-binding-decorators";
21
import { DBTTerminal } from "../../dbt_integration/terminal";
32
import { DBTGraphType } from "./graphParser";
43
import { AltimateRequest } from "../../altimate";
54
import { workspace } from "vscode";
6-
import { inject } from "inversify";
5+
import { DbtIntegrationClient } from "../dbtIntegrationClient";
76

8-
@provide(ModelDepthParser)
97
export class ModelDepthParser {
108
constructor(
11-
@inject("DBTTerminal")
129
private terminal: DBTTerminal,
13-
private altimate: AltimateRequest,
10+
private dbtIntegrationClient: DbtIntegrationClient,
1411
) {}
1512

1613
public createModelDepthsMap(
@@ -30,8 +27,9 @@ export class ModelDepthParser {
3027
return new Map<string, number>();
3128
}
3229

33-
// Check if API key is available
34-
if (!this.altimate.enabled()) {
30+
try {
31+
this.dbtIntegrationClient.throwIfNotAuthenticated();
32+
} catch (_error) {
3533
this.terminal.debug(
3634
"ModelDepthParser",
3735
"Skipping model depth calculation - Altimate API key not configured",

src/dbt_integration/parsers/nodeParser.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import { provide } from "inversify-binding-decorators";
21
import { NodeMetaData, NodeMetaMap } from "../domain";
32
import { createFullPathForNode } from "./utils";
43
import { DBTTerminal } from "../../dbt_integration/terminal";
54
import { getExternalProjectNamesFromDbtLoomConfig } from "../../utils";
65
import * as path from "path";
7-
import { inject } from "inversify";
86
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter";
97
import { isResourceNode } from "../dbtIntegration";
108

@@ -36,12 +34,8 @@ export class NodeMetaMapImpl implements NodeMetaMap {
3634
}
3735
}
3836

39-
@provide(NodeParser)
4037
export class NodeParser {
41-
constructor(
42-
@inject("DBTTerminal")
43-
private terminal: DBTTerminal,
44-
) {}
38+
constructor(private terminal: DBTTerminal) {}
4539

4640
createNodeMetaMap(
4741
nodesMap: any[],

src/dbt_integration/parsers/sourceParser.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
import { provide } from "inversify-binding-decorators";
21
import * as path from "path";
32
import { DBTTerminal } from "../../dbt_integration/terminal";
43
import { SourceMetaMap } from "../domain";
54
import { getExternalProjectNamesFromDbtLoomConfig } from "../../utils";
6-
import { inject } from "inversify";
75
import { RESOURCE_TYPE_SOURCE } from "../dbtIntegration";
86
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter";
97

10-
@provide(SourceParser)
118
export class SourceParser {
12-
constructor(
13-
@inject("DBTTerminal")
14-
private terminal: DBTTerminal,
15-
) {}
9+
constructor(private terminal: DBTTerminal) {}
1610

1711
createSourceMetaMap(
1812
sourcesMap: any[],

src/dbt_integration/parsers/testParser.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
import { provide } from "inversify-binding-decorators";
21
import * as path from "path";
32
import { TestMetaMap } from "../domain";
43
import { DBTTerminal } from "../terminal";
5-
import { inject } from "inversify";
64
import { RESOURCE_TYPE_TEST } from "../dbtIntegration";
75
import { DBTIntegrationAdapter } from "../dbtIntegrationAdapter";
86

9-
@provide(TestParser)
107
export class TestParser {
11-
constructor(
12-
@inject("DBTTerminal")
13-
private terminal: DBTTerminal,
14-
) {}
8+
constructor(private terminal: DBTTerminal) {}
159

1610
private getColumnNameWithoutQuotes(columnName: string): string | undefined {
1711
if (!columnName) {

0 commit comments

Comments
 (0)