fix: type issues

Author: IMB11

apps/frontend/src/helpers/api.ts

@@ -1,12 +1,12 @@
-import type {
-	AbstractFeature,
-	type AuthConfig,
+import {
 	AuthFeature,
 	CircuitBreakerFeature,
 	NuxtCircuitBreakerStorage,
-	type NuxtClientConfig,
 	NuxtModrinthClient,
 	VerboseLoggingFeature,
+	type AbstractFeature,
+	type AuthConfig,
+	type NuxtClientConfig,
 } from '@modrinth/api-client'
 
 export function createModrinthClient(

apps/frontend/src/pages/[type]/[id]/settings/environment.vue

@@ -27,7 +27,7 @@ const supportsEnvironment = computed(() =>
 const needsToVerify = computed(
 	() =>
 		projectV3.value.side_types_migration_review_status === 'pending' &&
-		projectV3.value.environment?.length > 0 &&
+		(projectV3.value.environment?.length ?? 0) > 0 &&
 		projectV3.value.environment?.[0] !== 'unknown' &&
 		supportsEnvironment.value,
 )
@@ -156,12 +156,12 @@ const messages = defineMessages({
 				/>
 				<ProjectSettingsEnvSelector
 					v-model="current.environment"
-					:disabled="!hasPermission || projectV3?.environment?.length > 1"
+					:disabled="!hasPermission || (projectV3?.environment?.length ?? 0) > 1"
 				/>
 			</template>
 		</div>
 		<UnsavedChangesPopup
-			v-if="supportsEnvironment && hasPermission && projectV3?.environment?.length <= 1"
+			v-if="supportsEnvironment && hasPermission && (projectV3?.environment?.length ?? 0) <= 1"
 			:original="saved"
 			:modified="current"
 			:saving="saving"

packages/api-client/src/index.ts

@@ -1,22 +1,21 @@
 export { AbstractModrinthClient } from './core/abstract-client'
 export { AbstractFeature, type FeatureConfig } from './core/abstract-feature'
 export { ModrinthApiError, ModrinthServerError } from './core/errors'
-export { type AuthConfig, AuthFeature } from './features/auth'
+export { AuthFeature, type AuthConfig } from './features/auth'
 export {
-	type CircuitBreakerConfig,
 	CircuitBreakerFeature,
+	InMemoryCircuitBreakerStorage,
+	type CircuitBreakerConfig,
 	type CircuitBreakerState,
 	type CircuitBreakerStorage,
-	InMemoryCircuitBreakerStorage,
 } from './features/circuit-breaker'
-export { type BackoffStrategy, type RetryConfig, RetryFeature } from './features/retry'
-export { type VerboseLoggingConfig, VerboseLoggingFeature } from './features/verbose-logging'
+export { RetryFeature, type BackoffStrategy, type RetryConfig } from './features/retry'
+export { VerboseLoggingFeature, type VerboseLoggingConfig } from './features/verbose-logging'
 export type { InferredClientModules } from './modules'
-export type { Labrinth } from './modules/labrinth/billing/types'
 export * from './modules/types'
 export { GenericModrinthClient } from './platform/generic'
-export type { NuxtClientConfig } from './platform/nuxt'
 export { NuxtCircuitBreakerStorage, NuxtModrinthClient } from './platform/nuxt'
-export type { TauriClientConfig } from './platform/tauri'
+export type { NuxtClientConfig } from './platform/nuxt'
 export { TauriModrinthClient } from './platform/tauri'
+export type { TauriClientConfig } from './platform/tauri'
 export * from './types'

packages/api-client/src/modules/archon/servers/types/v0.ts

@@ -1,5 +1,5 @@
 import { AbstractModule } from '../../../core/abstract-module'
-import type { Archon } from './types/'
+import type { Archon } from '../types'
 
 export class ArchonServersV0Module extends AbstractModule {
 	public getModuleID(): string {

packages/api-client/src/modules/archon/servers/types/v1.ts

@@ -1,5 +1,5 @@
 import { AbstractModule } from '../../../core/abstract-module'
-import type { Archon } from './types/'
+import type { Archon } from '../types'
 
 export class ArchonServersV1Module extends AbstractModule {
 	public getModuleID(): string {

packages/api-client/src/modules/archon/servers/v0.ts

@@ -1,9 +1,128 @@
-import * as ServersV0 from './servers/types/v0'
-import * as ServersV1 from './servers/types/v1'
-
 export namespace Archon {
 	export namespace Servers {
-		export import v0 = ServersV0
-		export import v1 = ServersV1
+		export namespace v0 {
+			export type ServerGetResponse = {
+				servers: Server[]
+				pagination: Pagination
+			}
+
+			export type Pagination = {
+				current_page: number
+				page_size: number
+				total_pages: number
+				total_items: number
+			}
+
+			export type Status = 'installing' | 'broken' | 'available' | 'suspended'
+
+			export type SuspensionReason =
+				| 'moderated'
+				| 'paymentfailed'
+				| 'cancelled'
+				| 'upgrading'
+				| 'other'
+
+			export type Loader =
+				| 'Forge'
+				| 'NeoForge'
+				| 'Fabric'
+				| 'Quilt'
+				| 'Purpur'
+				| 'Spigot'
+				| 'Vanilla'
+				| 'Paper'
+
+			export type Game = 'Minecraft'
+
+			export type UpstreamKind = 'modpack' | 'none'
+
+			export type Server = {
+				server_id: string
+				name: string
+				owner_id: string
+				net: Net
+				game: Game
+				backup_quota: number
+				used_backup_quota: number
+				status: Status
+				suspension_reason: SuspensionReason | null
+				loader: Loader | null
+				loader_version: string | null
+				mc_version: string | null
+				upstream: Upstream | null
+				sftp_username: string
+				sftp_password: string
+				sftp_host: string
+				datacenter: string
+				notices: Notice[]
+				node: NodeInfo | null
+				flows: Flows
+				is_medal: boolean
+
+				medal_expires?: string
+			}
+
+			export type Net = {
+				ip: string
+				port: number
+				domain: string
+			}
+
+			export type Upstream = {
+				kind: UpstreamKind
+				version_id: string
+				project_id: string
+			}
+
+			export type Notice = {
+				id: number
+				dismissable: boolean
+				title: string
+				message: string
+				level: string
+				announced: string
+			}
+
+			export type NodeInfo = {
+				token: string
+				instance: string
+			}
+
+			export type Flows = {
+				intro: boolean
+			}
+
+			export type GetServersOptions = {
+				limit?: number
+				offset?: number
+			}
+
+			export type StockRequest = {
+				cpu?: number
+				memory_mb?: number
+				swap_mb?: number
+				storage_mb?: number
+			}
+
+			export type StockResponse = {
+				available: number
+			}
+
+			export type JWTAuth = {
+				url: string // e.g., "node-xyz.modrinth.com/modrinth/v0/fs"
+				token: string // JWT token for filesystem access
+			}
+		}
+
+		export namespace v1 {
+			export type Region = {
+				shortcode: string
+				country_code: string
+				display_name: string
+				lat: number
+				lon: number
+				zone: string
+			}
+		}
 	}
 }

packages/api-client/src/modules/archon/servers/v1.ts

@@ -1,7 +1,7 @@
-import * as FilesV0 from './files/types/v0'
-
 export namespace Kyros {
 	export namespace Files {
-		export import v0 = FilesV0
+		export namespace v0 {
+			// Empty for now
+		}
 	}
 }