fix circular dependency error

joaotonaco · joaotonaco · commit 6809d522e8cc · 2024-06-25T20:10:22.000-03:00
diff --git a/.changeset/cuddly-mice-sing.md b/.changeset/cuddly-mice-sing.md
@@ -0,0 +1,5 @@
+---
+"@squarecloud/api": patch
+---
+
+Fix circular dependency error
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -1,5 +1,5 @@
 {
-	"mode": "pre",
+	"mode": "exit",
 	"tag": "next",
 	"initialVersions": {
 		"@squarecloud/api": "3.5.0"
diff --git a/src/assertions/common.ts b/src/assertions/common.ts
@@ -1,8 +1,8 @@
-import {
+import type {
 	APIObjectAssertionProps,
 	LiteralAssertionProps,
 } from "@/types/assertions";
-import * as z from "zod";
+import type * as z from "zod";
 import { SquareCloudAPIError } from "../structures";
 
 export function handleLiteralAssertion({
diff --git a/src/index.ts b/src/index.ts
@@ -5,7 +5,7 @@ import {
 	CacheManager,
 	UserManager,
 } from "./managers";
-import { ClientEvents, TypedEventEmitter } from "./types";
+import { type ClientEvents, TypedEventEmitter } from "./types";
 
 export class SquareCloudAPI extends TypedEventEmitter<ClientEvents> {
 	static apiInfo = {
diff --git a/src/managers/api.ts b/src/managers/api.ts
@@ -1,5 +1,9 @@
-import { APIPayload, APIUserInfo, APIVersion } from "@squarecloud/api-types/v2";
-import { APIApplicationEndpoints, SquareCloudAPIError } from "..";
+import type {
+	APIPayload,
+	APIUserInfo,
+	APIVersion,
+} from "@squarecloud/api-types/v2";
+import { type APIApplicationEndpoints, SquareCloudAPIError } from "..";
 
 export class APIManager {
 	public readonly baseUrl = "https://api.squarecloud.app";
diff --git a/src/managers/application/backup.ts b/src/managers/application/backup.ts
@@ -1,4 +1,4 @@
-import { Application, SquareCloudAPIError } from "@/index";
+import { type Application, SquareCloudAPIError } from "@/index";
 
 export class ApplicationBackupManager {
 	constructor(public readonly application: Application) {}
diff --git a/src/managers/application/cache.ts b/src/managers/application/cache.ts
@@ -1,4 +1,4 @@
-import { ApplicationStatus } from "@/structures";
+import type { ApplicationStatus } from "@/structures";
 
 export type ApplicationCacheKey = "status" | "backup" | "logs";
 
diff --git a/src/managers/application/deploys.ts b/src/managers/application/deploys.ts
@@ -1,5 +1,5 @@
 import { assertString } from "@/assertions/literal";
-import { Application } from "@/index";
+import type { Application } from "@/index";
 
 export class ApplicationDeploysManager {
 	constructor(public readonly application: Application) {}
diff --git a/src/managers/application/files.ts b/src/managers/application/files.ts
@@ -1,6 +1,6 @@
 import { join } from "path";
 import { assertPathLike, assertString } from "@/assertions/literal";
-import { Application } from "@/index";
+import type { Application } from "@/index";
 import { readFile } from "fs/promises";
 
 export class ApplicationFilesManager {
diff --git a/src/managers/application/index.ts b/src/managers/application/index.ts
@@ -1,14 +1,14 @@
 import { assertPathLike, assertString } from "@/assertions/literal";
 import {
-	Application,
-	Collection,
+	type Application,
+	type Collection,
 	SimpleApplicationStatus,
-	SquareCloudAPI,
+	type SquareCloudAPI,
 	SquareCloudAPIError,
 	User,
 } from "@/index";
-import { BaseApplication } from "@/structures/application/base";
-import { RESTPostAPIApplicationUploadResult } from "@squarecloud/api-types/v2";
+import type { BaseApplication } from "@/structures/application/base";
+import type { RESTPostAPIApplicationUploadResult } from "@squarecloud/api-types/v2";
 import FormData from "form-data";
 import { readFile } from "fs/promises";
 
diff --git a/src/managers/application/network.ts b/src/managers/application/network.ts
@@ -1,5 +1,5 @@
 import { assertString } from "@/assertions/literal";
-import { WebsiteApplication } from "@/index";
+import type { WebsiteApplication } from "@/index";
 
 export class ApplicationNetworkManager {
 	constructor(public readonly application: WebsiteApplication) {}
diff --git a/src/managers/cache.ts b/src/managers/cache.ts
@@ -1,4 +1,4 @@
-import { User } from "..";
+import type { User } from "..";
 
 export type CacheKey = "user";
 
diff --git a/src/managers/user.ts b/src/managers/user.ts
@@ -1,4 +1,4 @@
-import { SquareCloudAPI, User } from "..";
+import { type SquareCloudAPI, User } from "..";
 
 export class UserManager {
 	constructor(public readonly client: SquareCloudAPI) {}
diff --git a/src/structures/application/application.ts b/src/structures/application/application.ts
@@ -1,14 +1,17 @@
 import { assertApplication } from "@/assertions/application";
-import { ApplicationStatus, SquareCloudAPI } from "@/index";
+import { ApplicationStatus, type SquareCloudAPI } from "@/index";
 import {
 	ApplicationBackupManager,
 	ApplicationCacheManager,
 	ApplicationDeploysManager,
 	ApplicationFilesManager,
 } from "@/managers";
-import { APIApplication, ApplicationLanguage } from "@squarecloud/api-types/v2";
+import type {
+	APIApplication,
+	ApplicationLanguage,
+} from "@squarecloud/api-types/v2";
 import { BaseApplication } from "./base";
-import { WebsiteApplication } from "./website";
+import type { WebsiteApplication } from "./website";
 
 /**
  * Represents a Square Cloud application
diff --git a/src/structures/application/base.ts b/src/structures/application/base.ts
@@ -1,14 +1,12 @@
 import { assertPathLike, assertString } from "@/assertions/literal";
-import { ApplicationStatus, SquareCloudAPI } from "@/index";
-import {
+import { ApplicationStatus, type SquareCloudAPI } from "@/index";
+import type {
 	APIUserApplication,
-	APIWebsiteApplication,
 	ApplicationLanguage,
 } from "@squarecloud/api-types/v2";
 import FormData from "form-data";
 import { readFile } from "fs/promises";
-import { Application } from "./application";
-import { WebsiteApplication } from "./website";
+import type { Application } from "./application";
 
 /**
  * Represents the base application from the user endpoint
@@ -54,15 +52,7 @@ export class BaseApplication {
 	}
 
 	async fetch(): Promise<Application> {
-		const data = await this.client.api.application("", this.id);
-
-		if ("domain" in data.response && data.response.domain) {
-			return new WebsiteApplication(
-				this.client,
-				data.response as APIWebsiteApplication,
-			);
-		}
-		return new Application(this.client, data.response);
+		return this.client.applications.get(this.id);
 	}
 
 	/** @returns The application current status information */
diff --git a/src/structures/application/website.ts b/src/structures/application/website.ts
@@ -1,7 +1,7 @@
 import { assertWebsiteApplication } from "@/assertions/application";
-import { SquareCloudAPI } from "@/index";
+import type { SquareCloudAPI } from "@/index";
 import { ApplicationNetworkManager } from "@/managers";
-import { APIWebsiteApplication } from "@squarecloud/api-types/v2";
+import type { APIWebsiteApplication } from "@squarecloud/api-types/v2";
 import { Application } from "./application";
 
 /**
diff --git a/src/structures/collection.ts b/src/structures/collection.ts
@@ -4,7 +4,6 @@
 export interface CollectionConstructor {
 	new (): Collection<unknown, unknown>;
 	new <K, V>(entries?: readonly (readonly [K, V])[] | null): Collection<K, V>;
-	// biome-ignore lint/suspicious/noRedeclare: Needed to merge the constructor and the instance methods
 	new <K, V>(iterable: Iterable<readonly [K, V]>): Collection<K, V>;
 	readonly prototype: Collection<unknown, unknown>;
 	readonly [Symbol.species]: CollectionConstructor;
diff --git a/src/structures/index.ts b/src/structures/index.ts
@@ -1,5 +1,6 @@
 export * from "./application/application";
 export * from "./application/website";
+export * from "./application/base";
 export * from "./collection";
 export * from "./error";
 export * from "./status";
diff --git a/src/structures/status.ts b/src/structures/status.ts
@@ -1,11 +1,11 @@
 import { assertSimpleStatus, assertStatus } from "@/assertions/status";
-import { ApplicationStatusUsage } from "@/types/application";
-import {
+import type { ApplicationStatusUsage } from "@/types/application";
+import type {
 	APIApplicationStatus,
 	APIApplicationStatusAll,
 	ApplicationStatus as ApplicationStatusType,
 } from "@squarecloud/api-types/v2";
-import { SquareCloudAPI } from "..";
+import type { SquareCloudAPI } from "..";
 
 export class SimpleApplicationStatus<R extends boolean = boolean> {
 	/** The application's ID this status came from */
diff --git a/src/structures/user.ts b/src/structures/user.ts
@@ -1,7 +1,7 @@
 import { assertUserInfo } from "@/assertions/user";
-import { UserPlan } from "@/types/user";
-import { APIUserInfo } from "@squarecloud/api-types/v2";
-import { Collection, SquareCloudAPI } from "..";
+import type { UserPlan } from "@/types/user";
+import type { APIUserInfo } from "@squarecloud/api-types/v2";
+import { Collection, type SquareCloudAPI } from "..";
 import { BaseApplication } from "./application/base";
 
 /**
diff --git a/src/types/api.ts b/src/types/api.ts
@@ -1,4 +1,4 @@
-import {
+import type {
 	APIApplication,
 	APIApplicationBackup,
 	APIApplicationLogs,
diff --git a/src/types/application.ts b/src/types/application.ts
@@ -1,4 +1,4 @@
-import { APIApplicationStatusNetwork } from "@squarecloud/api-types/v2";
+import type { APIApplicationStatusNetwork } from "@squarecloud/api-types/v2";
 
 export interface ApplicationStatusUsage {
 	/** How much memory the application is currently using */
diff --git a/src/types/assertions.ts b/src/types/assertions.ts
@@ -1,4 +1,4 @@
-import { ZodSchema } from "zod";
+import type { ZodSchema } from "zod";
 
 export interface BaseAssertionProps {
 	schema: ZodSchema;
diff --git a/src/types/client.ts b/src/types/client.ts
@@ -1,5 +1,5 @@
 import EventEmitter from "events";
-import { Application, ApplicationStatus, User } from "..";
+import type { Application, ApplicationStatus, User } from "..";
 
 export class TypedEventEmitter<TEvents extends Record<string, any>> {
 	private emitter = new EventEmitter();
diff --git a/src/types/user.ts b/src/types/user.ts
@@ -1,4 +1,4 @@
-import { APIUserPlan } from "@squarecloud/api-types/v2";
+import type { APIUserPlan } from "@squarecloud/api-types/v2";
 
 export interface UserPlan extends Omit<APIUserPlan, "duration"> {
 	/** In how many milliseconds the plan will expire */

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@squarecloud/api": patch
 +---
++
 +Fix circular dependency error
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "mode": "pre",`
	`2`	`+ "mode": "exit",`
`3`	`3`	`"tag": "next",`
`4`	`4`	`"initialVersions": {`
`5`	`5`	`"@squarecloud/api": "3.5.0"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Application, SquareCloudAPIError } from "@/index";`
	`1`	`+import { type Application, SquareCloudAPIError } from "@/index";`
`2`	`2`
`3`	`3`	`export class ApplicationBackupManager {`
`4`	`4`	`constructor(public readonly application: Application) {}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ApplicationStatus } from "@/structures";`
	`1`	`+import type { ApplicationStatus } from "@/structures";`
`2`	`2`
`3`	`3`	`export type ApplicationCacheKey = "status" \| "backup" \| "logs";`
`4`	`4`