Skip to content

Commit 5d596de

Browse files
committed
chore: extract library
1 parent b3bb6d8 commit 5d596de

20 files changed

+302
-83
lines changed

src/dbt_integration/altimateHttpClient.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import { createReadStream, ReadStream } from "fs";
2+
3+
import type { RequestInit, Response as NodeFetchResponse } from "node-fetch";
4+
15
import { DBTConfiguration } from "./configuration";
26
import { DBTTerminal } from "./terminal";
3-
import type { RequestInit, Response as NodeFetchResponse } from "node-fetch";
4-
import { createReadStream, ReadStream } from "fs";
57

68
export class NoCredentialsError extends Error {}
79

src/dbt_integration/commandProcessExecution.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { spawn } from "child_process";
2-
import { DBTTerminal } from "./terminal";
2+
33
import { EnvironmentVariables } from "./domain";
4+
import { DBTTerminal } from "./terminal";
45

56
export class CommandProcessExecutionFactory {
67
constructor(private terminal: DBTTerminal) {}

src/dbt_integration/dbtCloudIntegration.ts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
import { DBTDiagnosticData, DBTDiagnosticResult } from "./diagnostics";
1+
import * as crypto from "crypto";
2+
import { existsSync, readFileSync } from "fs";
3+
import { join, dirname } from "path";
4+
import path = require("path");
5+
6+
import { PythonBridge } from "python-bridge";
7+
import semver = require("semver");
8+
import { parse } from "yaml";
9+
10+
import { CommandProcessExecutionFactory } from "./commandProcessExecution";
211
import {
312
DBTCommand,
413
DBTCommandExecutionInfrastructure,
@@ -10,14 +19,7 @@ import {
1019
QueryExecution,
1120
readAndParseProjectConfig,
1221
} from "./dbtIntegration";
13-
import { CommandProcessExecutionFactory } from "./commandProcessExecution";
14-
import { PythonBridge } from "python-bridge";
15-
import { join, dirname } from "path";
16-
import path = require("path");
17-
import { DBTTerminal } from "./terminal";
18-
import { RuntimePythonEnvironment } from "./pythonEnvironment";
19-
import { existsSync, readFileSync } from "fs";
20-
import semver = require("semver");
22+
import { DBTDiagnosticData, DBTDiagnosticResult } from "./diagnostics";
2123
import {
2224
Catalog,
2325
DBColumn,
@@ -26,8 +28,8 @@ import {
2628
DeferConfig,
2729
NodeMetaData,
2830
} from "./domain";
29-
import * as crypto from "crypto";
30-
import { parse } from "yaml";
31+
import { RuntimePythonEnvironment } from "./pythonEnvironment";
32+
import { DBTTerminal } from "./terminal";
3133

3234
export function getDBTPath(
3335
pythonEnvironment: RuntimePythonEnvironment,

src/dbt_integration/dbtCoreCommandIntegration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { getDBTPath } from "./dbtCloudIntegration";
12
import {
23
DBTCoreDetection,
34
DBTCoreProjectDetection,
45
DBTCoreProjectIntegration,
56
} from "./dbtCoreIntegration";
67
import { QueryExecution, DBTCommand } from "./dbtIntegration";
7-
import { getDBTPath } from "./dbtCloudIntegration";
88
import { Catalog, DBColumn, DBTNode } from "./domain";
99

1010
// TODO: either fix this class or remove it

src/dbt_integration/dbtCoreIntegration.ts

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
import { DBTDiagnosticData, DBTDiagnosticResult } from "./diagnostics";
1+
import * as crypto from "crypto";
2+
import { existsSync, readFileSync } from "fs";
3+
import * as fs from "fs";
4+
import * as path from "path";
5+
6+
import { PythonBridge, PythonException } from "python-bridge";
7+
import { parse } from "yaml";
8+
9+
import { NotFoundError } from "./altimateHttpClient";
10+
import { CommandProcessExecutionFactory } from "./commandProcessExecution";
11+
import { DBTConfiguration } from "./configuration";
212
import {
313
CompilationResult,
414
DBTCommand,
@@ -12,16 +22,8 @@ import {
1222
ExecuteSQLError,
1323
DBTCommandExecutionStrategy,
1424
} from "./dbtIntegration";
15-
import { RuntimePythonEnvironment } from "./pythonEnvironment";
16-
import { CommandProcessExecutionFactory } from "./commandProcessExecution";
17-
import { PythonBridge, PythonException } from "python-bridge";
18-
import * as path from "path";
19-
import { existsSync, readFileSync } from "fs";
20-
import * as fs from "fs";
21-
import { parse } from "yaml";
22-
import { NotFoundError } from "./altimateHttpClient";
23-
import { DBTTerminal } from "./terminal";
24-
import { DBTConfiguration } from "./configuration";
25+
import { DbtIntegrationClient } from "./dbtIntegrationClient";
26+
import { DBTDiagnosticData, DBTDiagnosticResult } from "./diagnostics";
2527
import {
2628
Catalog,
2729
DBColumn,
@@ -34,8 +36,8 @@ import {
3436
RESOURCE_TYPE_SOURCE,
3537
SourceNode,
3638
} from "./domain";
37-
import * as crypto from "crypto";
38-
import { DbtIntegrationClient } from "./dbtIntegrationClient";
39+
import { RuntimePythonEnvironment } from "./pythonEnvironment";
40+
import { DBTTerminal } from "./terminal";
3941

4042
const DEFAULT_QUERY_TEMPLATE = "select * from ({query}) as query limit {limit}";
4143

src/dbt_integration/dbtFusionCommandIntegration.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
import path, { join } from "path";
2+
3+
import { CommandProcessExecutionFactory } from "./commandProcessExecution";
4+
import { DBTConfiguration } from "./configuration";
5+
import { DBTCloudProjectIntegration, getDBTPath } from "./dbtCloudIntegration";
16
import {
27
QueryExecution,
38
DBTCommand,
@@ -6,19 +11,15 @@ import {
611
readAndParseProjectConfig,
712
} from "./dbtIntegration";
813
import { DBTDiagnosticData } from "./diagnostics";
9-
import { DBTCloudProjectIntegration, getDBTPath } from "./dbtCloudIntegration";
10-
import { DBTConfiguration } from "./configuration";
11-
import path, { join } from "path";
12-
import { CommandProcessExecutionFactory } from "./commandProcessExecution";
13-
import { RuntimePythonEnvironment } from "./pythonEnvironment";
14-
import { DBTTerminal } from "./terminal";
1514
import {
1615
DBT_PROJECT_FILE,
1716
DBColumn,
1817
DBTNode,
1918
Catalog,
2019
DeferConfig,
2120
} from "./domain";
21+
import { RuntimePythonEnvironment } from "./pythonEnvironment";
22+
import { DBTTerminal } from "./terminal";
2223

2324
export class DBTFusionCommandDetection implements DBTDetection {
2425
constructor(

src/dbt_integration/dbtIntegration.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1+
import * as crypto from "crypto";
2+
import { existsSync, readFileSync } from "fs";
3+
import path from "path";
4+
15
import { PythonBridge, pythonBridge } from "python-bridge";
6+
import { parse } from "yaml";
7+
28
import {
39
CommandProcessExecution,
410
CommandProcessExecutionFactory,
511
CommandProcessResult,
612
} from "./commandProcessExecution";
7-
import { RuntimePythonEnvironment } from "./pythonEnvironment";
8-
import { existsSync, readFileSync } from "fs";
9-
import { DBTTerminal } from "./terminal";
13+
import { DBTConfiguration } from "./configuration";
14+
import { DBTDiagnosticResult } from "./diagnostics";
1015
import {
1116
Catalog,
1217
DBColumn,
@@ -16,11 +21,8 @@ import {
1621
NodeMetaData,
1722
RunModelParams,
1823
} from "./domain";
19-
import { DBTDiagnosticResult } from "./diagnostics";
20-
import { DBTConfiguration } from "./configuration";
21-
import path from "path";
22-
import { parse } from "yaml";
23-
import * as crypto from "crypto";
24+
import { RuntimePythonEnvironment } from "./pythonEnvironment";
25+
import { DBTTerminal } from "./terminal";
2426

2527
function combineAbortSignals(
2628
...signals: (AbortSignal | undefined)[]

src/dbt_integration/dbtIntegrationAdapter.ts

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
1+
import { EventEmitter } from "events";
2+
import { FSWatcher, watch, readFileSync } from "fs";
3+
import path from "path";
4+
5+
import { PythonException } from "python-bridge";
6+
import { YAMLError } from "yaml";
7+
18
import { CommandProcessResult } from "./commandProcessExecution";
9+
import { DBTConfiguration } from "./configuration";
10+
import { ProjectHealthcheck } from "./dbtCoreIntegration";
11+
import { DBTFacade } from "./dbtFacade";
212
import {
313
DBTProjectIntegration,
414
DBTCommandFactory,
515
DBTCommand,
616
} from "./dbtIntegration";
7-
import { ProjectHealthcheck } from "./dbtCoreIntegration";
17+
import { DBTDiagnosticData } from "./diagnostics";
818
import {
919
Catalog,
1020
CATALOG_FILE,
@@ -24,26 +34,17 @@ import {
2434
RunResultsEventData,
2535
Table,
2636
} from "./domain";
27-
import { DBTConfiguration } from "./configuration";
28-
import { DBTFacade } from "./dbtFacade";
29-
import { DBTDiagnosticData } from "./diagnostics";
30-
import { PythonException } from "python-bridge";
31-
import { YAMLError } from "yaml";
37+
import { ChildrenParentParser } from "./parsers/childrenParentParser";
3238
import { DocParser } from "./parsers/docParser";
39+
import { ExposureParser } from "./parsers/exposureParser";
3340
import { GraphParser } from "./parsers/graphParser";
3441
import { MacroParser } from "./parsers/macroParser";
42+
import { MetricParser } from "./parsers/metricParser";
43+
import { ModelDepthParser } from "./parsers/modelDepthParser";
3544
import { NodeParser } from "./parsers/nodeParser";
3645
import { SourceParser } from "./parsers/sourceParser";
3746
import { TestParser } from "./parsers/testParser";
38-
import { ExposureParser } from "./parsers/exposureParser";
39-
import { MetricParser } from "./parsers/metricParser";
40-
import { ChildrenParentParser } from "./parsers/childrenParentParser";
41-
import { ModelDepthParser } from "./parsers/modelDepthParser";
4247
import { DBTTerminal } from "./terminal";
43-
import path from "path";
44-
import { FSWatcher, watch } from "fs";
45-
import { EventEmitter } from "events";
46-
import { readFileSync } from "fs";
4748

4849
export const debounce = (fn: (args: unknown) => void, wait: number) => {
4950
let timeout: NodeJS.Timeout;

src/dbt_integration/dbtIntegrationClient.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { AltimateHttpClient } from "./altimateHttpClient";
2-
import { join } from "path";
31
import { createWriteStream, mkdirSync } from "fs";
42
import * as os from "os";
3+
import { join } from "path";
4+
5+
import { AltimateHttpClient } from "./altimateHttpClient";
56
import { hashProjectRoot } from "./dbtIntegration";
67
import { DBTTerminal } from "./terminal";
78

0 commit comments

Comments
 (0)