@ir-kit/openapi-kotlin 2.0.0 → 2.1.0

package/dist/ir/identifiers.js

@@ -1,4 +1,4 @@
-import { avoidLeadingDigit, escapeIfReserved, softCamel, } from "@ir-kit/codegen-core";
+import { avoidLeadingDigit, escapeIfReserved, Namespace, softCamel, typeIdent, } from "@ir-kit/codegen-core";
 /**
  * Kotlin-specific identifier transforms. Generic case helpers
  * (`pascal`, `camel`, `safeIdent`, `safeCaseName`, `synthName`,
@@ -15,7 +15,8 @@ import { avoidLeadingDigit, escapeIfReserved, softCamel, } from "@ir-kit/codegen
  * pass through unchanged.
  */
 export function paramIdent(name) {
-    return escapeIfReserved(avoidLeadingDigit(softCamel(name)), KOTLIN_RESERVED_KEYWORDS, (s) => `\`${s}\``);
+    const ident = softCamel(name).replace(/[^A-Za-z0-9_]/g, "") || "value";
+    return escapeIfReserved(avoidLeadingDigit(ident), KOTLIN_RESERVED_KEYWORDS, (s) => `\`${s}\``);
 }
 /**
  * Constant-style identifier for enum entries — `SCREAMING_SNAKE_CASE`.
@@ -30,7 +31,9 @@ export function enumEntryIdent(s) {
         .split(/_+/)
         .filter(Boolean);
     const upper = parts.join("_").toUpperCase();
-    return avoidLeadingDigit(upper) || "EMPTY";
+    if (!upper)
+        return "EMPTY";
+    return /^[0-9]/.test(upper) ? `VALUE_${upper}` : upper;
 }
 /**
  * Kotlin's hard keywords (the ones that can't be used as identifiers
@@ -68,4 +71,90 @@ const KOTLIN_RESERVED_KEYWORDS = new Set([
     "when",
     "while",
 ]);
+/** `typeIdent` joined into the PascalCase form Kotlin's class-naming convention expects. */
+export function kotlinTypeIdent(name) {
+    const joined = typeIdent(name)
+        .replace(/_+([A-Za-z0-9])/g, (_, c) => c.toUpperCase())
+        .replace(/_/g, "");
+    const pascal = joined.replace(/^./, (c) => c.toUpperCase());
+    return /^[0-9]/.test(pascal) ? `X${pascal}` : pascal || "Empty";
+}
+/** Operation parameter name that cannot shadow a local of the generated method body. */
+export function operationParamIdent(name) {
+    const ident = paramIdent(name);
+    return OPERATION_LOCALS.has(ident) ? `${ident}Param` : ident;
+}
+/** Owns every top-level Kotlin type name for one generation run. */
+export function newTypeNames() {
+    return new Namespace({
+        normalize: kotlinTypeIdent,
+        reserved: RESERVED_TYPE_NAMES,
+    });
+}
+/** Locals and names generated method bodies declare or capture. */
+const OPERATION_LOCALS = new Set([
+    "auth",
+    "baseUrl",
+    "builder",
+    "client",
+    "currentUrl",
+    "data",
+    "formBuilder",
+    "header",
+    "multipart",
+    "options",
+    "payload",
+    "raw",
+    "response",
+    "scheme",
+    "url",
+    "urlBuilder",
+    "value",
+]);
+/** Kotlin, library and runtime type names generated files use unqualified. */
+const RESERVED_TYPE_NAMES = new Set([
+    "Any",
+    "APIClient",
+    "APIError",
+    "APIInterceptors",
+    "APIKeyLocation",
+    "Auth",
+    "Boolean",
+    "ByteArray",
+    "Dispatchers",
+    "Double",
+    "Exception",
+    "Float",
+    "FormBody",
+    "HttpUrl",
+    "Instant",
+    "Int",
+    "Json",
+    "JsonElement",
+    "KSerializer",
+    "List",
+    "LocalDate",
+    "Long",
+    "Map",
+    "MediaType",
+    "MultipartBody",
+    "MultipartFormBody",
+    "Nothing",
+    "OkHttpClient",
+    "Pair",
+    "QueryStyle",
+    "Request",
+    "RequestBody",
+    "RequestOptions",
+    "Response",
+    "Result",
+    "SerialName",
+    "Serializable",
+    "Set",
+    "String",
+    "Throwable",
+    "TimeUnit",
+    "Unit",
+    "URLEncoding",
+]);
 //# sourceMappingURL=identifiers.js.map

package/dist/ir/identifiers.js.map

@@ -1 +1 @@
-{"version":3,"file":"identifiers.js","sourceRoot":"","sources":["../../src/ir/identifiers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,SAAS,GACV,MAAM,sBAAsB,CAAC;AAE9B;;;;;;;GAOG;AAEH;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,OAAO,gBAAgB,CACrB,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAClC,wBAAwB,EACxB,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAClB,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,CAAS;IACtC,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACjD,8EAA8E;IAC9E,MAAM,KAAK,GAAG,OAAO;SAClB,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC;SACtC,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5C,OAAO,iBAAiB,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC;AAC7C,CAAC;AAED;;;;;GAKG;AACH,MAAM,wBAAwB,GAAwB,IAAI,GAAG,CAAC;IAC5D,IAAI;IACJ,OAAO;IACP,OAAO;IACP,UAAU;IACV,IAAI;IACJ,MAAM;IACN,OAAO;IACP,KAAK;IACL,KAAK;IACL,IAAI;IACJ,IAAI;IACJ,WAAW;IACX,IAAI;IACJ,MAAM;IACN,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,KAAK;IACL,WAAW;IACX,QAAQ;IACR,KAAK;IACL,KAAK;IACL,MAAM;IACN,OAAO;CACR,CAAC,CAAC"}
+{"version":3,"file":"identifiers.js","sourceRoot":"","sources":["../../src/ir/identifiers.ts"],"names":[],"mappings":"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"}

package/dist/ir/impl/body.d.ts

@@ -1,7 +1,8 @@
 import type { IR } from "@hey-api/shared";
 import type { HttpMethod } from "@ir-kit/openapi";
-import type { KtType } from "../../kt-dsl/index.js";
-import { type KtStmt } from "../../kt-dsl/index.js";
+import type { KtType } from "../../ast/index.js";
+import { type KtStmt } from "../../ast/index.js";
+import { type SerializerAliases } from "./serializer.js";
 export interface BodyResult {
     stmts: ReadonlyArray<KtStmt>;
     /** Set when the body builder uses `MultipartFormBody` so the
@@ -24,5 +25,5 @@ export interface BodyResult {
  *
  * Optional fields are wrapped in `if (<id> != null)`.
  */
-export declare function buildBodyStmts(body: IR.BodyObject, method: HttpMethod, bodyType: KtType): BodyResult;
+export declare function buildBodyStmts(body: IR.BodyObject, method: HttpMethod, bodyType: KtType, aliases: SerializerAliases): BodyResult;
 //# sourceMappingURL=body.d.ts.map

package/dist/ir/impl/body.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../../src/ir/impl/body.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAU,MAAM,iBAAiB,CAAC;AAE1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAEL,KAAK,MAAM,EAYZ,MAAM,uBAAuB,CAAC;AAK/B,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAC7B;kDAC8C;IAC9C,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,EAAE,CAAC,UAAU,EACnB,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,MAAM,GACf,UAAU,CA4BZ"}
+{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../../src/ir/impl/body.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAU,MAAM,iBAAiB,CAAC;AAE1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAEL,KAAK,MAAM,EAYZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAC7B;kDAC8C;IAC9C,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,EAAE,CAAC,UAAU,EACnB,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,iBAAiB,GACzB,UAAU,CA+BZ"}

package/dist/ir/impl/body.js

@@ -1,6 +1,6 @@
 import { classifyBody, isSchemaObject } from "@ir-kit/openapi";
-import { ktArg, ktCall, ktExprStmt, ktIdent, ktIf, ktInterp, ktMember, ktNe, ktNull, ktStr, ktVal, } from "../../kt-dsl/index.js";
-import { paramIdent } from "../identifiers.js";
+import { ktArg, ktCall, ktExprStmt, ktIdent, ktIf, ktInterp, ktMember, ktNe, ktNull, ktStr, ktVal, } from "../../ast/index.js";
+import { operationParamIdent } from "../identifiers.js";
 import { setMethodWithBody } from "./request.js";
 import { serializerFor } from "./serializer.js";
 /**
@@ -19,7 +19,7 @@ import { serializerFor } from "./serializer.js";
  *
  * Optional fields are wrapped in `if (<id> != null)`.
  */
-export function buildBodyStmts(body, method, bodyType) {
+export function buildBodyStmts(body, method, bodyType, aliases) {
     const { shape, schema } = classifyBody(body);
     switch (shape.kind) {
         case "json-opaque":
@@ -28,7 +28,10 @@ export function buildBodyStmts(body, method, bodyType) {
                 needsMultipart: false,
             };
         case "json-typed":
-            return { stmts: emitJsonBody(method, bodyType), needsMultipart: false };
+            return {
+                stmts: emitJsonBody(method, bodyType, aliases),
+                needsMultipart: false,
+            };
         case "multipart-object":
             return { stmts: emitMultipartBody(schema, method), needsMultipart: true };
         case "form-urlencoded-object":
@@ -49,10 +52,10 @@ const TO_REQUEST_BODY = "toRequestBody";
 function toMediaTypeCall(mt) {
     return ktCall(ktMember(ktStr(mt), "toMediaType"), []);
 }
-function emitJsonBody(method, bodyType) {
+function emitJsonBody(method, bodyType, aliases) {
     return [
         ktVal("payload", ktCall(ktMember(ktMember(ktIdent("client"), "json"), "encodeToString"), [
-            ktArg(serializerFor(bodyType)),
+            ktArg(serializerFor(bodyType, aliases)),
             ktArg(ktIdent("body")),
         ])),
         setMethodWithBody(method, ktCall(ktMember(ktIdent("payload"), TO_REQUEST_BODY), [
@@ -73,7 +76,7 @@ function emitMultipartBody(schema, method) {
     for (const [propName, propSchema] of Object.entries(schema.properties ?? {})) {
         if (!isSchemaObject(propSchema))
             continue;
-        const id = paramIdent(propName);
+        const id = operationParamIdent(propName);
         const isBinary = propSchema.type === "string" && propSchema.format === "binary";
         const append = isBinary
             ? ktExprStmt(ktCall(ktMember(ktIdent("multipart"), "appendFile"), [
@@ -98,7 +101,7 @@ function emitFormUrlEncodedBody(schema, method) {
         ktVal("formBuilder", ktCall(ktIdent("FormBody.Builder"), [])),
     ];
     for (const propName of Object.keys(schema.properties ?? {})) {
-        const id = paramIdent(propName);
+        const id = operationParamIdent(propName);
         const append = ktExprStmt(ktCall(ktMember(ktIdent("formBuilder"), "add"), [
             ktArg(ktStr(propName)),
             ktArg(ktInterp([ktIdent(id)])),

package/dist/ir/impl/body.js.map

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

package/dist/ir/impl/decode.d.ts

@@ -1,5 +1,6 @@
-import { type KtStmt } from "../../kt-dsl/index.js";
+import { type KtStmt } from "../../ast/index.js";
 import type { OperationSignature } from "../operation/signature.js";
+import { type SerializerAliases } from "./serializer.js";
 /**
  * Tail of an impl method body — delegate to the runtime client. Five
  * shapes, picked from the sig:
@@ -10,5 +11,5 @@ import type { OperationSignature } from "../operation/signature.js";
  *  - Single 2xx, `Pair<T, Response>`  → `return client.executeWithResponse(builder.build(), <ser>, …)`
  *  - Multi 2xx (sealed-class)         → `client.executeRaw(...)` + `when (response.code)` switch, decode each case
  */
-export declare function buildSendAndDecodeStmts(sig: OperationSignature): ReadonlyArray<KtStmt>;
+export declare function buildSendAndDecodeStmts(sig: OperationSignature, aliases: SerializerAliases): ReadonlyArray<KtStmt>;
 //# sourceMappingURL=decode.d.ts.map

package/dist/ir/impl/decode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../../../src/ir/impl/decode.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,MAAM,EAaZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EACV,kBAAkB,EAEnB,MAAM,2BAA2B,CAAC;AAGnC;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,kBAAkB,GACtB,aAAa,CAAC,MAAM,CAAC,CAGvB"}
+{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../../../src/ir/impl/decode.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,MAAM,EAeZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EACV,kBAAkB,EAEnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,iBAAiB,GACzB,aAAa,CAAC,MAAM,CAAC,CAIvB"}

package/dist/ir/impl/decode.js

@@ -1,4 +1,4 @@
-import { ktArg, ktCall, ktExprStmt, ktIdent, ktIntLit, ktMember, ktReturn, ktThrow, ktVal, ktWhen, ktWhenCase, } from "../../kt-dsl/index.js";
+import { isUnit, ktArg, ktCall, ktExprStmt, ktIdent, ktIntLit, ktMember, ktReturn, ktThrow, ktVal, ktWhen, ktWhenCase, typeArgs, typeName, } from "../../ast/index.js";
 import { serializerFor } from "./serializer.js";
 /**
  * Tail of an impl method body — delegate to the runtime client. Five
@@ -10,20 +10,20 @@ import { serializerFor } from "./serializer.js";
  *  - Single 2xx, `Pair<T, Response>`  → `return client.executeWithResponse(builder.build(), <ser>, …)`
  *  - Multi 2xx (sealed-class)         → `client.executeRaw(...)` + `when (response.code)` switch, decode each case
  */
-export function buildSendAndDecodeStmts(sig) {
+export function buildSendAndDecodeStmts(sig, aliases) {
     if (sig.responseCases.length > 0)
-        return buildMultiResponseStmts(sig);
-    return buildSingleResponseStmts(sig.returnType);
+        return buildMultiResponseStmts(aliases, sig);
+    return buildSingleResponseStmts(sig.returnType, aliases);
 }
 // MARK: single-2xx
-function buildSingleResponseStmts(returnType) {
+function buildSingleResponseStmts(returnType, aliases) {
     const dispatch = classifyReturn(returnType);
     const callee = ktMember(ktIdent("client"), dispatch.method);
     const args = [
         ktArg(ktCall(ktMember(ktIdent("builder"), "build"), [])),
     ];
     if (dispatch.deserializerType) {
-        args.push(ktArg(serializerFor(dispatch.deserializerType)));
+        args.push(ktArg(serializerFor(dispatch.deserializerType, aliases)));
     }
     args.push(ktArg(ktMember(ktIdent("options"), "timeout"), "timeout"), ktArg(ktMember(ktIdent("options"), "requestInterceptors"), "extraInterceptors"), ktArg(ktMember(ktIdent("options"), "responseValidator"), "responseValidator"));
     if (dispatch.includeTransformer) {
@@ -33,24 +33,24 @@ function buildSingleResponseStmts(returnType) {
     return dispatch.discardResult ? [ktExprStmt(call)] : [ktReturn(call)];
 }
 function classifyReturn(t) {
-    if (t.kind === "primitive" && t.name === "Unit") {
+    if (isUnit(t)) {
         return {
             method: "executeUnit",
             includeTransformer: false,
             discardResult: true,
         };
     }
-    if (t.kind === "ref" && t.name === "Response") {
+    if (typeName(t) === "Response") {
         return {
             method: "executeUnitWithResponse",
             includeTransformer: false,
             discardResult: false,
         };
     }
-    if (t.kind === "ref" && t.name === "Pair" && t.args && t.args.length > 0) {
+    if (typeName(t) === "Pair" && typeArgs(t).length > 0) {
         return {
             method: "executeWithResponse",
-            deserializerType: t.args[0],
+            deserializerType: typeArgs(t)[0],
             includeTransformer: true,
             discardResult: false,
         };
@@ -63,9 +63,9 @@ function classifyReturn(t) {
     };
 }
 // MARK: multi-2xx
-function buildMultiResponseStmts(sig) {
-    const wrapWithResponse = sig.returnType.kind === "ref" && sig.returnType.name === "Pair";
-    const sealedName = `${sig.ownerName}_Response`;
+function buildMultiResponseStmts(aliases, sig) {
+    const wrapWithResponse = typeName(sig.returnType) === "Pair";
+    const sealedName = sig.sealedName ?? sig.ownerName;
     const args = [
         ktArg(ktCall(ktMember(ktIdent("builder"), "build"), [])),
         ktArg(ktMember(ktIdent("options"), "timeout"), "timeout"),
@@ -77,7 +77,7 @@ function buildMultiResponseStmts(sig) {
         ktVal("raw", ktCall(ktMember(ktIdent("client"), "executeRaw"), args)),
         ktVal("data", ktMember(ktIdent("raw"), "first")),
         ktVal("response", ktMember(ktIdent("raw"), "second")),
-        ktWhen(ktMember(ktIdent("response"), "code"), sig.responseCases.map((c) => ktWhenCase([ktIntLit(Number(c.statusCode))], caseBody(c, sealedName, wrapWithResponse))), [
+        ktWhen(ktMember(ktIdent("response"), "code"), sig.responseCases.map((c) => ktWhenCase([ktIntLit(Number(c.statusCode))], caseBody(aliases, c, sealedName, wrapWithResponse))), [
             ktThrow(ktCall(ktIdent("APIError.UnexpectedStatus"), [
                 ktArg(ktMember(ktIdent("response"), "code")),
                 ktArg(ktIdent("data")),
@@ -85,14 +85,14 @@ function buildMultiResponseStmts(sig) {
         ]),
     ];
 }
-function caseBody(c, sealedName, wrapWithResponse) {
+function caseBody(aliases, c, sealedName, wrapWithResponse) {
     if (!c.payloadType) {
         return [
             ktReturn(wrapResult(ktIdent(`${sealedName}.${c.caseName}`), wrapWithResponse)),
         ];
     }
     const decoded = ktCall(ktMember(ktMember(ktIdent("client"), "json"), "decodeFromString"), [
-        ktArg(serializerFor(c.payloadType)),
+        ktArg(serializerFor(c.payloadType, aliases)),
         ktArg(ktCall(ktMember(ktIdent("data"), "decodeToString"), [])),
     ]);
     return [

package/dist/ir/impl/decode.js.map

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

package/dist/ir/impl/headers.d.ts

@@ -1,5 +1,5 @@
 import { type LocatedParam } from "@ir-kit/openapi";
-import { type KtStmt } from "../../kt-dsl/index.js";
+import { type KtStmt } from "../../ast/index.js";
 /**
  * `builder.header("<name>", "$<value>")` for each header param. Optional
  * headers are wrapped in `if (<name> != null)`.

package/dist/ir/impl/headers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../src/ir/impl/headers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EACL,KAAK,MAAM,EAWZ,MAAM,uBAAuB,CAAC;AAG/B;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,GACnC,aAAa,CAAC,MAAM,CAAC,CAGvB"}
+{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../src/ir/impl/headers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EACL,KAAK,MAAM,EAWZ,MAAM,oBAAoB,CAAC;AAG5B;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,GACnC,aAAa,CAAC,MAAM,CAAC,CAGvB"}

package/dist/ir/impl/headers.js

@@ -1,6 +1,6 @@
 import { paramsAt } from "@ir-kit/openapi";
-import { ktArg, ktCall, ktExprStmt, ktIdent, ktIf, ktInterp, ktMember, ktNe, ktNull, ktStr, } from "../../kt-dsl/index.js";
-import { paramIdent } from "../identifiers.js";
+import { ktArg, ktCall, ktExprStmt, ktIdent, ktIf, ktInterp, ktMember, ktNe, ktNull, ktStr, } from "../../ast/index.js";
+import { operationParamIdent } from "../identifiers.js";
 /**
  * `builder.header("<name>", "$<value>")` for each header param. Optional
  * headers are wrapped in `if (<name> != null)`.
@@ -10,7 +10,7 @@ export function buildHeaderStmts(located) {
     return headers.flatMap(buildHeaderStmt);
 }
 function buildHeaderStmt(p) {
-    const id = paramIdent(p.name);
+    const id = operationParamIdent(p.name);
     const setStmt = ktExprStmt(ktCall(ktMember(ktIdent("builder"), "header"), [
         ktArg(ktStr(p.name)),
         ktArg(ktInterp([ktIdent(id)])),

package/dist/ir/impl/headers.js.map

@@ -1 +1 @@
-{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../../src/ir/impl/headers.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAEL,KAAK,EACL,MAAM,EACN,UAAU,EACV,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,KAAK,GACN,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAoC;IAEpC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC5C,OAAO,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,eAAe,CAAC,CAAqB;IAC5C,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,OAAO,GAAG,UAAU,CACxB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,EAAE;QAC7C,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC/B,CAAC,CACH,CAAC;IACF,IAAI,CAAC,CAAC,QAAQ;QAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../../src/ir/impl/headers.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAEL,KAAK,EACL,MAAM,EACN,UAAU,EACV,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,KAAK,GACN,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAoC;IAEpC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC5C,OAAO,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,eAAe,CAAC,CAAqB;IAC5C,MAAM,EAAE,GAAG,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,UAAU,CACxB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,EAAE;QAC7C,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC/B,CAAC,CACH,CAAC;IACF,IAAI,CAAC,CAAC,QAAQ;QAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC"}

package/dist/ir/impl/index.d.ts

@@ -1,8 +1,9 @@
-import { type KtClass } from "../../kt-dsl/index.js";
+import { type KtDecl } from "../../ast/index.js";
 import type { OperationSignature } from "../operation/signature.js";
+import type { SerializerAliases } from "./serializer.js";
 export interface ClientClassResult {
     /** The impl class itself. */
-    class: KtClass;
+    class: KtDecl;
     /** True when at least one method uses the `MultipartFormBody` helper,
      *  so the orchestrator should ship it. */
     needsMultipart: boolean;
@@ -11,6 +12,8 @@ export interface ClientClassOptions {
     /** When true, the class is `open` (subclassable) instead of final.
      *  Default: `false`. */
     open?: boolean;
+    /** Type aliases visible to serializer resolution. */
+    aliases?: SerializerAliases;
 }
 /**
  * Convert a list of `OperationSignature`s for a tag into a class that

package/dist/ir/impl/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ir/impl/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAuBb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAiKpE,MAAM,WAAW,iBAAiB;IAChC,6BAA6B;IAC7B,KAAK,EAAE,OAAO,CAAC;IACf;8CAC0C;IAC1C,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC;4BACwB;IACxB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,aAAa,CAAC,kBAAkB,CAAC,EAC7C,IAAI,GAAE,kBAAuB,GAC5B,iBAAiB,CAmBnB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ir/impl/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,MAAM,EAsBZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAKpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAgKzD,MAAM,WAAW,iBAAiB;IAChC,6BAA6B;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd;8CAC0C;IAC1C,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC;4BACwB;IACxB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,qDAAqD;IACrD,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,aAAa,CAAC,kBAAkB,CAAC,EAC7C,IAAI,GAAE,kBAAuB,GAC5B,iBAAiB,CAoBnB"}

package/dist/ir/impl/index.js

@@ -1,4 +1,4 @@
-import { ktArg, ktAssign, ktCall, ktClass, ktElvis, ktExprStmt, ktForIn, ktFun, ktIdent, ktIndex, ktLambda, ktListLit, ktMember, ktProp, ktRef, ktSafeMember, ktStr, ktVal, ktVar, } from "../../kt-dsl/index.js";
+import { ktArg, ktAssign, ktCall, ktClass, ktElvis, ktExprStmt, ktForIn, ktFun, ktIdent, ktIndex, ktLambda, ktListLit, ktMember, ktProp, ktRef, ktSafeMember, ktStr, ktVal, ktVar, } from "../../ast/index.js";
 import { buildBodyStmts } from "./body.js";
 import { buildSendAndDecodeStmts } from "./decode.js";
 import { buildHeaderStmts } from "./headers.js";
@@ -21,17 +21,17 @@ import { buildUrlStmts } from "./url.js";
  *  8. Delegate to `client.execute(...)` with timeout + interceptors +
  *     validator + transformer.
  */
-function buildImplFun(sig) {
+function buildImplFun(sig, aliases) {
     const stmts = [];
     stmts.push(...resolveOverrideStmts());
     stmts.push(...buildUrlStmts(sig.pathStr, sig.locatedParams));
-    stmts.push(...buildRequestStmts(sig.method));
+    stmts.push(...buildRequestStmts(sig.method, Boolean(sig.op.body)));
     stmts.push(...buildHeaderStmts(sig.locatedParams));
     let needsMultipart = false;
     if (sig.op.body) {
         const bodyParam = sig.params.find((p) => p.name === "body");
         const bodyType = bodyParam?.type ?? ktRef("ByteArray");
-        const result = buildBodyStmts(sig.op.body, sig.method, bodyType);
+        const result = buildBodyStmts(sig.op.body, sig.method, bodyType, aliases);
         stmts.push(...result.stmts);
         needsMultipart = result.needsMultipart;
     }
@@ -39,7 +39,7 @@ function buildImplFun(sig) {
         stmts.push(...applyAuthStmts(sig.securitySchemeNames));
     }
     stmts.push(applyOptionsHeadersStmt());
-    stmts.push(...buildSendAndDecodeStmts(sig));
+    stmts.push(...buildSendAndDecodeStmts(sig, aliases));
     // Kotlin forbids defaults on `override` methods (the interface
     // signature carries them via the convenience extension fun).
     const overrideParams = sig.params.map((p) => p.default === undefined ? p : { ...p, default: undefined });
@@ -119,7 +119,7 @@ function applyAuthStmts(schemeNames) {
  * send/dispatch/decode to it.
  */
 export function buildClientClass(className, interfaceName, signatures, opts = {}) {
-    const built = signatures.map(buildImplFun);
+    const built = signatures.map((sig) => buildImplFun(sig, opts.aliases ?? new Map()));
     const modifiers = opts.open ? ["open"] : [];
     return {
         class: ktClass({
@@ -130,7 +130,6 @@ export function buildClientClass(className, interfaceName, signatures, opts = {}
                 ktProp({
                     name: "client",
                     type: ktRef("APIClient"),
-                    inPrimary: true,
                 }),
             ],
             funs: built.map((b) => b.fun),

package/dist/ir/impl/index.js.map

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

package/dist/ir/impl/request.d.ts

@@ -1,14 +1,14 @@
 import { type HttpMethod } from "@ir-kit/openapi";
-import { type KtStmt } from "../../kt-dsl/index.js";
+import { type KtStmt } from "../../ast/index.js";
 /**
- * Initial request builder + HTTP method. Body-bearing methods can re-call
- * `.method(verb, body)` later from the body builder; bodyless methods
- * (`GET` / `HEAD` / `DELETE` without body) keep the `null` body set here.
+ * Request builder for the URL. When the operation has a body, the body
+ * builder sets the method together with it; otherwise the method is set
+ * here, with an empty body for verbs OkHttp requires one for.
  *
  *   val builder = Request.Builder().url(url).method("GET", null)
  */
-export declare function buildRequestStmts(method: HttpMethod): ReadonlyArray<KtStmt>;
+export declare function buildRequestStmts(method: HttpMethod, hasBody: boolean): ReadonlyArray<KtStmt>;
 /** Convenience for the body builder to re-set the method when a
  *  RequestBody is produced. */
-export declare function setMethodWithBody(method: HttpMethod, bodyExpr: import("../../kt-dsl/index.js").KtExpr): KtStmt;
+export declare function setMethodWithBody(method: HttpMethod, bodyExpr: import("../../ast/index.js").KtExpr): KtStmt;
 //# sourceMappingURL=request.d.ts.map

package/dist/ir/impl/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/ir/impl/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EACL,KAAK,MAAM,EASZ,MAAM,uBAAuB,CAAC;AAE/B;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,CAe3E;AAED;+BAC+B;AAC/B,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,OAAO,uBAAuB,EAAE,MAAM,GAC/C,MAAM,CAOR"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/ir/impl/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EACL,KAAK,MAAM,EAUZ,MAAM,oBAAoB,CAAC;AAK5B;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,OAAO,GACf,aAAa,CAAC,MAAM,CAAC,CAyBvB;AAED;+BAC+B;AAC/B,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,OAAO,oBAAoB,EAAE,MAAM,GAC5C,MAAM,CAOR"}

package/dist/ir/impl/request.js

@@ -1,17 +1,27 @@
 import { HTTP_METHOD_LITERAL } from "@ir-kit/openapi";
-import { ktArg, ktCall, ktExprStmt, ktIdent, ktMember, ktNull, ktStr, ktVal, } from "../../kt-dsl/index.js";
+import { ktArg, ktCall, ktExprStmt, ktIdent, ktIntLit, ktMember, ktNull, ktStr, ktVal, } from "../../ast/index.js";
+/** Methods OkHttp rejects without a request body. */
+const REQUIRES_BODY = new Set(["POST", "PUT", "PATCH"]);
 /**
- * Initial request builder + HTTP method. Body-bearing methods can re-call
- * `.method(verb, body)` later from the body builder; bodyless methods
- * (`GET` / `HEAD` / `DELETE` without body) keep the `null` body set here.
+ * Request builder for the URL. When the operation has a body, the body
+ * builder sets the method together with it; otherwise the method is set
+ * here, with an empty body for verbs OkHttp requires one for.
  *
  *   val builder = Request.Builder().url(url).method("GET", null)
  */
-export function buildRequestStmts(method) {
+export function buildRequestStmts(method, hasBody) {
+    const verb = HTTP_METHOD_LITERAL[method];
+    const withUrl = ktCall(ktMember(ktCall(ktIdent("Request.Builder"), []), "url"), [ktArg(ktIdent("url"))]);
+    if (hasBody)
+        return [ktVal("builder", withUrl)];
+    const emptyBody = REQUIRES_BODY.has(verb)
+        ? ktCall(ktMember(ktCall(ktIdent("ByteArray"), [ktArg(ktIntLit(0))]), "toRequestBody"), [])
+        : ktNull;
     return [
-        ktVal("builder", ktCall(ktMember(ktCall(ktMember(ktCall(ktIdent("Request.Builder"), []), "url"), [
-            ktArg(ktIdent("url")),
-        ]), "method"), [ktArg(ktStr(HTTP_METHOD_LITERAL[method])), ktArg(ktNull)])),
+        ktVal("builder", ktCall(ktMember(withUrl, "method"), [
+            ktArg(ktStr(verb)),
+            ktArg(emptyBody),
+        ])),
     ];
 }
 /** Convenience for the body builder to re-set the method when a

package/dist/ir/impl/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/ir/impl/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EAEL,KAAK,EACL,MAAM,EACN,UAAU,EACV,OAAO,EACP,QAAQ,EACR,MAAM,EACN,KAAK,EACL,KAAK,GACN,MAAM,uBAAuB,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAkB;IAClD,OAAO;QACL,KAAK,CACH,SAAS,EACT,MAAM,CACJ,QAAQ,CACN,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE;YAC9D,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACtB,CAAC,EACF,QAAQ,CACT,EACD,CAAC,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAC3D,CACF;KACF,CAAC;AACJ,CAAC;AAED;+BAC+B;AAC/B,MAAM,UAAU,iBAAiB,CAC/B,MAAkB,EAClB,QAAgD;IAEhD,OAAO,UAAU,CACf,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,EAAE;QAC7C,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;QACzC,KAAK,CAAC,QAAQ,CAAC;KAChB,CAAC,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/ir/impl/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EAEL,KAAK,EACL,MAAM,EACN,UAAU,EACV,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,KAAK,EACL,KAAK,GACN,MAAM,oBAAoB,CAAC;AAE5B,qDAAqD;AACrD,MAAM,aAAa,GAAwB,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;AAE7E;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAAkB,EAClB,OAAgB;IAEhB,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,CACpB,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,EACvD,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CACxB,CAAC;IACF,IAAI,OAAO;QAAE,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC;QACvC,CAAC,CAAC,MAAM,CACJ,QAAQ,CACN,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAClD,eAAe,CAChB,EACD,EAAE,CACH;QACH,CAAC,CAAC,MAAM,CAAC;IACX,OAAO;QACL,KAAK,CACH,SAAS,EACT,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE;YAClC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAClB,KAAK,CAAC,SAAS,CAAC;SACjB,CAAC,CACH;KACF,CAAC;AACJ,CAAC;AAED;+BAC+B;AAC/B,MAAM,UAAU,iBAAiB,CAC/B,MAAkB,EAClB,QAA6C;IAE7C,OAAO,UAAU,CACf,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,EAAE;QAC7C,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;QACzC,KAAK,CAAC,QAAQ,CAAC;KAChB,CAAC,CACH,CAAC;AACJ,CAAC"}