@ir-kit/openapi-kotlin 2.0.0 → 3.0.0

package/dist/project/imports.js

@@ -1,149 +1,71 @@
+import { kt } from "@ir-kit/compiler-kotlin";
+const K = kt.KotlinNodeKind;
+const NAME_TOKEN = /[A-Za-z_][A-Za-z0-9_]*/g;
 /**
- * Compute the import list for a single Kotlin file by walking the
- * already-printed source and matching against known identifiers.
- * Coarse-import-everything caused unused imports per file; the
- * print-then-scan pattern is precise without needing a full type-tree
- * walker.
- *
- * Identifiers that share names across packages (e.g. `Response` exists
- * in both `okhttp3` and a hypothetical user model) are disambiguated
- * by file kind: API-layer files always pull `okhttp3.Response`, model
- * files never do.
+ * Every identifier, type and annotation name the declarations reference,
+ * collected from the AST (string literals and comments never count).
  */
-export function importsForSource(source, ctx) {
-    const set = new Set();
-    // kotlinx-serialization annotations.
-    if (/@Serializable\b/.test(source)) {
-        set.add("kotlinx.serialization.Serializable");
-    }
-    if (/@SerialName\b/.test(source)) {
-        set.add("kotlinx.serialization.SerialName");
-    }
-    // kotlinx-datetime model fields.
-    if (/\bInstant\b/.test(source))
-        set.add("kotlinx.datetime.Instant");
-    if (/\bLocalDate\b/.test(source))
-        set.add("kotlinx.datetime.LocalDate");
-    // kotlinx-serialization builtins (only when actually mentioned).
-    if (/\bListSerializer\(/.test(source)) {
-        set.add("kotlinx.serialization.builtins.ListSerializer");
-    }
-    if (/\bMapSerializer\(/.test(source)) {
-        set.add("kotlinx.serialization.builtins.MapSerializer");
-    }
-    if (/\bByteArraySerializer\(\)/.test(source)) {
-        set.add("kotlinx.serialization.builtins.ByteArraySerializer");
-    }
-    if (/\.nullable\b/.test(source)) {
-        set.add("kotlinx.serialization.builtins.nullable");
-    }
-    if (/\bserializer\(\)/.test(source) && ctx.isApiSurface) {
-        // Built-in `String.serializer()`, `Int.serializer()`, etc. live
-        // under kotlinx.serialization.builtins. Only the API surface uses
-        // them — model files use the auto-generated companion form.
-        set.add("kotlinx.serialization.builtins.serializer");
-    }
-    if (/\bJsonElement\b/.test(source)) {
-        set.add("kotlinx.serialization.json.JsonElement");
-    }
-    // OkHttp types — only API-surface files reference them.
-    if (ctx.isApiSurface) {
-        if (/\bHttpUrl\b/.test(source))
-            set.add("okhttp3.HttpUrl");
-        if (/\bRequest\b/.test(source))
-            set.add("okhttp3.Request");
-        if (/\bResponse\b/.test(source))
-            set.add("okhttp3.Response");
-        if (/\bFormBody\b/.test(source))
-            set.add("okhttp3.FormBody");
-        if (/\.toMediaType\(\)/.test(source)) {
-            set.add("okhttp3.MediaType.Companion.toMediaType");
-        }
-        if (/\.toRequestBody\(/.test(source)) {
-            set.add("okhttp3.RequestBody.Companion.toRequestBody");
+export function referencedNames(decls) {
+    const names = new Set();
+    const visit = (value) => {
+        if (Array.isArray(value)) {
+            for (const item of value)
+                visit(item);
+            return;
         }
-        // Cross-package model refs. The API surface lives in `<root>.api`
-        // and references model types from `<root>.models`. Wildcard-import
-        // when the file mentions any PascalCased identifier that isn't a
-        // built-in (cheap heuristic; the alternative is walking every type
-        // ref through the decl tree).
-        if (ctx.subPkg === `${ctx.rootPkg}.api` &&
-            /\b[A-Z][A-Za-z0-9_]*\b/.test(source) &&
-            hasLikelyModelRef(source)) {
-            set.add(`${ctx.rootPkg}.models.*`);
+        if (!value || typeof value !== "object")
+            return;
+        const node = value;
+        if ((node.kind === K.Identifier ||
+            node.kind === K.UserType ||
+            node.kind === K.Annotation) &&
+            typeof node.name === "string") {
+            for (const m of node.name.matchAll(NAME_TOKEN))
+                names.add(m[0]);
         }
-    }
-    // Drop self-package imports — Kotlin allows them but they're noise.
-    return [...set].filter((i) => !i.startsWith(`${ctx.subPkg}.`)).sort();
+        for (const child of Object.values(value))
+            visit(child);
+    };
+    for (const decl of decls)
+        visit(decl.node);
+    return names;
 }
 /**
- * Identifiers that ship in `kotlin.*` / `okhttp3.*` / kotlinx — and so
- * do NOT trigger a `<root>.models.*` import. Used to keep the wildcard
- * model import out of files that never actually reference user types.
+ * Import list for one Kotlin file. Names shared across packages (e.g.
+ * `Response` in `okhttp3` vs. a user model) are disambiguated by file
+ * kind: API-layer files pull `okhttp3.Response`, model files never do.
  */
-const NON_MODEL_TYPES = new Set([
-    // Kotlin stdlib
-    "Any",
-    "Unit",
-    "Nothing",
-    "String",
-    "Int",
-    "Long",
-    "Short",
-    "Byte",
-    "Double",
-    "Float",
-    "Boolean",
-    "ByteArray",
-    "List",
-    "Map",
-    "Pair",
-    "Triple",
-    "Throwable",
-    "Exception",
-    "RuntimeException",
-    "Result",
-    "Charsets",
-    "Base64",
-    "TimeUnit",
-    // kotlinx
-    "Instant",
-    "LocalDate",
-    "JsonElement",
-    "Json",
-    "Dispatchers",
-    "Serializable",
-    "SerialName",
-    "ListSerializer",
-    "MapSerializer",
-    "ByteArraySerializer",
-    // OkHttp
-    "HttpUrl",
-    "Request",
-    "Response",
-    "OkHttpClient",
-    "FormBody",
-    "MultipartBody",
-    "RequestBody",
-    "MediaType",
-    // Runtime helpers (same package)
-    "APIClient",
-    "APIError",
-    "APIInterceptors",
-    "Auth",
-    "APIKeyLocation",
-    "MultipartFormBody",
-    "QueryStyle",
-    "RequestOptions",
-    "URLEncoding",
-]);
-function hasLikelyModelRef(source) {
-    const matches = source.matchAll(/\b([A-Z][A-Za-z0-9_]*)\b/g);
-    for (const m of matches) {
-        if (!NON_MODEL_TYPES.has(m[1]))
-            return true;
+export function importsFor(names, ctx) {
+    const set = new Set();
+    const when = (name, imp) => {
+        if (names.has(name))
+            set.add(imp);
+    };
+    when("Serializable", "kotlinx.serialization.Serializable");
+    when("SerialName", "kotlinx.serialization.SerialName");
+    when("Instant", "kotlinx.datetime.Instant");
+    when("LocalDate", "kotlinx.datetime.LocalDate");
+    when("ListSerializer", "kotlinx.serialization.builtins.ListSerializer");
+    when("MapSerializer", "kotlinx.serialization.builtins.MapSerializer");
+    when("ByteArraySerializer", "kotlinx.serialization.builtins.ByteArraySerializer");
+    when("nullable", "kotlinx.serialization.builtins.nullable");
+    when("JsonElement", "kotlinx.serialization.json.JsonElement");
+    if (ctx.isApiSurface) {
+        // `String.serializer()` etc.; model files use generated companions.
+        when("serializer", "kotlinx.serialization.builtins.serializer");
+        when("HttpUrl", "okhttp3.HttpUrl");
+        when("Request", "okhttp3.Request");
+        when("Response", "okhttp3.Response");
+        when("FormBody", "okhttp3.FormBody");
+        when("toMediaType", "okhttp3.MediaType.Companion.toMediaType");
+        when("toRequestBody", "okhttp3.RequestBody.Companion.toRequestBody");
     }
-    return false;
+    for (const name of names) {
+        const pkg = ctx.declared.get(name);
+        if (pkg && pkg !== ctx.subPkg)
+            set.add(`${pkg}.${name}`);
+    }
+    return [...set].filter((i) => !i.startsWith(`${ctx.subPkg}.`)).sort();
 }
 /** API-surface predicate, exposed for the build orchestrator. */
 export function isApiSurface(decl) {

package/dist/project/imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/project/imports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/project/imports.ts"],"names":[],"mappings":"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"}

package/dist/project/layout.d.ts

@@ -1,4 +1,4 @@
-import type { KtDecl } from "../kt-dsl/decl/types.js";
+import type { KtDecl } from "../ast/index.js";
 export type LayoutKind = "flat" | "split";
 export interface PlacedDecl {
     decl: KtDecl;

package/dist/project/layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../src/project/layout.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC;AAE1C,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,mEAAmE;IACnE,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;CAC9D;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,UAAU,CAM1E;AAmCD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQjD"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../src/project/layout.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC;AAE1C,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,mEAAmE;IACnE,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;CAC9D;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,UAAU,CAM1E;AAmCD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKjD"}

package/dist/project/layout.js

@@ -48,9 +48,7 @@ function isApiDecl(decl) {
  */
 export function declFileName(decl) {
     if (decl.kind === "topLevelFun") {
-        const receiver = decl.fun.receiver;
-        const recvName = receiver && receiver.kind === "ref" ? receiver.name : "Extensions";
-        return `${recvName}Extensions.kt`;
+        return `${decl.receiver ?? "Extensions"}Extensions.kt`;
     }
     return `${decl.name}.kt`;
 }

package/dist/project/layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/project/layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,WAAW,CAAC;AAsB/C,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,IAAsB;IAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,QAAQ;QAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;IAClE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC;IACtC,IAAI,MAAM,KAAK,MAAM;QAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IACjD,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC3D,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;IACnD,IACE,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC;QAChC,UAAU,KAAK,IAAI;QACnB,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,EAC5B,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,2CAA2C,GAAG,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC;IAC3C,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa;QAAE,OAAO,IAAI,CAAC;IAC7C,IACE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM;QACnB,IAAI,CAAC,IAAI,KAAK,QAAQ;QACtB,IAAI,CAAC,IAAI,KAAK,aAAa;QAC3B,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC;QAC5B,IAAI,CAAC,OAAO,EACZ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnC,MAAM,QAAQ,GACZ,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;QACrE,OAAO,GAAG,QAAQ,eAAe,CAAC;IACpC,CAAC;IACD,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,CAAC;AAC3B,CAAC"}
+{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/project/layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,WAAW,CAAC;AAsB/C,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,IAAsB;IAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,QAAQ;QAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;IAClE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC;IACtC,IAAI,MAAM,KAAK,MAAM;QAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IACjD,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC3D,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;IACnD,IACE,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC;QAChC,UAAU,KAAK,IAAI;QACnB,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,EAC5B,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,2CAA2C,GAAG,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC;IAC3C,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa;QAAE,OAAO,IAAI,CAAC;IAC7C,IACE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM;QACnB,IAAI,CAAC,IAAI,KAAK,QAAQ;QACtB,IAAI,CAAC,IAAI,KAAK,aAAa;QAC3B,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC;QAC5B,IAAI,CAAC,OAAO,EACZ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAChC,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,YAAY,eAAe,CAAC;IACzD,CAAC;IACD,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,CAAC;AAC3B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ir-kit/openapi-kotlin",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Generate idiomatic Kotlin (OkHttp + kotlinx-serialization + suspend) client SDKs from an OpenAPI 3.x spec.",
   "keywords": [
     "openapi",
@@ -12,9 +12,9 @@
     "sdk",
     "client"
   ],
-  "homepage": "https://github.com/ir-kit/ir-kit/tree/main/packages/openapi/kotlin",
+  "homepage": "https://github.com/ahmedrowaihi/ir-kit/tree/main/packages/openapi/kotlin",
   "bugs": {
-    "url": "https://github.com/ir-kit/ir-kit/issues"
+    "url": "https://github.com/ahmedrowaihi/ir-kit/issues"
   },
   "license": "MIT",
   "author": {
@@ -23,7 +23,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ir-kit/ir-kit.git",
+    "url": "git+https://github.com/ahmedrowaihi/ir-kit.git",
     "directory": "packages/openapi/kotlin"
   },
   "type": "module",
@@ -39,6 +39,7 @@
   },
   "files": [
     "dist",
+    "runtime/*.kt",
     "README.md",
     "LICENSE.md"
   ],
@@ -49,19 +50,20 @@
   "peerDependencies": {
     "@hey-api/shared": ">=0.3.0",
     "@hey-api/spec-types": ">=0.2.0",
-    "@ir-kit/openapi-tools": ">=0.3.0"
+    "@ir-kit/openapi-tools": ">=0.4.0"
   },
   "dependencies": {
-    "@ir-kit/codegen-core": "0.1.0",
-    "@ir-kit/openapi": "0.3.0",
-    "@ir-kit/openapi-loader": "0.2.0"
+    "@ir-kit/codegen-core": "0.3.0",
+    "@ir-kit/openapi": "0.5.0",
+    "@ir-kit/compiler-kotlin": "0.1.1",
+    "@ir-kit/openapi-loader": "0.4.0"
   },
   "devDependencies": {
-    "@hey-api/shared": "^0.4.2",
+    "@hey-api/shared": "^0.5.0",
     "@hey-api/spec-types": "^0.2.0",
     "@types/node": "^22",
     "vitest": "^4.0.0",
-    "@ir-kit/openapi-tools": "0.3.0",
+    "@ir-kit/openapi-tools": "0.4.0",
     "@ir-kit/tsconfig": "0.0.0"
   },
   "engines": {

package/runtime/APIClient.kt

@@ -0,0 +1,140 @@
+package dev.irkit.runtime
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.json.Json
+import okhttp3.HttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import java.util.concurrent.TimeUnit
+
+/**
+ * Runtime helper every per-tag impl class delegates to. Owns the
+ * transport-level concerns — `OkHttpClient`, `Json`, the interceptor
+ * pipeline — and provides one source of truth for status-code
+ * dispatch and decoding.
+ *
+ *  - `execute<T>(request, deserializer, …)`       — decodes a 2xx body to `T`.
+ *  - `executeUnit(request, …)`                    — discards the body.
+ *  - `executeWithResponse<T>(request, deserializer,`
+ *    `…)`                                          — decode + raw `Response`.
+ *  - `executeUnitWithResponse(request, …)`        — raw `Response` only.
+ *  - `executeRaw(request, …)`                     — raw `(ByteArray, Response)`,
+ *                                                    used by multi-2xx ops.
+ *
+ * Status-code dispatch lives in `sendAndDispatch`; 2xx returns the
+ * body bytes, 4xx/5xx throw the matching `APIError` subclass.
+ */
+public class APIClient(
+    public var baseUrl: HttpUrl,
+    public val httpClient: OkHttpClient = OkHttpClient(),
+    public val json: Json =
+        Json {
+            ignoreUnknownKeys = true
+            encodeDefaults = true
+        },
+    public val interceptors: APIInterceptors = APIInterceptors(),
+    public val auth: MutableMap<String, Auth> = mutableMapOf(),
+) {
+    public suspend fun <T> execute(
+        request: Request,
+        deserializer: kotlinx.serialization.DeserializationStrategy<T>,
+        timeout: Long? = null,
+        extraInterceptors: List<suspend (Request) -> Request> = emptyList(),
+        responseValidator: (suspend (ByteArray, Response) -> Unit)? = null,
+        responseTransformer: (suspend (ByteArray) -> ByteArray)? = null,
+    ): T {
+        val (data, response) = sendAndDispatch(request, timeout, extraInterceptors)
+        responseValidator?.invoke(data, response)
+        val body = responseTransformer?.invoke(data) ?: data
+        return try {
+            json.decodeFromString(deserializer, body.decodeToString())
+        } catch (e: Throwable) {
+            throw APIError.DecodingFailed(e)
+        }
+    }
+
+    public suspend fun executeUnit(
+        request: Request,
+        timeout: Long? = null,
+        extraInterceptors: List<suspend (Request) -> Request> = emptyList(),
+        responseValidator: (suspend (ByteArray, Response) -> Unit)? = null,
+    ) {
+        val (data, response) = sendAndDispatch(request, timeout, extraInterceptors)
+        responseValidator?.invoke(data, response)
+    }
+
+    public suspend fun <T> executeWithResponse(
+        request: Request,
+        deserializer: kotlinx.serialization.DeserializationStrategy<T>,
+        timeout: Long? = null,
+        extraInterceptors: List<suspend (Request) -> Request> = emptyList(),
+        responseValidator: (suspend (ByteArray, Response) -> Unit)? = null,
+        responseTransformer: (suspend (ByteArray) -> ByteArray)? = null,
+    ): Pair<T, Response> {
+        val (data, response) = sendAndDispatch(request, timeout, extraInterceptors)
+        responseValidator?.invoke(data, response)
+        val body = responseTransformer?.invoke(data) ?: data
+        return try {
+            json.decodeFromString(deserializer, body.decodeToString()) to response
+        } catch (e: Throwable) {
+            throw APIError.DecodingFailed(e)
+        }
+    }
+
+    public suspend fun executeUnitWithResponse(
+        request: Request,
+        timeout: Long? = null,
+        extraInterceptors: List<suspend (Request) -> Request> = emptyList(),
+        responseValidator: (suspend (ByteArray, Response) -> Unit)? = null,
+    ): Response {
+        val (data, response) = sendAndDispatch(request, timeout, extraInterceptors)
+        responseValidator?.invoke(data, response)
+        return response
+    }
+
+    public suspend fun executeRaw(
+        request: Request,
+        timeout: Long? = null,
+        extraInterceptors: List<suspend (Request) -> Request> = emptyList(),
+        responseValidator: (suspend (ByteArray, Response) -> Unit)? = null,
+        responseTransformer: (suspend (ByteArray) -> ByteArray)? = null,
+    ): Pair<ByteArray, Response> {
+        val (data, response) = sendAndDispatch(request, timeout, extraInterceptors)
+        responseValidator?.invoke(data, response)
+        val body = responseTransformer?.invoke(data) ?: data
+        return body to response
+    }
+
+    private suspend fun sendAndDispatch(
+        request: Request,
+        timeout: Long?,
+        extraInterceptors: List<suspend (Request) -> Request>,
+    ): Pair<ByteArray, Response> {
+        var req = request
+        for (interceptor in interceptors.request) req = interceptor(req)
+        for (interceptor in extraInterceptors) req = interceptor(req)
+        val callClient =
+            if (timeout == null) {
+                httpClient
+            } else {
+                httpClient.newBuilder().callTimeout(timeout, TimeUnit.MILLISECONDS).build()
+            }
+        val response =
+            try {
+                withContext(Dispatchers.IO) {
+                    callClient.newCall(req).execute()
+                }
+            } catch (e: Throwable) {
+                throw APIError.Transport(e)
+            }
+        val body = response.body?.bytes() ?: ByteArray(0)
+        return when (val code = response.code) {
+            in 200..299 -> body to response
+            in 400..499 -> throw APIError.ClientError(code, body)
+            in 500..599 -> throw APIError.ServerError(code, body)
+            else -> throw APIError.UnexpectedStatus(code, body)
+        }
+    }
+}

package/runtime/APIError.kt

@@ -0,0 +1,42 @@
+package dev.irkit.runtime
+
+/**
+ * The typed error every impl method throws on non-2xx responses.
+ *
+ *  - `ClientError(statusCode, body)`     — 4XX
+ *  - `ServerError(statusCode, body)`     — 5XX
+ *  - `UnexpectedStatus(statusCode, body)` — 1XX/3XX/anything outside 2-5
+ *  - `DecodingFailed(cause)`             — kotlinx-serialization threw on a 2XX body
+ *  - `Transport(cause)`                  — OkHttp / network-layer failure
+ *
+ * Consumers `catch` and pattern-match. Bodies are surfaced as raw
+ * `ByteArray` so callers can decode error envelopes themselves with the
+ * codec they prefer.
+ */
+public sealed class APIError(
+    message: String? = null,
+    cause: Throwable? = null,
+) : RuntimeException(message, cause) {
+    public class ClientError(
+        public val statusCode: Int,
+        public val body: ByteArray,
+    ) : APIError("Client error: $statusCode")
+
+    public class ServerError(
+        public val statusCode: Int,
+        public val body: ByteArray,
+    ) : APIError("Server error: $statusCode")
+
+    public class UnexpectedStatus(
+        public val statusCode: Int,
+        public val body: ByteArray,
+    ) : APIError("Unexpected status: $statusCode")
+
+    public class DecodingFailed(
+        cause: Throwable,
+    ) : APIError("Decoding failed: ${cause.message}", cause)
+
+    public class Transport(
+        cause: Throwable,
+    ) : APIError("Transport failure: ${cause.message}", cause)
+}

package/runtime/APIInterceptors.kt

@@ -0,0 +1,14 @@
+package dev.irkit.runtime
+
+import okhttp3.Request
+
+/**
+ * Bag of per-request mutation hooks. Mirrors hey-api's TS client where
+ * `client.interceptors.request.use(fn)` registers an interceptor that
+ * runs against every outgoing request. Multiple interceptors compose —
+ * auth, logging, and tracing all coexist as separate entries instead
+ * of being chained inside one closure.
+ */
+public class APIInterceptors {
+    public val request: MutableList<suspend (Request) -> Request> = mutableListOf()
+}

package/runtime/APIKeyLocation.kt

@@ -0,0 +1,7 @@
+package dev.irkit.runtime
+
+public enum class APIKeyLocation {
+    HEADER,
+    QUERY,
+    COOKIE,
+}

package/runtime/Auth.kt

@@ -0,0 +1,86 @@
+package dev.irkit.runtime
+
+import okhttp3.HttpUrl
+import okhttp3.Request
+import java.util.Base64
+
+/**
+ * Auth schemes consumers reach for in practice:
+ *
+ *  - `Bearer(token)`            — `Authorization: Bearer <token>`.
+ *  - `ApiKey(name, value, in)`  — header / query / cookie placement,
+ *                                  matching the spec's
+ *                                  `securitySchemes.<name>.in`.
+ *  - `Basic(username, password)` — `Authorization: Basic <base64>`.
+ *
+ * Per-operation auth is auto-wired by the generator when an op has
+ * `security` requirements; it walks the requirement names and applies
+ * any matching scheme value the consumer has placed on `APIClient.auth`.
+ *
+ * `apply` mutates the request builder in-place for header / cookie
+ * auth and returns the (possibly rewritten) `HttpUrl` so query auth
+ * can re-thread its name=value into the URL.
+ */
+public sealed class Auth {
+    public abstract fun apply(
+        builder: Request.Builder,
+        url: HttpUrl,
+    ): HttpUrl
+
+    public data class Bearer(
+        public val token: String,
+    ) : Auth() {
+        override fun apply(
+            builder: Request.Builder,
+            url: HttpUrl,
+        ): HttpUrl {
+            builder.header("Authorization", "Bearer $token")
+            return url
+        }
+    }
+
+    public data class ApiKey(
+        public val name: String,
+        public val value: String,
+        public val location: APIKeyLocation,
+    ) : Auth() {
+        override fun apply(
+            builder: Request.Builder,
+            url: HttpUrl,
+        ): HttpUrl =
+            when (location) {
+                APIKeyLocation.HEADER -> {
+                    builder.header(name, value)
+                    url
+                }
+
+                APIKeyLocation.QUERY -> {
+                    url.newBuilder().addQueryParameter(name, value).build()
+                }
+
+                APIKeyLocation.COOKIE -> {
+                    val cookie = "$name=$value"
+                    val existing = builder.build().header("Cookie")
+                    builder.header("Cookie", existing?.let { "$it; $cookie" } ?: cookie)
+                    url
+                }
+            }
+    }
+
+    public data class Basic(
+        public val username: String,
+        public val password: String,
+    ) : Auth() {
+        override fun apply(
+            builder: Request.Builder,
+            url: HttpUrl,
+        ): HttpUrl {
+            val encoded =
+                Base64
+                    .getEncoder()
+                    .encodeToString("$username:$password".toByteArray(Charsets.UTF_8))
+            builder.header("Authorization", "Basic $encoded")
+            return url
+        }
+    }
+}