Refactor imports to use 'import type' for type-only imports across multiple files, enhancing clarity and performance. Update event emission to include 'core' context in various event handlers for better context management. Adjust command error handling to pass 'core' as an argument. Improve event loading mechanism to utilize Promise.all for concurrent loading. Refactor event handlers to accept 'core' as a parameter, ensuring consistent context usage.

.vscode/Discloud.code-snippets

@@ -15,6 +15,17 @@
 	// 	],
 	// 	"description": "Log output to console"
 	// }
+  "event" :{
+    "body": [
+      "import type ExtensionCore from \"../core/extension\";",
+      "",
+      "export default async function (core: ExtensionCore) {",
+      "\t$0",
+      "}"
+    ],
+    "prefix": "event",
+    "scope": "typescript"
+  },
 	"extcmd": {
 		"body": [
 			"import { TaskData } from \"../@types\";",

src/@types/event.ts

@@ -0,0 +1,4 @@
+export interface IEventModule<E extends Record<keyof E, unknown[]>, K extends keyof E, V extends E[K] = E[K]> {
+  readonly once?: boolean
+  default(...args: V): void
+}

src/@types/index.ts

@@ -1,4 +1,5 @@
 export * from "./api";
+export * from "./event";
 export * from "./rest";
 export * from "./structures";
 export * from "./vscode";

src/@types/structures.ts

@@ -1,10 +1,11 @@
 import type { CancellationToken, ExtensionContext, LogOutputChannel, ProgressOptions, TreeItem, Uri } from "vscode";
+import type ExtensionCore from "../core/extension";
 import type BaseChildTreeItem from "../structures/BaseChildTreeItem";
 import type TeamAppTreeItem from "../structures/TeamAppTreeItem";
 import type UserAppTreeItem from "../structures/UserAppTreeItem";
 import type VSUser from "../structures/VSUser";
 import type { RateLimitData } from "./rest";
-import { type ProgressTaskParameters, type VscodeProgressReporter } from "./vscode";
+import type { ProgressTaskParameters, VscodeProgressReporter } from "./vscode";
 
 export interface GetWorkspaceFolderOptions {
   /** @default true */
@@ -89,15 +90,15 @@ export interface UserTreeItemData extends BaseTreeItemData {
 }
 
 export interface Events {
-  activate: [context: ExtensionContext]
-  appUpdate: [oldApp: UserAppTreeItem, newApp: UserAppTreeItem]
-  authorized: []
-  debug: Parameters<LogOutputChannel["debug"]>
-  error: [error: Error | unknown]
-  missingConnection: []
-  missingToken: []
-  rateLimited: [rateLimitData: RateLimitData]
-  teamAppUpdate: [oldTeamApp: TeamAppTreeItem, newTeamApp: TeamAppTreeItem]
-  unauthorized: []
-  vscode: [user: VSUser]
+  activate: [core: ExtensionCore, context: ExtensionContext]
+  appUpdate: [core: ExtensionCore, oldApp: UserAppTreeItem, newApp: UserAppTreeItem]
+  authorized: [core: ExtensionCore]
+  debug: [core: ExtensionCore, ...Parameters<LogOutputChannel["debug"]>]
+  error: [core: ExtensionCore, error: Error | unknown]
+  missingConnection: [core: ExtensionCore]
+  missingToken: [core: ExtensionCore]
+  rateLimited: [core: ExtensionCore, rateLimitData: RateLimitData]
+  teamAppUpdate: [core: ExtensionCore, oldTeamApp: TeamAppTreeItem, newTeamApp: TeamAppTreeItem]
+  unauthorized: [core: ExtensionCore]
+  vscode: [core: ExtensionCore, user: VSUser]
 }

src/authentication/pat/provider.ts

@@ -1,7 +1,7 @@
 import { type RESTGetApiUserResult, RouteBases, Routes } from "@discloudapp/api-types/v2";
 import { t } from "@vscode/l10n";
 import { authentication, type AuthenticationProvider, type AuthenticationProviderAuthenticationSessionsChangeEvent, type AuthenticationProviderSessionOptions, type AuthenticationSession, type AuthenticationSessionAccountInformation, type EventEmitter, type SecretStorage, window } from "vscode";
-import { type IGlobalStateStorage } from "../../@types";
+import type { IGlobalStateStorage } from "../../@types";
 import { tokenIsDiscloudJwt } from "../../services/discloud/utils";
 import { GlobalStorageKeys } from "../../utils/constants";
 import { AuthenticationProviderId } from "../enum/providers";

src/authentication/providers.ts

@@ -3,7 +3,7 @@ import { authentication, type AuthenticationProvider, type AuthenticationProvide
 import type ExtensionCore from "../core/extension";
 import { GlobalStorageKeys } from "../utils/constants";
 import { AuthenticationProviderId } from "./enum/providers";
-import { type IPatAuthenticationProvider } from "./interfaces/pat";
+import type { IPatAuthenticationProvider } from "./interfaces/pat";
 import DiscloudPatAuthenticationProvider from "./pat/provider";
 
 export default class AuthenticationProviderContainer implements AuthenticationProvider {

src/authentication/session.ts

@@ -1,4 +1,4 @@
-import { type AuthenticationSession, type AuthenticationSessionAccountInformation } from "vscode";
+import type { AuthenticationSession, AuthenticationSessionAccountInformation } from "vscode";
 
 export default class DiscloudAuthenticationSession implements AuthenticationSession {
   constructor(

src/commands.ts

@@ -1,9 +1,9 @@
-/* eslint-disable no-duplicate-imports */
+ 
 import { t } from "@vscode/l10n";
 import { commands, window } from "vscode";
 import type ExtensionCore from "./core/extension";
 import type Command from "./structures/Command";
-import { type CommandConstructor } from "./structures/Command";
+import type { CommandConstructor } from "./structures/Command";
 
 export async function commandsRegister(core: ExtensionCore) {
   // root
@@ -147,7 +147,7 @@ function commandRegister(
 
       return await command.run(null, ...args);
     } catch (error) {
-      core.emit("error", error);
+      core.emit("error", core, error);
     } finally {
       core.statusBar.reset();
     }

src/commands/apps/backup.ts

@@ -3,7 +3,7 @@ import { t } from "@vscode/l10n";
 import { existsSync } from "fs";
 import { basename } from "path";
 import { ProgressLocation, Uri, window, workspace } from "vscode";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import Command from "../../structures/Command";
 import type UserAppTreeItem from "../../structures/UserAppTreeItem";

src/commands/apps/commit.ts

@@ -1,7 +1,7 @@
 import { type RESTPutApiAppCommitResult, Routes } from "@discloudapp/api-types/v2";
 import { t } from "@vscode/l10n";
 import { CancellationError, ProgressLocation } from "vscode";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import { socketCommit } from "../../services/discloud/socket/actions/commit";
 import Command from "../../structures/Command";

src/commands/apps/copy.id.ts

@@ -1,6 +1,6 @@
 import { t } from "@vscode/l10n";
 import { env, window } from "vscode";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import Command from "../../structures/Command";
 import type UserAppTreeItem from "../../structures/UserAppTreeItem";

src/commands/apps/delete.ts

@@ -1,7 +1,7 @@
 import { type RESTDeleteApiAppDeleteResult, Routes } from "@discloudapp/api-types/v2";
 import { t } from "@vscode/l10n";
 import { CancellationError, ProgressLocation } from "vscode";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import Command from "../../structures/Command";
 import type UserAppTreeItem from "../../structures/UserAppTreeItem";

src/commands/apps/import.ts

@@ -3,7 +3,7 @@ import { t } from "@vscode/l10n";
 import AdmZip from "adm-zip";
 import { existsSync } from "fs";
 import { ProgressLocation, Uri, commands, window, workspace } from "vscode";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import Command from "../../structures/Command";
 import type UserAppTreeItem from "../../structures/UserAppTreeItem";

src/commands/apps/logs.ts

@@ -1,7 +1,7 @@
 import { type RESTGetApiAppLogResult, Routes } from "@discloudapp/api-types/v2";
 import { t } from "@vscode/l10n";
 import { ProgressLocation } from "vscode";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import Command from "../../structures/Command";
 import type UserAppTreeItem from "../../structures/UserAppTreeItem";

src/commands/apps/mods/edit.ts

@@ -1,7 +1,7 @@
 import { type RESTPutApiAppTeamResult, Routes } from "@discloudapp/api-types/v2";
 import { ModPermissionsBF } from "@discloudapp/util";
 import { t } from "@vscode/l10n";
-import { CancellationError, ProgressLocation, type QuickPickItem, window } from "vscode";
+import { type QuickPickItem, CancellationError, ProgressLocation, window } from "vscode";
 import { type TaskData } from "../../../@types";
 import type ExtensionCore from "../../../core/extension";
 import Command from "../../../structures/Command";

src/commands/apps/ram.ts

@@ -2,7 +2,7 @@ import { type RESTPutApiAppRamResult, Routes } from "@discloudapp/api-types/v2";
 import { t } from "@vscode/l10n";
 import { CancellationError, ProgressLocation } from "vscode";
 import { AppType } from "../../@enum";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import Command from "../../structures/Command";
 import type UserAppTreeItem from "../../structures/UserAppTreeItem";

src/commands/apps/restart.ts

@@ -1,7 +1,7 @@
 import { type RESTPutApiAppRestartResult, Routes } from "@discloudapp/api-types/v2";
 import { t } from "@vscode/l10n";
 import { CancellationError, ProgressLocation } from "vscode";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import Command from "../../structures/Command";
 import type UserAppTreeItem from "../../structures/UserAppTreeItem";

src/commands/apps/start.ts

@@ -1,7 +1,7 @@
 import { type RESTPutApiAppStartResult, Routes } from "@discloudapp/api-types/v2";
 import { t } from "@vscode/l10n";
 import { ProgressLocation } from "vscode";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import Command from "../../structures/Command";
 import type UserAppTreeItem from "../../structures/UserAppTreeItem";

src/commands/apps/status.ts

@@ -1,6 +1,6 @@
 import { t } from "@vscode/l10n";
 import { ProgressLocation } from "vscode";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import Command from "../../structures/Command";
 import type UserAppTreeItem from "../../structures/UserAppTreeItem";

src/commands/apps/stop.ts

@@ -1,7 +1,7 @@
 import { type RESTPutApiAppStartResult, Routes } from "@discloudapp/api-types/v2";
 import { t } from "@vscode/l10n";
 import { CancellationError, ProgressLocation } from "vscode";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import Command from "../../structures/Command";
 import type UserAppTreeItem from "../../structures/UserAppTreeItem";

src/commands/apps/terminal.ts

@@ -1,5 +1,5 @@
 import { type Uri, window } from "vscode";
-import { type TaskData } from "../../@types";
+import type { TaskData } from "../../@types";
 import type ExtensionCore from "../../core/extension";
 import Command from "../../structures/Command";
 import type UserAppTreeItem from "../../structures/UserAppTreeItem";

src/commands/commit.ts

@@ -1,7 +1,7 @@
 import { type RESTPutApiAppCommitResult, Routes } from "@discloudapp/api-types/v2";
 import { t } from "@vscode/l10n";
 import { CancellationError, ProgressLocation } from "vscode";
-import { type TaskData } from "../@types";
+import type { TaskData } from "../@types";
 import type ExtensionCore from "../core/extension";
 import { socketCommit } from "../services/discloud/socket/actions/commit";
 import Command from "../structures/Command";

src/commands/login.ts

@@ -1,7 +1,7 @@
 import { t } from "@vscode/l10n";
 import { setTimeout as sleep } from "timers/promises";
 import { authentication, window, type AuthenticationSession } from "vscode";
-import { type TaskData } from "../@types";
+import type { TaskData } from "../@types";
 import UnauthorizedError from "../authentication/errors/unauthorized";
 import { pickAuthenticationProviderId } from "../authentication/pick/AuthenticationProviderPicker";
 import type ExtensionCore from "../core/extension";
@@ -31,7 +31,7 @@ export default class extends Command {
       void window.showInformationMessage(t("valid.token"));
     }
 
-    this.core.emit("authorized");
+    this.core.emit("authorized", this.core);
 
     await sleep();
 

src/commands/logout.ts

@@ -1,4 +1,4 @@
-import { type AuthenticationSessionAccountInformation } from "vscode";
+import type { AuthenticationSessionAccountInformation } from "vscode";
 import type ExtensionCore from "../core/extension";
 import Command from "../structures/Command";
 import type UserTreeItem from "../structures/UserTreeItem";

src/commands/logs.ts

@@ -2,7 +2,7 @@ import { DiscloudConfigScopes, type RESTGetApiAppLogResult, Routes } from "@disc
 import { DiscloudConfig } from "@discloudapp/util";
 import { t } from "@vscode/l10n";
 import { ProgressLocation } from "vscode";
-import { type TaskData } from "../@types";
+import type { TaskData } from "../@types";
 import type ExtensionCore from "../core/extension";
 import Command from "../structures/Command";
 import type TeamAppTreeItem from "../structures/TeamAppTreeItem";

src/commands/upload.ts

@@ -2,7 +2,7 @@ import { type RESTPostApiUploadResult, Routes } from "@discloudapp/api-types/v2"
 import { DiscloudConfig } from "@discloudapp/util";
 import { t } from "@vscode/l10n";
 import { CancellationError, ProgressLocation, Uri } from "vscode";
-import { type TaskData } from "../@types";
+import type { TaskData } from "../@types";
 import type ExtensionCore from "../core/extension";
 import { socketUpload } from "../services/discloud/socket/actions/upload";
 import Command from "../structures/Command";

src/core/extension.ts

@@ -85,7 +85,7 @@ export default class ExtensionCore extends EventEmitter<Events> implements Dispo
   }
 
   debug(...args: Parameters<LogOutputChannel["debug"]>) {
-    this.emit("debug", ...args);
+    this.emit("debug", this, ...args);
   }
 
   dispose() {
@@ -207,6 +207,6 @@ export default class ExtensionCore extends EventEmitter<Events> implements Dispo
       userTree: { value: userTree },
     });
 
-    this.emit("activate", context);
+    this.emit("activate", this, context);
   }
 }

src/events.ts

@@ -1,17 +1,30 @@
+import type { Events, IEventModule } from "./@types";
 import type ExtensionCore from "./core/extension";
 
 export async function loadEvents(core: ExtensionCore) {
-  await import("./events/activate");
-  await import("./events/appUpdate");
-  await import("./events/authorized");
-  await import("./events/debug");
-  await import("./events/error");
-  await import("./events/missingConnection");
-  await import("./events/missingToken");
-  await import("./events/rateLimited");
-  await import("./events/teamAppUpdate");
-  await import("./events/unauthorized");
-  await import("./events/vscode");
+  await Promise.all([
+    loadEvent(core, "activate", import("./events/activate")),
+    loadEvent(core, "appUpdate", import("./events/appUpdate")),
+    loadEvent(core, "authorized", import("./events/authorized")),
+    loadEvent(core, "debug", import("./events/debug")),
+    loadEvent(core, "error", import("./events/error")),
+    loadEvent(core, "missingConnection", import("./events/missingConnection")),
+    loadEvent(core, "missingToken", import("./events/missingToken")),
+    loadEvent(core, "rateLimited", import("./events/rateLimited")),
+    loadEvent(core, "teamAppUpdate", import("./events/teamAppUpdate")),
+    loadEvent(core, "unauthorized", import("./events/unauthorized")),
+    loadEvent(core, "vscode", import("./events/vscode")),
+  ]);
 
   core.debug("Events loaded");
 }
+
+async function loadEvent<K extends keyof Events>(
+  core: ExtensionCore,
+  name: K,
+  eventPromise: Promise<IEventModule<Events, K, Events[K]>>,
+) {
+  const event = await eventPromise;
+  const invoker = event.once ? "once" : "on";
+  core[invoker](name, event.default as any);
+}

src/events/activate.ts

@@ -1,13 +1,12 @@
-import { type AuthenticationSessionAccountInformation, commands, workspace } from "vscode";
+import { type AuthenticationSessionAccountInformation, commands, type ExtensionContext, workspace } from "vscode";
 import { AuthenticationProviderId } from "../authentication/enum/providers";
 import type ExtensionCore from "../core/extension";
-import core from "../extension";
 import BaseLanguageProvider from "../language/BaseLanguageProvider";
 import CompletionItemProvider from "../language/CompletionItemProvider";
 import LanguageConfigurationProvider from "../language/LanguageConfigurationProvider";
 import { DISCLOUD_CONFIG_SCHEMA_FILE_NAME, GlobalStorageKeys } from "../utils/constants";
 
-core.on("activate", async function (context) {
+export default async function (core: ExtensionCore, context: ExtensionContext) {
   queueMicrotask(async function () {
     try {
       const path = context.asAbsolutePath(DISCLOUD_CONFIG_SCHEMA_FILE_NAME);
@@ -43,7 +42,7 @@ core.on("activate", async function (context) {
   const disposableAuthenticationEvent = core.auth.onDidChangeSessions(async (event) => {
     if (event.removed?.length) {
       const session = await core.auth.getSession();
-      if (!session) core.emit("missingToken");
+      if (!session) core.emit("missingToken", core);
       return;
     }
   });
@@ -63,7 +62,7 @@ core.on("activate", async function (context) {
   }
 
   await commands.executeCommand("setContext", "discloudInitialized", true);
-});
+}
 
 async function migrateAuthenticationProvider(core: ExtensionCore) {
   const oldSessionIdList = core.globalStorage.get<string[]>("sessionIdList", []);

src/events/appUpdate.ts

@@ -1,9 +1,10 @@
 import { t } from "@vscode/l10n";
 import { window } from "vscode";
-import core from "../extension";
+import type ExtensionCore from "../core/extension";
+import type UserAppTreeItem from "../structures/UserAppTreeItem";
 import { ConfigKeys } from "../utils/constants";
 
-core.on("appUpdate", async function (oldApp, newApp) {
+export default async function (core: ExtensionCore, oldApp: UserAppTreeItem, newApp: UserAppTreeItem) {
   if (!core.config.get<boolean>(ConfigKeys.appNotificationStatus)) return;
 
   const messageList: string[] = [];
@@ -19,4 +20,4 @@ core.on("appUpdate", async function (oldApp, newApp) {
 
   if (messageList.length)
     void window.showInformationMessage(messageList.join("\n"));
-});
+}