diff --git a/Cargo.lock b/Cargo.lock index e9454ce9d8..44e7b34075 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -248,6 +248,8 @@ name = "ai" version = "0.1.0" dependencies = [ "analytics", + "api-env", + "api-subscription", "axum 0.8.8", "dotenvy", "envy", @@ -528,10 +530,18 @@ dependencies = [ "tower 0.5.3", ] +[[package]] +name = "api-env" +version = "0.1.0" +dependencies = [ + "serde", +] + [[package]] name = "api-subscription" version = "0.1.0" dependencies = [ + "api-env", "async-stripe", "async-stripe-billing", "async-stripe-core", diff --git a/Cargo.toml b/Cargo.toml index 02a2e0d839..baf01628c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,7 @@ hypr-agc = { path = "crates/agc", package = "agc" } hypr-am = { path = "crates/am", package = "am" } hypr-am2 = { path = "crates/am2", package = "am2" } hypr-analytics = { path = "crates/analytics", package = "analytics" } +hypr-api-env = { path = "crates/api-env", package = "api-env" } hypr-api-subscription = { path = "crates/api-subscription", package = "api-subscription" } hypr-apple-note = { path = "crates/apple-note", package = "apple-note" } hypr-askama-utils = { path = "crates/askama-utils", package = "askama-utils" } diff --git a/apps/ai/Cargo.toml b/apps/ai/Cargo.toml index e17ac6e428..444c629174 100644 --- a/apps/ai/Cargo.toml +++ b/apps/ai/Cargo.toml @@ -5,6 +5,8 @@ edition = "2024" [dependencies] hypr-analytics = { workspace = true } +hypr-api-env = { workspace = true } +hypr-api-subscription = { workspace = true } hypr-llm-proxy = { workspace = true } hypr-supabase-auth = { workspace = true } hypr-transcribe-proxy = { workspace = true } diff --git a/apps/ai/openapi.gen.json b/apps/ai/openapi.gen.json new file mode 100644 index 0000000000..2c90a35ac0 --- /dev/null +++ b/apps/ai/openapi.gen.json @@ -0,0 +1,157 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "Hyprnote AI API", + "description": "AI services API for speech-to-text transcription, LLM chat completions, and subscription management", + "license": { + "name": "" + }, + "version": "1.0.0" + }, + "paths": { + "/subscription/can-start-trial": { + "get": { + "tags": [ + "subscription" + ], + "operationId": "can_start_trial", + "responses": { + "200": { + "description": "Check successful", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CanStartTrialResponse" + } + } + } + }, + "401": { + "description": "Unauthorized" + }, + "500": { + "description": "Internal server error" + } + }, + "security": [ + { + "bearer_auth": [] + } + ] + } + }, + "/subscription/start-trial": { + "post": { + "tags": [ + "subscription" + ], + "operationId": "start_trial", + "parameters": [ + { + "name": "interval", + "in": "query", + "required": false, + "schema": { + "$ref": "#/components/schemas/Interval" + }, + "example": "monthly" + } + ], + "responses": { + "200": { + "description": "Trial started successfully", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/StartTrialResponse" + } + } + } + }, + "401": { + "description": "Unauthorized" + }, + "500": { + "description": "Internal server error" + } + }, + "security": [ + { + "bearer_auth": [] + } + ] + } + } + }, + "components": { + "schemas": { + "CanStartTrialResponse": { + "type": "object", + "required": [ + "canStartTrial" + ], + "properties": { + "canStartTrial": { + "type": "boolean", + "example": true + } + } + }, + "Interval": { + "type": "string", + "enum": [ + "monthly", + "yearly" + ] + }, + "StartTrialResponse": { + "type": "object", + "required": [ + "started" + ], + "properties": { + "started": { + "type": "boolean", + "example": true + } + } + } + }, + "securitySchemes": { + "bearer_auth": { + "type": "http", + "scheme": "bearer", + "bearerFormat": "JWT", + "description": "Supabase JWT token" + }, + "device_fingerprint": { + "type": "apiKey", + "in": "header", + "name": "x-device-fingerprint", + "description": "Optional device fingerprint for analytics" + } + } + }, + "tags": [ + { + "name": "stt", + "description": "Speech-to-text transcription endpoints" + }, + { + "name": "llm", + "description": "LLM chat completions endpoints" + }, + { + "name": "subscription", + "description": "Subscription and trial management" + }, + { + "name": "transcribe", + "description": "Speech-to-text transcription proxy" + }, + { + "name": "llm", + "description": "LLM chat completions proxy" + } + ] +} diff --git a/apps/ai/src/auth.rs b/apps/ai/src/auth.rs index 5aebf5f898..2d340bd816 100644 --- a/apps/ai/src/auth.rs +++ b/apps/ai/src/auth.rs @@ -6,7 +6,7 @@ use axum::{ middleware::Next, response::{IntoResponse, Response}, }; -use hypr_supabase_auth::{Error as SupabaseAuthError, SupabaseAuth}; +use hypr_supabase_auth::{Claims, Error as SupabaseAuthError, SupabaseAuth}; const PRO_ENTITLEMENT: &str = "hyprnote_pro"; pub const DEVICE_FINGERPRINT_HEADER: &str = "x-device-fingerprint"; @@ -53,30 +53,29 @@ impl IntoResponse for AuthError { } } -pub async fn require_pro( - State(state): State, - mut request: Request, - next: Next, -) -> Result { - let auth_header = request - .headers() - .get("Authorization") - .and_then(|h| h.to_str().ok()) - .ok_or(SupabaseAuthError::MissingAuthHeader)?; +struct AuthResult { + token: String, + claims: Claims, +} +async fn setup_auth(state: &AuthState, request: &mut Request) -> Result { let device_fingerprint = request .headers() .get(DEVICE_FINGERPRINT_HEADER) .and_then(|h| h.to_str().ok()) .map(String::from); + let auth_header = request + .headers() + .get("Authorization") + .and_then(|h| h.to_str().ok()) + .ok_or(SupabaseAuthError::MissingAuthHeader)?; + let token = SupabaseAuth::extract_token(auth_header).ok_or(SupabaseAuthError::InvalidAuthHeader)?; + let token = token.to_string(); - let claims = state - .inner - .require_entitlement(token, PRO_ENTITLEMENT) - .await?; + let claims = state.inner.verify_token(&token).await?; sentry::configure_scope(|scope| { scope.set_user(Some(sentry::User { @@ -107,10 +106,44 @@ pub async fn require_pro( .insert(hypr_analytics::DeviceFingerprint(fingerprint)); } - let user_id = claims.sub.clone(); request .extensions_mut() - .insert(hypr_analytics::AuthenticatedUserId(user_id)); + .insert(hypr_analytics::AuthenticatedUserId(claims.sub.clone())); + + Ok(AuthResult { token, claims }) +} + +pub async fn require_pro( + State(state): State, + mut request: Request, + next: Next, +) -> Result { + let auth = setup_auth(&state, &mut request).await?; + + if !auth + .claims + .entitlements + .contains(&PRO_ENTITLEMENT.to_string()) + { + return Err(SupabaseAuthError::MissingEntitlement(PRO_ENTITLEMENT.to_string()).into()); + } + + Ok(next.run(request).await) +} + +pub async fn require_auth( + State(state): State, + mut request: Request, + next: Next, +) -> Result { + let auth = setup_auth(&state, &mut request).await?; + + request + .extensions_mut() + .insert(hypr_api_subscription::AuthContext { + token: auth.token, + claims: auth.claims, + }); Ok(next.run(request).await) } diff --git a/apps/ai/src/env.rs b/apps/ai/src/env.rs index dd03a39c71..c33cc55330 100644 --- a/apps/ai/src/env.rs +++ b/apps/ai/src/env.rs @@ -23,8 +23,11 @@ pub struct Env { pub sentry_dsn: Option, #[serde(default, deserialize_with = "filter_empty")] pub posthog_api_key: Option, - pub supabase_url: String, + #[serde(flatten)] + pub supabase: hypr_api_env::SupabaseEnv, + #[serde(flatten)] + pub stripe: hypr_api_subscription::StripeEnv, #[serde(flatten)] pub llm: hypr_llm_proxy::Env, #[serde(flatten)] diff --git a/apps/ai/src/main.rs b/apps/ai/src/main.rs index 51132350dd..bd90c8563c 100644 --- a/apps/ai/src/main.rs +++ b/apps/ai/src/main.rs @@ -37,9 +37,23 @@ fn app() -> Router { let llm_config = hypr_llm_proxy::LlmProxyConfig::new(&env.llm).with_analytics(analytics.clone()); let stt_config = hypr_transcribe_proxy::SttProxyConfig::new(&env.stt).with_analytics(analytics); - let auth_state = AuthState::new(&env.supabase_url); + let auth_state = AuthState::new(&env.supabase.supabase_url); - let protected_routes = Router::new() + let subscription_config = + hypr_api_subscription::SubscriptionConfig::new(&env.supabase, &env.stripe); + let subscription_state = hypr_api_subscription::AppState::new(subscription_config); + + let auth_routes = Router::new() + .nest( + "/subscription", + hypr_api_subscription::router(subscription_state), + ) + .route_layer(middleware::from_fn_with_state( + auth_state.clone(), + auth::require_auth, + )); + + let pro_routes = Router::new() .merge(hypr_transcribe_proxy::listen_router(stt_config.clone())) .merge(hypr_llm_proxy::chat_completions_router(llm_config.clone())) .nest("/stt", hypr_transcribe_proxy::router(stt_config)) @@ -52,7 +66,8 @@ fn app() -> Router { Router::new() .route("/health", axum::routing::get(|| async { "ok" })) .route("/openapi.json", axum::routing::get(openapi_json)) - .merge(protected_routes) + .merge(auth_routes) + .merge(pro_routes) .layer( CorsLayer::new() .allow_origin(cors::Any) @@ -145,6 +160,8 @@ fn app() -> Router { } fn main() -> std::io::Result<()> { + openapi::write_json(); + let env = env(); let _guard = sentry::init(sentry::ClientOptions { diff --git a/apps/ai/src/openapi.rs b/apps/ai/src/openapi.rs index cd2567da3f..0a3f78318b 100644 --- a/apps/ai/src/openapi.rs +++ b/apps/ai/src/openapi.rs @@ -6,11 +6,12 @@ use utoipa::{Modify, OpenApi}; info( title = "Hyprnote AI API", version = "1.0.0", - description = "AI services API for speech-to-text transcription and LLM chat completions" + description = "AI services API for speech-to-text transcription, LLM chat completions, and subscription management" ), tags( (name = "stt", description = "Speech-to-text transcription endpoints"), - (name = "llm", description = "LLM chat completions endpoints") + (name = "llm", description = "LLM chat completions endpoints"), + (name = "subscription", description = "Subscription and trial management") ), modifiers(&SecurityAddon) )] @@ -21,13 +22,22 @@ pub fn openapi() -> utoipa::openapi::OpenApi { let stt_doc = hypr_transcribe_proxy::openapi(); let llm_doc = hypr_llm_proxy::openapi(); + let subscription_doc = hypr_api_subscription::openapi(); doc.merge(stt_doc); doc.merge(llm_doc); + doc.merge(subscription_doc); doc } +pub fn write_json() { + let doc = openapi(); + let json = serde_json::to_string_pretty(&doc).expect("Failed to serialize OpenAPI spec"); + let path = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("openapi.gen.json"); + std::fs::write(&path, json).expect("Failed to write openapi.gen.json"); +} + struct SecurityAddon; impl Modify for SecurityAddon { diff --git a/crates/api-env/Cargo.toml b/crates/api-env/Cargo.toml new file mode 100644 index 0000000000..8f7d17e88b --- /dev/null +++ b/crates/api-env/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "api-env" +version = "0.1.0" +edition = "2024" + +[dependencies] +serde = { workspace = true, features = ["derive"] } diff --git a/crates/api-env/src/lib.rs b/crates/api-env/src/lib.rs new file mode 100644 index 0000000000..a9c1a3c728 --- /dev/null +++ b/crates/api-env/src/lib.rs @@ -0,0 +1,7 @@ +use serde::Deserialize; + +#[derive(Clone, Deserialize)] +pub struct SupabaseEnv { + pub supabase_url: String, + pub supabase_anon_key: String, +} diff --git a/crates/api-subscription/Cargo.toml b/crates/api-subscription/Cargo.toml index 51771b66a2..5962b5b707 100644 --- a/crates/api-subscription/Cargo.toml +++ b/crates/api-subscription/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" edition = "2024" [dependencies] +hypr-api-env = { workspace = true } hypr-supabase-auth = { workspace = true } utoipa = { workspace = true } diff --git a/crates/api-subscription/src/config.rs b/crates/api-subscription/src/config.rs index 6bec5d39c4..dca9f19c3c 100644 --- a/crates/api-subscription/src/config.rs +++ b/crates/api-subscription/src/config.rs @@ -1,4 +1,5 @@ -use std::sync::Arc; +use crate::StripeEnv; +use hypr_api_env::SupabaseEnv; #[derive(Clone)] pub struct SubscriptionConfig { @@ -7,37 +8,16 @@ pub struct SubscriptionConfig { pub stripe_api_key: String, pub stripe_monthly_price_id: String, pub stripe_yearly_price_id: String, - pub auth: Option>, } impl SubscriptionConfig { - pub fn new( - supabase_url: impl Into, - supabase_anon_key: impl Into, - stripe_api_key: impl Into, - ) -> Self { + pub fn new(supabase: &SupabaseEnv, stripe: &StripeEnv) -> Self { Self { - supabase_url: supabase_url.into(), - supabase_anon_key: supabase_anon_key.into(), - stripe_api_key: stripe_api_key.into(), - stripe_monthly_price_id: String::new(), - stripe_yearly_price_id: String::new(), - auth: None, + supabase_url: supabase.supabase_url.clone(), + supabase_anon_key: supabase.supabase_anon_key.clone(), + stripe_api_key: stripe.stripe_api_key.clone(), + stripe_monthly_price_id: stripe.stripe_monthly_price_id.clone(), + stripe_yearly_price_id: stripe.stripe_yearly_price_id.clone(), } } - - pub fn with_stripe_monthly_price(mut self, price_id: impl Into) -> Self { - self.stripe_monthly_price_id = price_id.into(); - self - } - - pub fn with_stripe_yearly_price(mut self, price_id: impl Into) -> Self { - self.stripe_yearly_price_id = price_id.into(); - self - } - - pub fn with_auth(mut self, auth: Arc) -> Self { - self.auth = Some(auth); - self - } } diff --git a/crates/api-subscription/src/env.rs b/crates/api-subscription/src/env.rs index 9943042bab..accdf66410 100644 --- a/crates/api-subscription/src/env.rs +++ b/crates/api-subscription/src/env.rs @@ -1,9 +1,7 @@ use serde::Deserialize; #[derive(Deserialize)] -pub struct Env { - pub supabase_url: String, - pub supabase_anon_key: String, +pub struct StripeEnv { pub stripe_api_key: String, pub stripe_monthly_price_id: String, pub stripe_yearly_price_id: String, diff --git a/crates/api-subscription/src/lib.rs b/crates/api-subscription/src/lib.rs index e9f82745a3..412b2788cc 100644 --- a/crates/api-subscription/src/lib.rs +++ b/crates/api-subscription/src/lib.rs @@ -6,7 +6,8 @@ mod state; mod supabase; pub use config::SubscriptionConfig; -pub use env::Env; +pub use env::StripeEnv; pub use error::{Result, SubscriptionError}; -pub use routes::{openapi, router}; +pub use hypr_api_env::SupabaseEnv; +pub use routes::{AuthContext, openapi, router}; pub use state::AppState; diff --git a/crates/api-subscription/src/routes/billing.rs b/crates/api-subscription/src/routes/billing.rs index 0b1c66c38e..4f9d42d0c5 100644 --- a/crates/api-subscription/src/routes/billing.rs +++ b/crates/api-subscription/src/routes/billing.rs @@ -1,7 +1,6 @@ use axum::{ - Json, + Extension, Json, extract::{Query, State}, - http::HeaderMap, }; use chrono::Utc; use serde::{Deserialize, Serialize}; @@ -16,7 +15,7 @@ use stripe_core::customer::CreateCustomer; use utoipa::{IntoParams, ToSchema}; use crate::error::{Result, SubscriptionError}; -use crate::routes::rpc::extract_token; +use crate::routes::rpc::AuthContext; use crate::state::AppState; #[derive(Debug, Deserialize, IntoParams)] @@ -50,7 +49,7 @@ struct Profile { #[utoipa::path( post, - path = "/start-trial", + path = "/subscription/start-trial", params(StartTrialQuery), responses( (status = 200, description = "Trial started successfully", body = StartTrialResponse), @@ -65,32 +64,20 @@ struct Profile { pub async fn start_trial( State(state): State, Query(query): Query, - headers: HeaderMap, + Extension(auth): Extension, ) -> Result> { - let auth_token = extract_token(&headers)?; - - let auth = state - .config - .auth - .as_ref() - .ok_or_else(|| SubscriptionError::Auth("Auth not configured".to_string()))?; - - let claims = auth - .verify_token(auth_token) - .await - .map_err(|e| SubscriptionError::Auth(e.to_string()))?; - let user_id = claims.sub; + let user_id = &auth.claims.sub; let can_start: bool = state .supabase - .rpc("can_start_trial", auth_token, None) + .rpc("can_start_trial", &auth.token, None) .await?; if !can_start { return Ok(Json(StartTrialResponse { started: false })); } - let customer_id = get_or_create_customer(&state, auth_token, &user_id).await?; + let customer_id = get_or_create_customer(&state, &auth.token, user_id).await?; let customer_id = customer_id .ok_or_else(|| SubscriptionError::Internal("stripe_customer_id_missing".to_string()))?; @@ -100,7 +87,7 @@ pub async fn start_trial( Interval::Yearly => &state.config.stripe_yearly_price_id, }; - create_trial_subscription(&state.stripe, &customer_id, price_id, &user_id).await?; + create_trial_subscription(&state.stripe, &customer_id, price_id, user_id).await?; Ok(Json(StartTrialResponse { started: true })) } diff --git a/crates/api-subscription/src/routes/mod.rs b/crates/api-subscription/src/routes/mod.rs index 3b08b41245..0a2b90d337 100644 --- a/crates/api-subscription/src/routes/mod.rs +++ b/crates/api-subscription/src/routes/mod.rs @@ -10,7 +10,7 @@ use utoipa::OpenApi; use crate::state::AppState; pub use billing::{Interval, StartTrialResponse}; -pub use rpc::CanStartTrialResponse; +pub use rpc::{AuthContext, CanStartTrialResponse}; #[derive(OpenApi)] #[openapi( diff --git a/crates/api-subscription/src/routes/rpc.rs b/crates/api-subscription/src/routes/rpc.rs index 2b94527fbe..36c4df1f48 100644 --- a/crates/api-subscription/src/routes/rpc.rs +++ b/crates/api-subscription/src/routes/rpc.rs @@ -1,10 +1,18 @@ -use axum::{Json, extract::State, http::HeaderMap}; +use axum::{Extension, Json, extract::State}; use serde::Serialize; use utoipa::ToSchema; -use crate::error::{Result, SubscriptionError}; +use crate::error::Result; use crate::state::AppState; +pub use hypr_supabase_auth::Claims as AuthClaims; + +#[derive(Clone)] +pub struct AuthContext { + pub token: String, + pub claims: AuthClaims, +} + #[derive(Debug, Serialize, ToSchema)] #[serde(rename_all = "camelCase")] pub struct CanStartTrialResponse { @@ -14,7 +22,7 @@ pub struct CanStartTrialResponse { #[utoipa::path( get, - path = "/can-start-trial", + path = "/subscription/can-start-trial", responses( (status = 200, description = "Check successful", body = CanStartTrialResponse), (status = 401, description = "Unauthorized"), @@ -27,23 +35,11 @@ pub struct CanStartTrialResponse { )] pub async fn can_start_trial( State(state): State, - headers: HeaderMap, + Extension(auth): Extension, ) -> Result> { - let auth_token = extract_token(&headers)?; - - let auth = state - .config - .auth - .as_ref() - .ok_or_else(|| SubscriptionError::Auth("Auth not configured".to_string()))?; - - auth.verify_token(auth_token) - .await - .map_err(|e| SubscriptionError::Auth(e.to_string()))?; - let can_start: bool = state .supabase - .rpc("can_start_trial", auth_token, None) + .rpc("can_start_trial", &auth.token, None) .await .unwrap_or(false); @@ -51,13 +47,3 @@ pub async fn can_start_trial( can_start_trial: can_start, })) } - -pub fn extract_token(headers: &HeaderMap) -> Result<&str> { - let auth_header = headers - .get("Authorization") - .and_then(|h| h.to_str().ok()) - .ok_or_else(|| SubscriptionError::Auth("Missing Authorization header".to_string()))?; - - hypr_supabase_auth::SupabaseAuth::extract_token(auth_header) - .ok_or_else(|| SubscriptionError::Auth("Invalid Authorization header".to_string())) -} diff --git a/crates/supabase-auth/src/claims.rs b/crates/supabase-auth/src/claims.rs index 99791da39a..0800d39e1e 100644 --- a/crates/supabase-auth/src/claims.rs +++ b/crates/supabase-auth/src/claims.rs @@ -3,7 +3,7 @@ use chrono::{DateTime, Utc}; use crate::error::Error; // https://docs.stripe.com/api/subscriptions/object#subscription_object-status -#[derive(Debug, serde::Serialize, serde::Deserialize, specta::Type)] +#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, specta::Type)] #[serde(rename_all = "snake_case")] pub enum SubscriptionStatus { Incomplete, @@ -16,7 +16,7 @@ pub enum SubscriptionStatus { Paused, } -#[derive(Debug, serde::Serialize, serde::Deserialize, specta::Type)] +#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, specta::Type)] pub struct Claims { pub sub: String, #[serde(default)] diff --git a/packages/api-client2/openapi-ts.config.ts b/packages/api-client2/openapi-ts.config.ts new file mode 100644 index 0000000000..d97fe0a3bb --- /dev/null +++ b/packages/api-client2/openapi-ts.config.ts @@ -0,0 +1,6 @@ +import { defineConfig } from "@hey-api/openapi-ts"; + +export default defineConfig({ + input: "../../apps/ai/openapi.gen.json", + output: "src/generated", +}); diff --git a/packages/api-client2/package.json b/packages/api-client2/package.json new file mode 100644 index 0000000000..c05ecd16dc --- /dev/null +++ b/packages/api-client2/package.json @@ -0,0 +1,13 @@ +{ + "name": "@hypr/api-client2", + "exports": { + ".": "./src/generated/index.ts", + "./client": "./src/generated/client/index.ts" + }, + "scripts": { + "openapi": "openapi-ts -c openapi-ts.config.ts" + }, + "devDependencies": { + "@hey-api/openapi-ts": "^0.91.1" + } +} diff --git a/packages/api-client2/src/generated/client.gen.ts b/packages/api-client2/src/generated/client.gen.ts new file mode 100644 index 0000000000..cab3c70195 --- /dev/null +++ b/packages/api-client2/src/generated/client.gen.ts @@ -0,0 +1,16 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import type { ClientOptions as ClientOptions2 } from './types.gen'; + +/** + * The `createClientConfig()` function will be called on client initialization + * and the returned object will become the client's initial configuration. + * + * You may want to initialize your client this way instead of calling + * `setConfig()`. This is useful for example if you're using Next.js + * to ensure your client always has the correct values. + */ +export type CreateClientConfig = (override?: Config) => Config & T>; + +export const client = createClient(createConfig()); diff --git a/packages/api-client2/src/generated/client/client.gen.ts b/packages/api-client2/src/generated/client/client.gen.ts new file mode 100644 index 0000000000..d2e55a1449 --- /dev/null +++ b/packages/api-client2/src/generated/client/client.gen.ts @@ -0,0 +1,288 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import { createSseClient } from '../core/serverSentEvents.gen'; +import type { HttpMethod } from '../core/types.gen'; +import { getValidRequestBody } from '../core/utils.gen'; +import type { Client, Config, RequestOptions, ResolvedRequestOptions } from './types.gen'; +import { + buildUrl, + createConfig, + createInterceptors, + getParseAs, + mergeConfigs, + mergeHeaders, + setAuthParams, +} from './utils.gen'; + +type ReqInit = Omit & { + body?: any; + headers: ReturnType; +}; + +export const createClient = (config: Config = {}): Client => { + let _config = mergeConfigs(createConfig(), config); + + const getConfig = (): Config => ({ ..._config }); + + const setConfig = (config: Config): Config => { + _config = mergeConfigs(_config, config); + return getConfig(); + }; + + const interceptors = createInterceptors(); + + const beforeRequest = async (options: RequestOptions) => { + const opts = { + ..._config, + ...options, + fetch: options.fetch ?? _config.fetch ?? globalThis.fetch, + headers: mergeHeaders(_config.headers, options.headers), + serializedBody: undefined, + }; + + if (opts.security) { + await setAuthParams({ + ...opts, + security: opts.security, + }); + } + + if (opts.requestValidator) { + await opts.requestValidator(opts); + } + + if (opts.body !== undefined && opts.bodySerializer) { + opts.serializedBody = opts.bodySerializer(opts.body); + } + + // remove Content-Type header if body is empty to avoid sending invalid requests + if (opts.body === undefined || opts.serializedBody === '') { + opts.headers.delete('Content-Type'); + } + + const url = buildUrl(opts); + + return { opts, url }; + }; + + const request: Client['request'] = async (options) => { + // @ts-expect-error + const { opts, url } = await beforeRequest(options); + const requestInit: ReqInit = { + redirect: 'follow', + ...opts, + body: getValidRequestBody(opts), + }; + + let request = new Request(url, requestInit); + + for (const fn of interceptors.request.fns) { + if (fn) { + request = await fn(request, opts); + } + } + + // fetch must be assigned here, otherwise it would throw the error: + // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation + const _fetch = opts.fetch!; + let response: Response; + + try { + response = await _fetch(request); + } catch (error) { + // Handle fetch exceptions (AbortError, network errors, etc.) + let finalError = error; + + for (const fn of interceptors.error.fns) { + if (fn) { + finalError = (await fn(error, undefined as any, request, opts)) as unknown; + } + } + + finalError = finalError || ({} as unknown); + + if (opts.throwOnError) { + throw finalError; + } + + // Return error response + return opts.responseStyle === 'data' + ? undefined + : { + error: finalError, + request, + response: undefined as any, + }; + } + + for (const fn of interceptors.response.fns) { + if (fn) { + response = await fn(response, request, opts); + } + } + + const result = { + request, + response, + }; + + if (response.ok) { + const parseAs = + (opts.parseAs === 'auto' + ? getParseAs(response.headers.get('Content-Type')) + : opts.parseAs) ?? 'json'; + + if (response.status === 204 || response.headers.get('Content-Length') === '0') { + let emptyData: any; + switch (parseAs) { + case 'arrayBuffer': + case 'blob': + case 'text': + emptyData = await response[parseAs](); + break; + case 'formData': + emptyData = new FormData(); + break; + case 'stream': + emptyData = response.body; + break; + case 'json': + default: + emptyData = {}; + break; + } + return opts.responseStyle === 'data' + ? emptyData + : { + data: emptyData, + ...result, + }; + } + + let data: any; + switch (parseAs) { + case 'arrayBuffer': + case 'blob': + case 'formData': + case 'text': + data = await response[parseAs](); + break; + case 'json': { + // Some servers return 200 with no Content-Length and empty body. + // response.json() would throw; read as text and parse if non-empty. + const text = await response.text(); + data = text ? JSON.parse(text) : {}; + break; + } + case 'stream': + return opts.responseStyle === 'data' + ? response.body + : { + data: response.body, + ...result, + }; + } + + if (parseAs === 'json') { + if (opts.responseValidator) { + await opts.responseValidator(data); + } + + if (opts.responseTransformer) { + data = await opts.responseTransformer(data); + } + } + + return opts.responseStyle === 'data' + ? data + : { + data, + ...result, + }; + } + + const textError = await response.text(); + let jsonError: unknown; + + try { + jsonError = JSON.parse(textError); + } catch { + // noop + } + + const error = jsonError ?? textError; + let finalError = error; + + for (const fn of interceptors.error.fns) { + if (fn) { + finalError = (await fn(error, response, request, opts)) as string; + } + } + + finalError = finalError || ({} as string); + + if (opts.throwOnError) { + throw finalError; + } + + // TODO: we probably want to return error and improve types + return opts.responseStyle === 'data' + ? undefined + : { + error: finalError, + ...result, + }; + }; + + const makeMethodFn = (method: Uppercase) => (options: RequestOptions) => + request({ ...options, method }); + + const makeSseFn = (method: Uppercase) => async (options: RequestOptions) => { + const { opts, url } = await beforeRequest(options); + return createSseClient({ + ...opts, + body: opts.body as BodyInit | null | undefined, + headers: opts.headers as unknown as Record, + method, + onRequest: async (url, init) => { + let request = new Request(url, init); + for (const fn of interceptors.request.fns) { + if (fn) { + request = await fn(request, opts); + } + } + return request; + }, + serializedBody: getValidRequestBody(opts) as BodyInit | null | undefined, + url, + }); + }; + + return { + buildUrl, + connect: makeMethodFn('CONNECT'), + delete: makeMethodFn('DELETE'), + get: makeMethodFn('GET'), + getConfig, + head: makeMethodFn('HEAD'), + interceptors, + options: makeMethodFn('OPTIONS'), + patch: makeMethodFn('PATCH'), + post: makeMethodFn('POST'), + put: makeMethodFn('PUT'), + request, + setConfig, + sse: { + connect: makeSseFn('CONNECT'), + delete: makeSseFn('DELETE'), + get: makeSseFn('GET'), + head: makeSseFn('HEAD'), + options: makeSseFn('OPTIONS'), + patch: makeSseFn('PATCH'), + post: makeSseFn('POST'), + put: makeSseFn('PUT'), + trace: makeSseFn('TRACE'), + }, + trace: makeMethodFn('TRACE'), + } as Client; +}; diff --git a/packages/api-client2/src/generated/client/index.ts b/packages/api-client2/src/generated/client/index.ts new file mode 100644 index 0000000000..b295edeca0 --- /dev/null +++ b/packages/api-client2/src/generated/client/index.ts @@ -0,0 +1,25 @@ +// This file is auto-generated by @hey-api/openapi-ts + +export type { Auth } from '../core/auth.gen'; +export type { QuerySerializerOptions } from '../core/bodySerializer.gen'; +export { + formDataBodySerializer, + jsonBodySerializer, + urlSearchParamsBodySerializer, +} from '../core/bodySerializer.gen'; +export { buildClientParams } from '../core/params.gen'; +export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export { createClient } from './client.gen'; +export type { + Client, + ClientOptions, + Config, + CreateClientConfig, + Options, + RequestOptions, + RequestResult, + ResolvedRequestOptions, + ResponseStyle, + TDataShape, +} from './types.gen'; +export { createConfig, mergeHeaders } from './utils.gen'; diff --git a/packages/api-client2/src/generated/client/types.gen.ts b/packages/api-client2/src/generated/client/types.gen.ts new file mode 100644 index 0000000000..cb6d0d54a0 --- /dev/null +++ b/packages/api-client2/src/generated/client/types.gen.ts @@ -0,0 +1,213 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import type { Auth } from '../core/auth.gen'; +import type { + ServerSentEventsOptions, + ServerSentEventsResult, +} from '../core/serverSentEvents.gen'; +import type { Client as CoreClient, Config as CoreConfig } from '../core/types.gen'; +import type { Middleware } from './utils.gen'; + +export type ResponseStyle = 'data' | 'fields'; + +export interface Config + extends Omit, CoreConfig { + /** + * Base URL for all requests made by this client. + */ + baseUrl?: T['baseUrl']; + /** + * Fetch API implementation. You can use this option to provide a custom + * fetch instance. + * + * @default globalThis.fetch + */ + fetch?: typeof fetch; + /** + * Please don't use the Fetch client for Next.js applications. The `next` + * options won't have any effect. + * + * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead. + */ + next?: never; + /** + * Return the response data parsed in a specified format. By default, `auto` + * will infer the appropriate method from the `Content-Type` response header. + * You can override this behavior with any of the {@link Body} methods. + * Select `stream` if you don't want to parse response data at all. + * + * @default 'auto' + */ + parseAs?: 'arrayBuffer' | 'auto' | 'blob' | 'formData' | 'json' | 'stream' | 'text'; + /** + * Should we return only data or multiple fields (data, error, response, etc.)? + * + * @default 'fields' + */ + responseStyle?: ResponseStyle; + /** + * Throw an error instead of returning it in the response? + * + * @default false + */ + throwOnError?: T['throwOnError']; +} + +export interface RequestOptions< + TData = unknown, + TResponseStyle extends ResponseStyle = 'fields', + ThrowOnError extends boolean = boolean, + Url extends string = string, +> + extends + Config<{ + responseStyle: TResponseStyle; + throwOnError: ThrowOnError; + }>, + Pick< + ServerSentEventsOptions, + | 'onSseError' + | 'onSseEvent' + | 'sseDefaultRetryDelay' + | 'sseMaxRetryAttempts' + | 'sseMaxRetryDelay' + > { + /** + * Any body that you want to add to your request. + * + * {@link https://developer.mozilla.org/docs/Web/API/fetch#body} + */ + body?: unknown; + path?: Record; + query?: Record; + /** + * Security mechanism(s) to use for the request. + */ + security?: ReadonlyArray; + url: Url; +} + +export interface ResolvedRequestOptions< + TResponseStyle extends ResponseStyle = 'fields', + ThrowOnError extends boolean = boolean, + Url extends string = string, +> extends RequestOptions { + serializedBody?: string; +} + +export type RequestResult< + TData = unknown, + TError = unknown, + ThrowOnError extends boolean = boolean, + TResponseStyle extends ResponseStyle = 'fields', +> = ThrowOnError extends true + ? Promise< + TResponseStyle extends 'data' + ? TData extends Record + ? TData[keyof TData] + : TData + : { + data: TData extends Record ? TData[keyof TData] : TData; + request: Request; + response: Response; + } + > + : Promise< + TResponseStyle extends 'data' + ? (TData extends Record ? TData[keyof TData] : TData) | undefined + : ( + | { + data: TData extends Record ? TData[keyof TData] : TData; + error: undefined; + } + | { + data: undefined; + error: TError extends Record ? TError[keyof TError] : TError; + } + ) & { + request: Request; + response: Response; + } + >; + +export interface ClientOptions { + baseUrl?: string; + responseStyle?: ResponseStyle; + throwOnError?: boolean; +} + +type MethodFn = < + TData = unknown, + TError = unknown, + ThrowOnError extends boolean = false, + TResponseStyle extends ResponseStyle = 'fields', +>( + options: Omit, 'method'>, +) => RequestResult; + +type SseFn = < + TData = unknown, + TError = unknown, + ThrowOnError extends boolean = false, + TResponseStyle extends ResponseStyle = 'fields', +>( + options: Omit, 'method'>, +) => Promise>; + +type RequestFn = < + TData = unknown, + TError = unknown, + ThrowOnError extends boolean = false, + TResponseStyle extends ResponseStyle = 'fields', +>( + options: Omit, 'method'> & + Pick>, 'method'>, +) => RequestResult; + +type BuildUrlFn = < + TData extends { + body?: unknown; + path?: Record; + query?: Record; + url: string; + }, +>( + options: TData & Options, +) => string; + +export type Client = CoreClient & { + interceptors: Middleware; +}; + +/** + * The `createClientConfig()` function will be called on client initialization + * and the returned object will become the client's initial configuration. + * + * You may want to initialize your client this way instead of calling + * `setConfig()`. This is useful for example if you're using Next.js + * to ensure your client always has the correct values. + */ +export type CreateClientConfig = ( + override?: Config, +) => Config & T>; + +export interface TDataShape { + body?: unknown; + headers?: unknown; + path?: unknown; + query?: unknown; + url: string; +} + +type OmitKeys = Pick>; + +export type Options< + TData extends TDataShape = TDataShape, + ThrowOnError extends boolean = boolean, + TResponse = unknown, + TResponseStyle extends ResponseStyle = 'fields', +> = OmitKeys< + RequestOptions, + 'body' | 'path' | 'query' | 'url' +> & + ([TData] extends [never] ? unknown : Omit); diff --git a/packages/api-client2/src/generated/client/utils.gen.ts b/packages/api-client2/src/generated/client/utils.gen.ts new file mode 100644 index 0000000000..b4bd2435ce --- /dev/null +++ b/packages/api-client2/src/generated/client/utils.gen.ts @@ -0,0 +1,316 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import { getAuthToken } from '../core/auth.gen'; +import type { QuerySerializerOptions } from '../core/bodySerializer.gen'; +import { jsonBodySerializer } from '../core/bodySerializer.gen'; +import { + serializeArrayParam, + serializeObjectParam, + serializePrimitiveParam, +} from '../core/pathSerializer.gen'; +import { getUrl } from '../core/utils.gen'; +import type { Client, ClientOptions, Config, RequestOptions } from './types.gen'; + +export const createQuerySerializer = ({ + parameters = {}, + ...args +}: QuerySerializerOptions = {}) => { + const querySerializer = (queryParams: T) => { + const search: string[] = []; + if (queryParams && typeof queryParams === 'object') { + for (const name in queryParams) { + const value = queryParams[name]; + + if (value === undefined || value === null) { + continue; + } + + const options = parameters[name] || args; + + if (Array.isArray(value)) { + const serializedArray = serializeArrayParam({ + allowReserved: options.allowReserved, + explode: true, + name, + style: 'form', + value, + ...options.array, + }); + if (serializedArray) search.push(serializedArray); + } else if (typeof value === 'object') { + const serializedObject = serializeObjectParam({ + allowReserved: options.allowReserved, + explode: true, + name, + style: 'deepObject', + value: value as Record, + ...options.object, + }); + if (serializedObject) search.push(serializedObject); + } else { + const serializedPrimitive = serializePrimitiveParam({ + allowReserved: options.allowReserved, + name, + value: value as string, + }); + if (serializedPrimitive) search.push(serializedPrimitive); + } + } + } + return search.join('&'); + }; + return querySerializer; +}; + +/** + * Infers parseAs value from provided Content-Type header. + */ +export const getParseAs = (contentType: string | null): Exclude => { + if (!contentType) { + // If no Content-Type header is provided, the best we can do is return the raw response body, + // which is effectively the same as the 'stream' option. + return 'stream'; + } + + const cleanContent = contentType.split(';')[0]?.trim(); + + if (!cleanContent) { + return; + } + + if (cleanContent.startsWith('application/json') || cleanContent.endsWith('+json')) { + return 'json'; + } + + if (cleanContent === 'multipart/form-data') { + return 'formData'; + } + + if ( + ['application/', 'audio/', 'image/', 'video/'].some((type) => cleanContent.startsWith(type)) + ) { + return 'blob'; + } + + if (cleanContent.startsWith('text/')) { + return 'text'; + } + + return; +}; + +const checkForExistence = ( + options: Pick & { + headers: Headers; + }, + name?: string, +): boolean => { + if (!name) { + return false; + } + if ( + options.headers.has(name) || + options.query?.[name] || + options.headers.get('Cookie')?.includes(`${name}=`) + ) { + return true; + } + return false; +}; + +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { + headers: Headers; + }) => { + for (const auth of security) { + if (checkForExistence(options, auth.name)) { + continue; + } + + const token = await getAuthToken(auth, options.auth); + + if (!token) { + continue; + } + + const name = auth.name ?? 'Authorization'; + + switch (auth.in) { + case 'query': + if (!options.query) { + options.query = {}; + } + options.query[name] = token; + break; + case 'cookie': + options.headers.append('Cookie', `${name}=${token}`); + break; + case 'header': + default: + options.headers.set(name, token); + break; + } + } +}; + +export const buildUrl: Client['buildUrl'] = (options) => + getUrl({ + baseUrl: options.baseUrl as string, + path: options.path, + query: options.query, + querySerializer: + typeof options.querySerializer === 'function' + ? options.querySerializer + : createQuerySerializer(options.querySerializer), + url: options.url, + }); + +export const mergeConfigs = (a: Config, b: Config): Config => { + const config = { ...a, ...b }; + if (config.baseUrl?.endsWith('/')) { + config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1); + } + config.headers = mergeHeaders(a.headers, b.headers); + return config; +}; + +const headersEntries = (headers: Headers): Array<[string, string]> => { + const entries: Array<[string, string]> = []; + headers.forEach((value, key) => { + entries.push([key, value]); + }); + return entries; +}; + +export const mergeHeaders = ( + ...headers: Array['headers'] | undefined> +): Headers => { + const mergedHeaders = new Headers(); + for (const header of headers) { + if (!header) { + continue; + } + + const iterator = header instanceof Headers ? headersEntries(header) : Object.entries(header); + + for (const [key, value] of iterator) { + if (value === null) { + mergedHeaders.delete(key); + } else if (Array.isArray(value)) { + for (const v of value) { + mergedHeaders.append(key, v as string); + } + } else if (value !== undefined) { + // assume object headers are meant to be JSON stringified, i.e. their + // content value in OpenAPI specification is 'application/json' + mergedHeaders.set( + key, + typeof value === 'object' ? JSON.stringify(value) : (value as string), + ); + } + } + } + return mergedHeaders; +}; + +type ErrInterceptor = ( + error: Err, + response: Res, + request: Req, + options: Options, +) => Err | Promise; + +type ReqInterceptor = (request: Req, options: Options) => Req | Promise; + +type ResInterceptor = ( + response: Res, + request: Req, + options: Options, +) => Res | Promise; + +class Interceptors { + fns: Array = []; + + clear(): void { + this.fns = []; + } + + eject(id: number | Interceptor): void { + const index = this.getInterceptorIndex(id); + if (this.fns[index]) { + this.fns[index] = null; + } + } + + exists(id: number | Interceptor): boolean { + const index = this.getInterceptorIndex(id); + return Boolean(this.fns[index]); + } + + getInterceptorIndex(id: number | Interceptor): number { + if (typeof id === 'number') { + return this.fns[id] ? id : -1; + } + return this.fns.indexOf(id); + } + + update(id: number | Interceptor, fn: Interceptor): number | Interceptor | false { + const index = this.getInterceptorIndex(id); + if (this.fns[index]) { + this.fns[index] = fn; + return id; + } + return false; + } + + use(fn: Interceptor): number { + this.fns.push(fn); + return this.fns.length - 1; + } +} + +export interface Middleware { + error: Interceptors>; + request: Interceptors>; + response: Interceptors>; +} + +export const createInterceptors = (): Middleware< + Req, + Res, + Err, + Options +> => ({ + error: new Interceptors>(), + request: new Interceptors>(), + response: new Interceptors>(), +}); + +const defaultQuerySerializer = createQuerySerializer({ + allowReserved: false, + array: { + explode: true, + style: 'form', + }, + object: { + explode: true, + style: 'deepObject', + }, +}); + +const defaultHeaders = { + 'Content-Type': 'application/json', +}; + +export const createConfig = ( + override: Config & T> = {}, +): Config & T> => ({ + ...jsonBodySerializer, + headers: defaultHeaders, + parseAs: 'auto', + querySerializer: defaultQuerySerializer, + ...override, +}); diff --git a/packages/api-client2/src/generated/core/auth.gen.ts b/packages/api-client2/src/generated/core/auth.gen.ts new file mode 100644 index 0000000000..3ebf994788 --- /dev/null +++ b/packages/api-client2/src/generated/core/auth.gen.ts @@ -0,0 +1,41 @@ +// This file is auto-generated by @hey-api/openapi-ts + +export type AuthToken = string | undefined; + +export interface Auth { + /** + * Which part of the request do we use to send the auth? + * + * @default 'header' + */ + in?: 'header' | 'query' | 'cookie'; + /** + * Header or query parameter name. + * + * @default 'Authorization' + */ + name?: string; + scheme?: 'basic' | 'bearer'; + type: 'apiKey' | 'http'; +} + +export const getAuthToken = async ( + auth: Auth, + callback: ((auth: Auth) => Promise | AuthToken) | AuthToken, +): Promise => { + const token = typeof callback === 'function' ? await callback(auth) : callback; + + if (!token) { + return; + } + + if (auth.scheme === 'bearer') { + return `Bearer ${token}`; + } + + if (auth.scheme === 'basic') { + return `Basic ${btoa(token)}`; + } + + return token; +}; diff --git a/packages/api-client2/src/generated/core/bodySerializer.gen.ts b/packages/api-client2/src/generated/core/bodySerializer.gen.ts new file mode 100644 index 0000000000..8ad92c9ffd --- /dev/null +++ b/packages/api-client2/src/generated/core/bodySerializer.gen.ts @@ -0,0 +1,84 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import type { ArrayStyle, ObjectStyle, SerializerOptions } from './pathSerializer.gen'; + +export type QuerySerializer = (query: Record) => string; + +export type BodySerializer = (body: any) => any; + +type QuerySerializerOptionsObject = { + allowReserved?: boolean; + array?: Partial>; + object?: Partial>; +}; + +export type QuerySerializerOptions = QuerySerializerOptionsObject & { + /** + * Per-parameter serialization overrides. When provided, these settings + * override the global array/object settings for specific parameter names. + */ + parameters?: Record; +}; + +const serializeFormDataPair = (data: FormData, key: string, value: unknown): void => { + if (typeof value === 'string' || value instanceof Blob) { + data.append(key, value); + } else if (value instanceof Date) { + data.append(key, value.toISOString()); + } else { + data.append(key, JSON.stringify(value)); + } +}; + +const serializeUrlSearchParamsPair = (data: URLSearchParams, key: string, value: unknown): void => { + if (typeof value === 'string') { + data.append(key, value); + } else { + data.append(key, JSON.stringify(value)); + } +}; + +export const formDataBodySerializer = { + bodySerializer: | Array>>( + body: T, + ): FormData => { + const data = new FormData(); + + Object.entries(body).forEach(([key, value]) => { + if (value === undefined || value === null) { + return; + } + if (Array.isArray(value)) { + value.forEach((v) => serializeFormDataPair(data, key, v)); + } else { + serializeFormDataPair(data, key, value); + } + }); + + return data; + }, +}; + +export const jsonBodySerializer = { + bodySerializer: (body: T): string => + JSON.stringify(body, (_key, value) => (typeof value === 'bigint' ? value.toString() : value)), +}; + +export const urlSearchParamsBodySerializer = { + bodySerializer: | Array>>(body: T): string => { + const data = new URLSearchParams(); + + Object.entries(body).forEach(([key, value]) => { + if (value === undefined || value === null) { + return; + } + if (Array.isArray(value)) { + value.forEach((v) => serializeUrlSearchParamsPair(data, key, v)); + } else { + serializeUrlSearchParamsPair(data, key, value); + } + }); + + return data.toString(); + }, +}; diff --git a/packages/api-client2/src/generated/core/params.gen.ts b/packages/api-client2/src/generated/core/params.gen.ts new file mode 100644 index 0000000000..6099cab1b4 --- /dev/null +++ b/packages/api-client2/src/generated/core/params.gen.ts @@ -0,0 +1,169 @@ +// This file is auto-generated by @hey-api/openapi-ts + +type Slot = 'body' | 'headers' | 'path' | 'query'; + +export type Field = + | { + in: Exclude; + /** + * Field name. This is the name we want the user to see and use. + */ + key: string; + /** + * Field mapped name. This is the name we want to use in the request. + * If omitted, we use the same value as `key`. + */ + map?: string; + } + | { + in: Extract; + /** + * Key isn't required for bodies. + */ + key?: string; + map?: string; + } + | { + /** + * Field name. This is the name we want the user to see and use. + */ + key: string; + /** + * Field mapped name. This is the name we want to use in the request. + * If `in` is omitted, `map` aliases `key` to the transport layer. + */ + map: Slot; + }; + +export interface Fields { + allowExtra?: Partial>; + args?: ReadonlyArray; +} + +export type FieldsConfig = ReadonlyArray; + +const extraPrefixesMap: Record = { + $body_: 'body', + $headers_: 'headers', + $path_: 'path', + $query_: 'query', +}; +const extraPrefixes = Object.entries(extraPrefixesMap); + +type KeyMap = Map< + string, + | { + in: Slot; + map?: string; + } + | { + in?: never; + map: Slot; + } +>; + +const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => { + if (!map) { + map = new Map(); + } + + for (const config of fields) { + if ('in' in config) { + if (config.key) { + map.set(config.key, { + in: config.in, + map: config.map, + }); + } + } else if ('key' in config) { + map.set(config.key, { + map: config.map, + }); + } else if (config.args) { + buildKeyMap(config.args, map); + } + } + + return map; +}; + +interface Params { + body: unknown; + headers: Record; + path: Record; + query: Record; +} + +const stripEmptySlots = (params: Params) => { + for (const [slot, value] of Object.entries(params)) { + if (value && typeof value === 'object' && !Object.keys(value).length) { + delete params[slot as Slot]; + } + } +}; + +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { + const params: Params = { + body: {}, + headers: {}, + path: {}, + query: {}, + }; + + const map = buildKeyMap(fields); + + let config: FieldsConfig[number] | undefined; + + for (const [index, arg] of args.entries()) { + if (fields[index]) { + config = fields[index]; + } + + if (!config) { + continue; + } + + if ('in' in config) { + if (config.key) { + const field = map.get(config.key)!; + const name = field.map || config.key; + if (field.in) { + (params[field.in] as Record)[name] = arg; + } + } else { + params.body = arg; + } + } else { + for (const [key, value] of Object.entries(arg ?? {})) { + const field = map.get(key); + + if (field) { + if (field.in) { + const name = field.map || key; + (params[field.in] as Record)[name] = value; + } else { + params[field.map] = value; + } + } else { + const extra = extraPrefixes.find(([prefix]) => key.startsWith(prefix)); + + if (extra) { + const [prefix, slot] = extra; + (params[slot] as Record)[key.slice(prefix.length)] = value; + } else if ('allowExtra' in config && config.allowExtra) { + for (const [slot, allowed] of Object.entries(config.allowExtra)) { + if (allowed) { + (params[slot as Slot] as Record)[key] = value; + break; + } + } + } + } + } + } + } + + stripEmptySlots(params); + + return params; +}; diff --git a/packages/api-client2/src/generated/core/pathSerializer.gen.ts b/packages/api-client2/src/generated/core/pathSerializer.gen.ts new file mode 100644 index 0000000000..994b2848c6 --- /dev/null +++ b/packages/api-client2/src/generated/core/pathSerializer.gen.ts @@ -0,0 +1,171 @@ +// This file is auto-generated by @hey-api/openapi-ts + +interface SerializeOptions extends SerializePrimitiveOptions, SerializerOptions {} + +interface SerializePrimitiveOptions { + allowReserved?: boolean; + name: string; +} + +export interface SerializerOptions { + /** + * @default true + */ + explode: boolean; + style: T; +} + +export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited'; +export type ArraySeparatorStyle = ArrayStyle | MatrixStyle; +type MatrixStyle = 'label' | 'matrix' | 'simple'; +export type ObjectStyle = 'form' | 'deepObject'; +type ObjectSeparatorStyle = ObjectStyle | MatrixStyle; + +interface SerializePrimitiveParam extends SerializePrimitiveOptions { + value: string; +} + +export const separatorArrayExplode = (style: ArraySeparatorStyle) => { + switch (style) { + case 'label': + return '.'; + case 'matrix': + return ';'; + case 'simple': + return ','; + default: + return '&'; + } +}; + +export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { + switch (style) { + case 'form': + return ','; + case 'pipeDelimited': + return '|'; + case 'spaceDelimited': + return '%20'; + default: + return ','; + } +}; + +export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { + switch (style) { + case 'label': + return '.'; + case 'matrix': + return ';'; + case 'simple': + return ','; + default: + return '&'; + } +}; + +export const serializeArrayParam = ({ + allowReserved, + explode, + name, + style, + value, +}: SerializeOptions & { + value: unknown[]; +}) => { + if (!explode) { + const joinedValues = ( + allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) + ).join(separatorArrayNoExplode(style)); + switch (style) { + case 'label': + return `.${joinedValues}`; + case 'matrix': + return `;${name}=${joinedValues}`; + case 'simple': + return joinedValues; + default: + return `${name}=${joinedValues}`; + } + } + + const separator = separatorArrayExplode(style); + const joinedValues = value + .map((v) => { + if (style === 'label' || style === 'simple') { + return allowReserved ? v : encodeURIComponent(v as string); + } + + return serializePrimitiveParam({ + allowReserved, + name, + value: v as string, + }); + }) + .join(separator); + return style === 'label' || style === 'matrix' ? separator + joinedValues : joinedValues; +}; + +export const serializePrimitiveParam = ({ + allowReserved, + name, + value, +}: SerializePrimitiveParam) => { + if (value === undefined || value === null) { + return ''; + } + + if (typeof value === 'object') { + throw new Error( + 'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.', + ); + } + + return `${name}=${allowReserved ? value : encodeURIComponent(value)}`; +}; + +export const serializeObjectParam = ({ + allowReserved, + explode, + name, + style, + value, + valueOnly, +}: SerializeOptions & { + value: Record | Date; + valueOnly?: boolean; +}) => { + if (value instanceof Date) { + return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; + } + + if (style !== 'deepObject' && !explode) { + let values: string[] = []; + Object.entries(value).forEach(([key, v]) => { + values = [...values, key, allowReserved ? (v as string) : encodeURIComponent(v as string)]; + }); + const joinedValues = values.join(','); + switch (style) { + case 'form': + return `${name}=${joinedValues}`; + case 'label': + return `.${joinedValues}`; + case 'matrix': + return `;${name}=${joinedValues}`; + default: + return joinedValues; + } + } + + const separator = separatorObjectExplode(style); + const joinedValues = Object.entries(value) + .map(([key, v]) => + serializePrimitiveParam({ + allowReserved, + name: style === 'deepObject' ? `${name}[${key}]` : key, + value: v as string, + }), + ) + .join(separator); + return style === 'label' || style === 'matrix' ? separator + joinedValues : joinedValues; +}; diff --git a/packages/api-client2/src/generated/core/queryKeySerializer.gen.ts b/packages/api-client2/src/generated/core/queryKeySerializer.gen.ts new file mode 100644 index 0000000000..5000df606f --- /dev/null +++ b/packages/api-client2/src/generated/core/queryKeySerializer.gen.ts @@ -0,0 +1,117 @@ +// This file is auto-generated by @hey-api/openapi-ts + +/** + * JSON-friendly union that mirrors what Pinia Colada can hash. + */ +export type JsonValue = + | null + | string + | number + | boolean + | JsonValue[] + | { [key: string]: JsonValue }; + +/** + * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. + */ +export const queryKeyJsonReplacer = (_key: string, value: unknown) => { + if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { + return undefined; + } + if (typeof value === 'bigint') { + return value.toString(); + } + if (value instanceof Date) { + return value.toISOString(); + } + return value; +}; + +/** + * Safely stringifies a value and parses it back into a JsonValue. + */ +export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => { + try { + const json = JSON.stringify(input, queryKeyJsonReplacer); + if (json === undefined) { + return undefined; + } + return JSON.parse(json) as JsonValue; + } catch { + return undefined; + } +}; + +/** + * Detects plain objects (including objects with a null prototype). + */ +const isPlainObject = (value: unknown): value is Record => { + if (value === null || typeof value !== 'object') { + return false; + } + const prototype = Object.getPrototypeOf(value as object); + return prototype === Object.prototype || prototype === null; +}; + +/** + * Turns URLSearchParams into a sorted JSON object for deterministic keys. + */ +const serializeSearchParams = (params: URLSearchParams): JsonValue => { + const entries = Array.from(params.entries()).sort(([a], [b]) => a.localeCompare(b)); + const result: Record = {}; + + for (const [key, value] of entries) { + const existing = result[key]; + if (existing === undefined) { + result[key] = value; + continue; + } + + if (Array.isArray(existing)) { + (existing as string[]).push(value); + } else { + result[key] = [existing, value]; + } + } + + return result; +}; + +/** + * Normalizes any accepted value into a JSON-friendly shape for query keys. + */ +export const serializeQueryKeyValue = (value: unknown): JsonValue | undefined => { + if (value === null) { + return null; + } + + if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') { + return value; + } + + if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { + return undefined; + } + + if (typeof value === 'bigint') { + return value.toString(); + } + + if (value instanceof Date) { + return value.toISOString(); + } + + if (Array.isArray(value)) { + return stringifyToJsonValue(value); + } + + if (typeof URLSearchParams !== 'undefined' && value instanceof URLSearchParams) { + return serializeSearchParams(value); + } + + if (isPlainObject(value)) { + return stringifyToJsonValue(value); + } + + return undefined; +}; diff --git a/packages/api-client2/src/generated/core/serverSentEvents.gen.ts b/packages/api-client2/src/generated/core/serverSentEvents.gen.ts new file mode 100644 index 0000000000..6aa6cf02a4 --- /dev/null +++ b/packages/api-client2/src/generated/core/serverSentEvents.gen.ts @@ -0,0 +1,243 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import type { Config } from './types.gen'; + +export type ServerSentEventsOptions = Omit & + Pick & { + /** + * Fetch API implementation. You can use this option to provide a custom + * fetch instance. + * + * @default globalThis.fetch + */ + fetch?: typeof fetch; + /** + * Implementing clients can call request interceptors inside this hook. + */ + onRequest?: (url: string, init: RequestInit) => Promise; + /** + * Callback invoked when a network or parsing error occurs during streaming. + * + * This option applies only if the endpoint returns a stream of events. + * + * @param error The error that occurred. + */ + onSseError?: (error: unknown) => void; + /** + * Callback invoked when an event is streamed from the server. + * + * This option applies only if the endpoint returns a stream of events. + * + * @param event Event streamed from the server. + * @returns Nothing (void). + */ + onSseEvent?: (event: StreamEvent) => void; + serializedBody?: RequestInit['body']; + /** + * Default retry delay in milliseconds. + * + * This option applies only if the endpoint returns a stream of events. + * + * @default 3000 + */ + sseDefaultRetryDelay?: number; + /** + * Maximum number of retry attempts before giving up. + */ + sseMaxRetryAttempts?: number; + /** + * Maximum retry delay in milliseconds. + * + * Applies only when exponential backoff is used. + * + * This option applies only if the endpoint returns a stream of events. + * + * @default 30000 + */ + sseMaxRetryDelay?: number; + /** + * Optional sleep function for retry backoff. + * + * Defaults to using `setTimeout`. + */ + sseSleepFn?: (ms: number) => Promise; + url: string; + }; + +export interface StreamEvent { + data: TData; + event?: string; + id?: string; + retry?: number; +} + +export type ServerSentEventsResult = { + stream: AsyncGenerator< + TData extends Record ? TData[keyof TData] : TData, + TReturn, + TNext + >; +}; + +export const createSseClient = ({ + onRequest, + onSseError, + onSseEvent, + responseTransformer, + responseValidator, + sseDefaultRetryDelay, + sseMaxRetryAttempts, + sseMaxRetryDelay, + sseSleepFn, + url, + ...options +}: ServerSentEventsOptions): ServerSentEventsResult => { + let lastEventId: string | undefined; + + const sleep = sseSleepFn ?? ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms))); + + const createStream = async function* () { + let retryDelay: number = sseDefaultRetryDelay ?? 3000; + let attempt = 0; + const signal = options.signal ?? new AbortController().signal; + + while (true) { + if (signal.aborted) break; + + attempt++; + + const headers = + options.headers instanceof Headers + ? options.headers + : new Headers(options.headers as Record | undefined); + + if (lastEventId !== undefined) { + headers.set('Last-Event-ID', lastEventId); + } + + try { + const requestInit: RequestInit = { + redirect: 'follow', + ...options, + body: options.serializedBody, + headers, + signal, + }; + let request = new Request(url, requestInit); + if (onRequest) { + request = await onRequest(url, requestInit); + } + // fetch must be assigned here, otherwise it would throw the error: + // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation + const _fetch = options.fetch ?? globalThis.fetch; + const response = await _fetch(request); + + if (!response.ok) throw new Error(`SSE failed: ${response.status} ${response.statusText}`); + + if (!response.body) throw new Error('No body in SSE response'); + + const reader = response.body.pipeThrough(new TextDecoderStream()).getReader(); + + let buffer = ''; + + const abortHandler = () => { + try { + reader.cancel(); + } catch { + // noop + } + }; + + signal.addEventListener('abort', abortHandler); + + try { + while (true) { + const { done, value } = await reader.read(); + if (done) break; + buffer += value; + // Normalize line endings: CRLF -> LF, then CR -> LF + buffer = buffer.replace(/\r\n/g, '\n').replace(/\r/g, '\n'); + + const chunks = buffer.split('\n\n'); + buffer = chunks.pop() ?? ''; + + for (const chunk of chunks) { + const lines = chunk.split('\n'); + const dataLines: Array = []; + let eventName: string | undefined; + + for (const line of lines) { + if (line.startsWith('data:')) { + dataLines.push(line.replace(/^data:\s*/, '')); + } else if (line.startsWith('event:')) { + eventName = line.replace(/^event:\s*/, ''); + } else if (line.startsWith('id:')) { + lastEventId = line.replace(/^id:\s*/, ''); + } else if (line.startsWith('retry:')) { + const parsed = Number.parseInt(line.replace(/^retry:\s*/, ''), 10); + if (!Number.isNaN(parsed)) { + retryDelay = parsed; + } + } + } + + let data: unknown; + let parsedJson = false; + + if (dataLines.length) { + const rawData = dataLines.join('\n'); + try { + data = JSON.parse(rawData); + parsedJson = true; + } catch { + data = rawData; + } + } + + if (parsedJson) { + if (responseValidator) { + await responseValidator(data); + } + + if (responseTransformer) { + data = await responseTransformer(data); + } + } + + onSseEvent?.({ + data, + event: eventName, + id: lastEventId, + retry: retryDelay, + }); + + if (dataLines.length) { + yield data as any; + } + } + } + } finally { + signal.removeEventListener('abort', abortHandler); + reader.releaseLock(); + } + + break; // exit loop on normal completion + } catch (error) { + // connection failed or aborted; retry after delay + onSseError?.(error); + + if (sseMaxRetryAttempts !== undefined && attempt >= sseMaxRetryAttempts) { + break; // stop after firing error + } + + // exponential backoff: double retry each attempt, cap at 30s + const backoff = Math.min(retryDelay * 2 ** (attempt - 1), sseMaxRetryDelay ?? 30000); + await sleep(backoff); + } + } + }; + + const stream = createStream(); + + return { stream }; +}; diff --git a/packages/api-client2/src/generated/core/types.gen.ts b/packages/api-client2/src/generated/core/types.gen.ts new file mode 100644 index 0000000000..97463257e4 --- /dev/null +++ b/packages/api-client2/src/generated/core/types.gen.ts @@ -0,0 +1,104 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import type { Auth, AuthToken } from './auth.gen'; +import type { BodySerializer, QuerySerializer, QuerySerializerOptions } from './bodySerializer.gen'; + +export type HttpMethod = + | 'connect' + | 'delete' + | 'get' + | 'head' + | 'options' + | 'patch' + | 'post' + | 'put' + | 'trace'; + +export type Client< + RequestFn = never, + Config = unknown, + MethodFn = never, + BuildUrlFn = never, + SseFn = never, +> = { + /** + * Returns the final request URL. + */ + buildUrl: BuildUrlFn; + getConfig: () => Config; + request: RequestFn; + setConfig: (config: Config) => Config; +} & { + [K in HttpMethod]: MethodFn; +} & ([SseFn] extends [never] ? { sse?: never } : { sse: { [K in HttpMethod]: SseFn } }); + +export interface Config { + /** + * Auth token or a function returning auth token. The resolved value will be + * added to the request payload as defined by its `security` array. + */ + auth?: ((auth: Auth) => Promise | AuthToken) | AuthToken; + /** + * A function for serializing request body parameter. By default, + * {@link JSON.stringify()} will be used. + */ + bodySerializer?: BodySerializer | null; + /** + * An object containing any HTTP headers that you want to pre-populate your + * `Headers` object with. + * + * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more} + */ + headers?: + | RequestInit['headers'] + | Record< + string, + string | number | boolean | (string | number | boolean)[] | null | undefined | unknown + >; + /** + * The request method. + * + * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more} + */ + method?: Uppercase; + /** + * A function for serializing request query parameters. By default, arrays + * will be exploded in form style, objects will be exploded in deepObject + * style, and reserved characters are percent-encoded. + * + * This method will have no effect if the native `paramsSerializer()` Axios + * API function is used. + * + * {@link https://swagger.io/docs/specification/serialization/#query View examples} + */ + querySerializer?: QuerySerializer | QuerySerializerOptions; + /** + * A function validating request data. This is useful if you want to ensure + * the request conforms to the desired shape, so it can be safely sent to + * the server. + */ + requestValidator?: (data: unknown) => Promise; + /** + * A function transforming response data before it's returned. This is useful + * for post-processing data, e.g. converting ISO strings into Date objects. + */ + responseTransformer?: (data: unknown) => Promise; + /** + * A function validating response data. This is useful if you want to ensure + * the response conforms to the desired shape, so it can be safely passed to + * the transformers and returned to the user. + */ + responseValidator?: (data: unknown) => Promise; +} + +type IsExactlyNeverOrNeverUndefined = [T] extends [never] + ? true + : [T] extends [never | undefined] + ? [undefined] extends [T] + ? false + : true + : false; + +export type OmitNever> = { + [K in keyof T as IsExactlyNeverOrNeverUndefined extends true ? never : K]: T[K]; +}; diff --git a/packages/api-client2/src/generated/core/utils.gen.ts b/packages/api-client2/src/generated/core/utils.gen.ts new file mode 100644 index 0000000000..e7ddbe3541 --- /dev/null +++ b/packages/api-client2/src/generated/core/utils.gen.ts @@ -0,0 +1,140 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import type { BodySerializer, QuerySerializer } from './bodySerializer.gen'; +import { + type ArraySeparatorStyle, + serializeArrayParam, + serializeObjectParam, + serializePrimitiveParam, +} from './pathSerializer.gen'; + +export interface PathSerializer { + path: Record; + url: string; +} + +export const PATH_PARAM_RE = /\{[^{}]+\}/g; + +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { + let url = _url; + const matches = _url.match(PATH_PARAM_RE); + if (matches) { + for (const match of matches) { + let explode = false; + let name = match.substring(1, match.length - 1); + let style: ArraySeparatorStyle = 'simple'; + + if (name.endsWith('*')) { + explode = true; + name = name.substring(0, name.length - 1); + } + + if (name.startsWith('.')) { + name = name.substring(1); + style = 'label'; + } else if (name.startsWith(';')) { + name = name.substring(1); + style = 'matrix'; + } + + const value = path[name]; + + if (value === undefined || value === null) { + continue; + } + + if (Array.isArray(value)) { + url = url.replace(match, serializeArrayParam({ explode, name, style, value })); + continue; + } + + if (typeof value === 'object') { + url = url.replace( + match, + serializeObjectParam({ + explode, + name, + style, + value: value as Record, + valueOnly: true, + }), + ); + continue; + } + + if (style === 'matrix') { + url = url.replace( + match, + `;${serializePrimitiveParam({ + name, + value: value as string, + })}`, + ); + continue; + } + + const replaceValue = encodeURIComponent( + style === 'label' ? `.${value as string}` : (value as string), + ); + url = url.replace(match, replaceValue); + } + } + return url; +}; + +export const getUrl = ({ + baseUrl, + path, + query, + querySerializer, + url: _url, +}: { + baseUrl?: string; + path?: Record; + query?: Record; + querySerializer: QuerySerializer; + url: string; +}) => { + const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; + let url = (baseUrl ?? '') + pathUrl; + if (path) { + url = defaultPathSerializer({ path, url }); + } + let search = query ? querySerializer(query) : ''; + if (search.startsWith('?')) { + search = search.substring(1); + } + if (search) { + url += `?${search}`; + } + return url; +}; + +export function getValidRequestBody(options: { + body?: unknown; + bodySerializer?: BodySerializer | null; + serializedBody?: unknown; +}) { + const hasBody = options.body !== undefined; + const isSerializedBody = hasBody && options.bodySerializer; + + if (isSerializedBody) { + if ('serializedBody' in options) { + const hasSerializedBody = + options.serializedBody !== undefined && options.serializedBody !== ''; + + return hasSerializedBody ? options.serializedBody : null; + } + + // not all clients implement a serializedBody property (i.e. client-axios) + return options.body !== '' ? options.body : null; + } + + // plain/text body + if (hasBody) { + return options.body; + } + + // no body was provided + return undefined; +} diff --git a/packages/api-client2/src/generated/index.ts b/packages/api-client2/src/generated/index.ts new file mode 100644 index 0000000000..415b0de59b --- /dev/null +++ b/packages/api-client2/src/generated/index.ts @@ -0,0 +1,4 @@ +// This file is auto-generated by @hey-api/openapi-ts + +export { canStartTrial, type Options, startTrial } from './sdk.gen'; +export type { CanStartTrialData, CanStartTrialErrors, CanStartTrialResponse, CanStartTrialResponse2, CanStartTrialResponses, ClientOptions, Interval, StartTrialData, StartTrialErrors, StartTrialResponse, StartTrialResponse2, StartTrialResponses } from './types.gen'; diff --git a/packages/api-client2/src/generated/sdk.gen.ts b/packages/api-client2/src/generated/sdk.gen.ts new file mode 100644 index 0000000000..3cf0596347 --- /dev/null +++ b/packages/api-client2/src/generated/sdk.gen.ts @@ -0,0 +1,31 @@ +// This file is auto-generated by @hey-api/openapi-ts + +import type { Client, Options as Options2, TDataShape } from './client'; +import { client } from './client.gen'; +import type { CanStartTrialData, CanStartTrialErrors, CanStartTrialResponses, StartTrialData, StartTrialErrors, StartTrialResponses } from './types.gen'; + +export type Options = Options2 & { + /** + * You can provide a client instance returned by `createClient()` instead of + * individual options. This might be also useful if you want to implement a + * custom client. + */ + client?: Client; + /** + * You can pass arbitrary values through the `meta` object. This can be + * used to access values that aren't defined as part of the SDK function. + */ + meta?: Record; +}; + +export const canStartTrial = (options?: Options) => (options?.client ?? client).get({ + security: [{ scheme: 'bearer', type: 'http' }], + url: '/subscription/can-start-trial', + ...options +}); + +export const startTrial = (options?: Options) => (options?.client ?? client).post({ + security: [{ scheme: 'bearer', type: 'http' }], + url: '/subscription/start-trial', + ...options +}); diff --git a/packages/api-client2/src/generated/types.gen.ts b/packages/api-client2/src/generated/types.gen.ts new file mode 100644 index 0000000000..99c8fe8818 --- /dev/null +++ b/packages/api-client2/src/generated/types.gen.ts @@ -0,0 +1,71 @@ +// This file is auto-generated by @hey-api/openapi-ts + +export type ClientOptions = { + baseUrl: `${string}://${string}` | (string & {}); +}; + +export type CanStartTrialResponse = { + canStartTrial: boolean; +}; + +export type Interval = 'monthly' | 'yearly'; + +export type StartTrialResponse = { + started: boolean; +}; + +export type CanStartTrialData = { + body?: never; + path?: never; + query?: never; + url: '/subscription/can-start-trial'; +}; + +export type CanStartTrialErrors = { + /** + * Unauthorized + */ + 401: unknown; + /** + * Internal server error + */ + 500: unknown; +}; + +export type CanStartTrialResponses = { + /** + * Check successful + */ + 200: CanStartTrialResponse; +}; + +export type CanStartTrialResponse2 = CanStartTrialResponses[keyof CanStartTrialResponses]; + +export type StartTrialData = { + body?: never; + path?: never; + query?: { + interval?: Interval; + }; + url: '/subscription/start-trial'; +}; + +export type StartTrialErrors = { + /** + * Unauthorized + */ + 401: unknown; + /** + * Internal server error + */ + 500: unknown; +}; + +export type StartTrialResponses = { + /** + * Trial started successfully + */ + 200: StartTrialResponse; +}; + +export type StartTrialResponse2 = StartTrialResponses[keyof StartTrialResponses]; diff --git a/packages/api-client2/tsconfig.json b/packages/api-client2/tsconfig.json new file mode 100644 index 0000000000..5c9aec8950 --- /dev/null +++ b/packages/api-client2/tsconfig.json @@ -0,0 +1,13 @@ +{ + "compilerOptions": { + "target": "ESNext", + "module": "ESNext", + "moduleResolution": "bundler", + "strict": true, + "skipLibCheck": true, + "declaration": true, + "declarationMap": true, + "esModuleInterop": true + }, + "include": ["src"] +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7315d077dd..8bc18c47c9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1271,6 +1271,12 @@ importers: packages/api-client: {} + packages/api-client2: + devDependencies: + '@hey-api/openapi-ts': + specifier: ^0.91.1 + version: 0.91.1(magicast@0.5.1)(typescript@5.9.3) + packages/codemirror: dependencies: '@codemirror/lang-jinja':