refactor: reorganize imports and use explicit bindings

Author: mdesmet

.prettierrc

@@ -0,0 +1,3 @@
+{
+  "plugins": ["prettier-plugin-organize-imports"]
+}

src/altimate.ts

@@ -1,15 +1,15 @@
-import type { RequestInit } from "node-fetch";
 import {
+  AltimateHttpClient,
   ColumnMetaData,
+  DBTConfiguration,
+  DBTTerminal,
   NodeMetaData,
   SourceMetaData,
 } from "@altimateai/dbt-integration";
-import { DBTTerminal } from "@altimateai/dbt-integration";
-import { PreconfiguredNotebookItem, NotebookItem, NotebookSchema } from "@lib";
-import * as vscode from "vscode";
+import { NotebookItem, NotebookSchema, PreconfiguredNotebookItem } from "@lib";
 import { inject } from "inversify";
-import { DBTConfiguration } from "@altimateai/dbt-integration";
-import { AltimateHttpClient } from "@altimateai/dbt-integration";
+import type { RequestInit } from "node-fetch";
+import * as vscode from "vscode";
 
 export class UserInputError extends Error {}
 

src/autocompletion_provider/docAutocompletionProvider.ts

@@ -13,10 +13,9 @@ import {
 } from "vscode";
 import { DBTProjectContainer } from "../manifest/dbtProjectContainer";
 import { ManifestCacheChangedEvent } from "../manifest/event/manifestCacheChangedEvent";
-import { isEnclosedWithinCodeBlock, provideSingleton } from "../utils";
 import { TelemetryService } from "../telemetry";
+import { isEnclosedWithinCodeBlock } from "../utils";
 
-@provideSingleton(DocAutocompletionProvider)
 export class DocAutocompletionProvider
   implements CompletionItemProvider, Disposable
 {

src/autocompletion_provider/index.ts

@@ -1,13 +1,11 @@
-import { Disposable, DocumentFilter, languages } from "vscode";
+import { Disposable, languages } from "vscode";
 import { DBTPowerUserExtension } from "../dbtPowerUserExtension";
-import { provideSingleton } from "../utils";
 import { DocAutocompletionProvider } from "./docAutocompletionProvider";
 import { MacroAutocompletionProvider } from "./macroAutocompletionProvider";
 import { ModelAutocompletionProvider } from "./modelAutocompletionProvider";
 import { SourceAutocompletionProvider } from "./sourceAutocompletionProvider";
 import { UserCompletionProvider } from "./usercompletion_provider";
 
-@provideSingleton(AutocompletionProviders)
 export class AutocompletionProviders implements Disposable {
   private disposables: Disposable[] = [];
 

src/autocompletion_provider/macroAutocompletionProvider.ts

@@ -13,10 +13,10 @@ import {
 } from "vscode";
 import { DBTProjectContainer } from "../manifest/dbtProjectContainer";
 import { ManifestCacheChangedEvent } from "../manifest/event/manifestCacheChangedEvent";
-import { isEnclosedWithinCodeBlock, provideSingleton } from "../utils";
 import { TelemetryService } from "../telemetry";
+import { isEnclosedWithinCodeBlock } from "../utils";
 
-@provideSingleton(MacroAutocompletionProvider) // TODO autocomplete doesn't work when mistype, delete and retype
+// TODO autocomplete doesn't work when mistype, delete and retype
 export class MacroAutocompletionProvider
   implements CompletionItemProvider, Disposable
 {

src/autocompletion_provider/modelAutocompletionProvider.ts

@@ -1,3 +1,4 @@
+import { RESOURCE_TYPE_ANALYSIS } from "@altimateai/dbt-integration";
 import {
   CancellationToken,
   CompletionContext,
@@ -13,11 +14,10 @@ import {
 } from "vscode";
 import { DBTProjectContainer } from "../manifest/dbtProjectContainer";
 import { ManifestCacheChangedEvent } from "../manifest/event/manifestCacheChangedEvent";
-import { isEnclosedWithinCodeBlock, provideSingleton } from "../utils";
 import { TelemetryService } from "../telemetry";
-import { RESOURCE_TYPE_ANALYSIS } from "@altimateai/dbt-integration";
+import { isEnclosedWithinCodeBlock } from "../utils";
 
-@provideSingleton(ModelAutocompletionProvider) // TODO autocomplete doesn't work when mistype, delete and retype
+// TODO autocomplete doesn't work when mistype, delete and retype
 export class ModelAutocompletionProvider
   implements CompletionItemProvider, Disposable
 {

src/autocompletion_provider/sourceAutocompletionProvider.ts

@@ -13,10 +13,10 @@ import {
 } from "vscode";
 import { DBTProjectContainer } from "../manifest/dbtProjectContainer";
 import { ManifestCacheChangedEvent } from "../manifest/event/manifestCacheChangedEvent";
-import { isEnclosedWithinCodeBlock, provideSingleton } from "../utils";
 import { TelemetryService } from "../telemetry";
+import { isEnclosedWithinCodeBlock } from "../utils";
 
-@provideSingleton(SourceAutocompletionProvider) // TODO autocomplete doesn't work when mistype, delete and retype
+// TODO autocomplete doesn't work when mistype, delete and retype
 export class SourceAutocompletionProvider
   implements CompletionItemProvider, Disposable
 {

src/autocompletion_provider/usercompletion_provider.ts

@@ -6,10 +6,8 @@ import {
   Disposable,
   ProviderResult,
 } from "vscode";
-import { provideSingleton } from "../utils";
 import { UsersService } from "../services/usersService";
 
-@provideSingleton(UserCompletionProvider)
 export class UserCompletionProvider
   implements CompletionItemProvider, Disposable
 {

src/code_lens_provider/cteCodeLensProvider.ts

@@ -1,15 +1,14 @@
+import { DBTTerminal } from "@altimateai/dbt-integration";
+import { inject } from "inversify";
 import {
   CancellationToken,
   CodeLens,
   CodeLensProvider,
   Command,
+  Disposable,
   Range,
   TextDocument,
-  Disposable,
 } from "vscode";
-import { inject } from "inversify";
-import { provideSingleton } from "../utils";
-import { DBTTerminal } from "@altimateai/dbt-integration";
 import { AltimateRequest } from "../altimate";
 
 export interface CteInfo {
@@ -20,7 +19,6 @@ export interface CteInfo {
   withClauseStart: number; // Start position of the WITH clause
 }
 
-@provideSingleton(CteCodeLensProvider)
 export class CteCodeLensProvider implements CodeLensProvider, Disposable {
   private disposables: Disposable[] = [];
 

src/code_lens_provider/documentationCodeLensProvider.ts

@@ -7,14 +7,11 @@ import {
   ProviderResult,
   Range,
   TextDocument,
-  window,
   workspace,
 } from "vscode";
-import { provideSingleton } from "../utils";
 import { CST, LineCounter, Parser } from "yaml";
 import path = require("path");
 
-@provideSingleton(DocumentationCodeLensProvider)
 export class DocumentationCodeLensProvider implements CodeLensProvider {
   private _onDidChangeCodeLenses: EventEmitter<void> = new EventEmitter<void>();
   public readonly onDidChangeCodeLenses: Event<void> =