Skip to content

Commit 2d29d5f

Browse files
committed
refactor: move dbt integration types and constants to domain module
1 parent 191c18c commit 2d29d5f

27 files changed

+183
-169
lines changed

src/autocompletion_provider/modelAutocompletionProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { DBTProjectContainer } from "../manifest/dbtProjectContainer";
1515
import { ManifestCacheChangedEvent } from "../manifest/event/manifestCacheChangedEvent";
1616
import { isEnclosedWithinCodeBlock, provideSingleton } from "../utils";
1717
import { TelemetryService } from "../telemetry";
18-
import { RESOURCE_TYPE_ANALYSIS } from "../dbt_integration/dbtIntegration";
18+
import { RESOURCE_TYPE_ANALYSIS } from "../dbt_integration/domain";
1919

2020
@provideSingleton(ModelAutocompletionProvider) // TODO autocomplete doesn't work when mistype, delete and retype
2121
export class ModelAutocompletionProvider

src/commands/tests/initCatalog.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Catalog } from "../../dbt_integration/dbtIntegration";
1+
import { Catalog } from "../../dbt_integration/domain";
22
import { provideSingleton } from "../../utils";
33
import { ScanContext } from "./scanContext";
44
import { AltimateScanStep } from "./step";

src/commands/tests/missingSchemaTest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Diagnostic, DiagnosticSeverity, Range } from "vscode";
22
import { ScanContext } from "./scanContext";
33
import { AltimateScanStep } from "./step";
44
import { provideSingleton } from "../../utils";
5-
import { RESOURCE_TYPE_MODEL } from "../../dbt_integration/dbtIntegration";
5+
import { RESOURCE_TYPE_MODEL } from "../../dbt_integration/domain";
66

77
@provideSingleton(MissingSchemaTest)
88
export class MissingSchemaTest implements AltimateScanStep {

src/commands/tests/scanContext.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Catalog } from "../../dbt_integration/dbtIntegration";
1+
import { Catalog } from "../../dbt_integration/domain";
22
import { DBTProject } from "../../manifest/dbtProject";
33
import { ManifestCacheProjectAddedEvent } from "../../manifest/event/manifestCacheChangedEvent";
44
import { Diagnostic } from "vscode";

src/comment_provider/conversationProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { inject } from "inversify";
3030
import {
3131
RESOURCE_TYPE_MACRO,
3232
RESOURCE_TYPE_TEST,
33-
} from "../dbt_integration/dbtIntegration";
33+
} from "../dbt_integration/domain";
3434

3535
// Extends vscode commentthread and add extra fields for reference
3636
export interface ConversationCommentThread extends CommentThread {

src/content_provider/sqlPreviewContentProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { TelemetryService } from "../telemetry";
1717
import { DeferToProdService } from "../services/deferToProdService";
1818
import { DbtIntegrationClient } from "../dbt_integration/dbtIntegrationClient";
1919
import path = require("path");
20-
import { ManifestPathType } from "../dbt_integration/dbtIntegration";
20+
import { ManifestPathType } from "../dbt_integration/domain";
2121

2222
@provideSingleton(SqlPreviewContentProvider)
2323
export class SqlPreviewContentProvider

src/dbt_integration/dbtCloudIntegration.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import { DBTDiagnosticData, DBTDiagnosticResult } from "./diagnostics";
22
import {
3-
Catalog,
4-
DBColumn,
5-
DBTNode,
63
DBTCommand,
74
DBTCommandExecutionInfrastructure,
85
DBTCommandExecutionStrategy,
@@ -11,8 +8,6 @@ import {
118
DBTProjectDetection,
129
DBTProjectIntegration,
1310
QueryExecution,
14-
DBT_PROJECT_FILE,
15-
DeferConfig,
1611
readAndParseProjectConfig,
1712
} from "./dbtIntegration";
1813
import { CommandProcessExecutionFactory } from "./commandProcessExecution";
@@ -23,7 +18,14 @@ import { DBTTerminal } from "./terminal";
2318
import { RuntimePythonEnvironment } from "./pythonEnvironment";
2419
import { existsSync, readFileSync } from "fs";
2520
import semver = require("semver");
26-
import { NodeMetaData } from "./domain";
21+
import {
22+
Catalog,
23+
DBColumn,
24+
DBT_PROJECT_FILE,
25+
DBTNode,
26+
DeferConfig,
27+
NodeMetaData,
28+
} from "./domain";
2729
import * as crypto from "crypto";
2830
import { parse } from "yaml";
2931

src/dbt_integration/dbtCoreCommandIntegration.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,9 @@ import {
33
DBTCoreProjectDetection,
44
DBTCoreProjectIntegration,
55
} from "./dbtCoreIntegration";
6-
import {
7-
QueryExecution,
8-
DBTCommand,
9-
DBColumn,
10-
Catalog,
11-
DBTNode,
12-
} from "./dbtIntegration";
6+
import { QueryExecution, DBTCommand } from "./dbtIntegration";
137
import { getDBTPath } from "./dbtCloudIntegration";
8+
import { Catalog, DBColumn, DBTNode } from "./domain";
149

1510
// TODO: either fix this class or remove it
1611
export class DBTCoreCommandDetection extends DBTCoreDetection {}

src/dbt_integration/dbtCoreIntegration.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import { DBTDiagnosticData, DBTDiagnosticResult } from "./diagnostics";
22
import {
3-
Catalog,
43
CompilationResult,
5-
DBColumn,
6-
DBTNode,
74
DBTCommand,
85
DBTCommandExecutionInfrastructure,
96
DBTDetection,
@@ -12,14 +9,8 @@ import {
129
ExecuteSQLResult,
1310
PythonDBTCommandExecutionStrategy,
1411
QueryExecution,
15-
SourceNode,
16-
Node,
1712
ExecuteSQLError,
1813
DBTCommandExecutionStrategy,
19-
DBT_PROJECT_FILE,
20-
RESOURCE_TYPE_SOURCE,
21-
DeferConfig,
22-
ManifestPathType,
2314
} from "./dbtIntegration";
2415
import { RuntimePythonEnvironment } from "./pythonEnvironment";
2516
import { CommandProcessExecutionFactory } from "./commandProcessExecution";
@@ -31,7 +22,18 @@ import { parse } from "yaml";
3122
import { NotFoundError } from "./altimateHttpClient";
3223
import { DBTTerminal } from "./terminal";
3324
import { DBTConfiguration } from "./configuration";
34-
import { NodeMetaData } from "./domain";
25+
import {
26+
Catalog,
27+
DBColumn,
28+
DBT_PROJECT_FILE,
29+
DBTNode,
30+
DeferConfig,
31+
ManifestPathType,
32+
Node,
33+
NodeMetaData,
34+
RESOURCE_TYPE_SOURCE,
35+
SourceNode,
36+
} from "./domain";
3537
import * as crypto from "crypto";
3638
import { DbtIntegrationClient } from "./dbtIntegrationClient";
3739

src/dbt_integration/dbtFacade.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { CommandProcessResult } from "./commandProcessExecution";
2-
import { RunModelParams, DBTNode, DBColumn, Catalog } from "./dbtIntegration";
32
import { ProjectHealthcheck } from "./dbtCoreIntegration";
4-
import { DataPilotHealtCheckParams, Table } from "./domain";
3+
import {
4+
Catalog,
5+
DataPilotHealtCheckParams,
6+
DBColumn,
7+
DBTNode,
8+
RunModelParams,
9+
Table,
10+
} from "./domain";
511

612
/**
713
* Framework-agnostic facade interface for dbt project operations.

0 commit comments

Comments
 (0)