typespec-rust-emitter 0.12.0 → 0.13.0

package/dist/src/parser/types.js

@@ -0,0 +1,157 @@
+import { getFormat, getPattern, isArrayModelType, isRecordModelType, } from "@typespec/compiler";
+import { formatToRust, scalarToRust } from "../formatter/mappings.js";
+import { toPascalCase } from "../formatter/strings.js";
+const typeSpecNamespaces = new Set([
+    "TypeSpec",
+    "@typespec/http",
+    "@typespec/rest",
+    "@typespec/openapi",
+    "@typespec/openapi3",
+    "@typespec/json-schema",
+]);
+export function isStdLibNamespace(ns) {
+    if (!ns)
+        return false;
+    const fullName = ns.name;
+    if (typeSpecNamespaces.has(fullName))
+        return true;
+    if (ns.namespace)
+        return isStdLibNamespace(ns.namespace);
+    return false;
+}
+export function isStdLibType(type) {
+    if ("namespace" in type) {
+        const ns = type.namespace;
+        if (isStdLibNamespace(ns))
+            return true;
+    }
+    return false;
+}
+export function getRustTypeForProperty(type, program, anonymousEnums) {
+    const kind = type.kind;
+    if (kind === "Model") {
+        const model = type;
+        if (isArrayModelType(model) && model.indexer?.value) {
+            const element = getRustTypeForProperty(model.indexer.value, program, anonymousEnums);
+            return { type: `Vec<${element.type}>`, isStringLiteral: false };
+        }
+        if (isRecordModelType(model) && model.indexer?.value) {
+            const value = getRustTypeForProperty(model.indexer.value, program, anonymousEnums);
+            return {
+                type: `std::collections::HashMap<String, ${value.type}>`,
+                isStringLiteral: false,
+            };
+        }
+        return { type: toPascalCase(model.name), isStringLiteral: false };
+    }
+    if (kind === "ModelProperty") {
+        return getRustTypeForProperty(type.type, program, anonymousEnums);
+    }
+    if (kind === "Enum") {
+        return { type: toPascalCase(type.name), isStringLiteral: false };
+    }
+    if (kind === "Union") {
+        const unionType = type;
+        const variants = Array.from(unionType.variants.values());
+        const allStringLiterals = variants.every((v) => v.type.kind === "String");
+        if (allStringLiterals) {
+            if (unionType.name) {
+                return {
+                    type: toPascalCase(unionType.name),
+                    isStringLiteral: false,
+                };
+            }
+            const values = variants.map((v) => v.type.value);
+            const sanitized = values.map((v) => v.replace(/_/g, ""));
+            const firstTwo = sanitized.slice(0, 2).map(toPascalCase).join("");
+            const enumName = `Enum${firstTwo}${sanitized.length}`;
+            if (!anonymousEnums.has(enumName)) {
+                anonymousEnums.set(enumName, {
+                    enumName,
+                    variants: variants.map((v) => v.type),
+                });
+            }
+            return { type: enumName, isStringLiteral: false };
+        }
+        const nonNullVariants = variants.filter((v) => {
+            const vt = v.type;
+            if (vt.kind === "Null")
+                return false;
+            if (vt.kind === "Intrinsic" &&
+                vt.name === "null")
+                return false;
+            return true;
+        });
+        if (nonNullVariants.length === 1 &&
+            (variants.length === 2 ||
+                variants.some((v) => {
+                    const vt = v.type;
+                    return (vt.kind === "Null" ||
+                        (vt.kind === "Intrinsic" &&
+                            vt.name === "null"));
+                }))) {
+            const vt = getRustTypeForProperty(nonNullVariants[0].type, program, anonymousEnums);
+            return { type: `Option<${vt.type}>`, isStringLiteral: false };
+        }
+        const variantStrings = [];
+        for (const v of variants) {
+            const vt = v.type;
+            if (vt.kind === "Null")
+                continue;
+            if (vt.kind === "Intrinsic" &&
+                vt.name === "null")
+                continue;
+            const rustVt = getRustTypeForProperty(vt, program, anonymousEnums);
+            variantStrings.push(rustVt.type);
+        }
+        const uniqueTypes = [...new Set(variantStrings)];
+        const resultType = uniqueTypes.length === 1
+            ? uniqueTypes[0]
+            : `(${uniqueTypes.join(" | ")})`;
+        return { type: resultType, isStringLiteral: false };
+    }
+    if (kind === "Scalar") {
+        const scalar = type;
+        const format = getFormat(program, scalar);
+        const pattern = getPattern(program, scalar);
+        if (format && formatToRust[format] && !pattern) {
+            return { type: formatToRust[format], isStringLiteral: false };
+        }
+        if (pattern) {
+            return { type: toPascalCase(scalar.name), isStringLiteral: false };
+        }
+        return {
+            type: scalarToRust[scalar.name] ?? scalar.name,
+            isStringLiteral: false,
+        };
+    }
+    if (kind === "Intrinsic") {
+        const intrinsic = type;
+        const format = getFormat(program, type);
+        if (format && formatToRust[format]) {
+            return { type: formatToRust[format], isStringLiteral: false };
+        }
+        return {
+            type: scalarToRust[intrinsic.name] ?? "serde_json::Value",
+            isStringLiteral: false,
+        };
+    }
+    if (kind === "String") {
+        return { type: "String", isStringLiteral: false };
+    }
+    if (kind === "StringLiteral") {
+        return {
+            type: "String",
+            isStringLiteral: true,
+            stringLiteralValue: type.value,
+        };
+    }
+    if (kind === "Boolean" || kind === "BooleanLiteral") {
+        return { type: "bool", isStringLiteral: false };
+    }
+    if (kind === "Number" || kind === "NumericLiteral") {
+        return { type: "f64", isStringLiteral: false };
+    }
+    return { type: "serde_json::Value", isStringLiteral: false };
+}
+//# sourceMappingURL=types.js.map

package/dist/src/parser/types.js.map

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

package/dist/test/etag_cache.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/etag_cache.test.js

@@ -0,0 +1,62 @@
+import { strictEqual } from "node:assert";
+import { describe, it } from "node:test";
+import { emit, compareWithGolden } from "./test-host.js";
+const ETAG_SPEC = `
+  import "@typespec/http";
+  import "typespec-rust-emitter";
+  using TypeSpec.Http;
+
+  model Article { id: string; title: string; }
+
+  @route("/articles")
+  namespace Articles {
+    @etagCache
+    @get
+    op getArticle(@path id: string): {
+      @statusCode statusCode: 200;
+      @body body: Article;
+    } | {
+      @statusCode statusCode: 304;
+    };
+  }
+`;
+describe("@etagCache decorator", () => {
+    it("generates EtagCache trait in server.rs", async () => {
+        const results = await emit(ETAG_SPEC);
+        const server = results["server.rs"];
+        strictEqual(server.includes("pub trait EtagCache"), true);
+        strictEqual(server.includes("fn get(&self, key: &str) -> Option<String>"), true);
+        strictEqual(server.includes("fn set(&self, key: &str, etag: &str)"), true);
+    });
+    it("generates cache-aware handler with 304 short-circuit", async () => {
+        const results = await emit(ETAG_SPEC);
+        const server = results["server.rs"];
+        strictEqual(server.includes("axum::http::StatusCode::NOT_MODIFIED"), true);
+        strictEqual(server.includes("cache.get(cache_key.as_ref())"), true);
+    });
+    it("supports custom etagKey and @cacheControl", async () => {
+        const spec = `
+      import "@typespec/http";
+      import "typespec-rust-emitter";
+      using TypeSpec.Http;
+
+      @route("/test")
+      namespace Test {
+        @etagCache("my-key")
+        @cacheControl("public")
+        @get
+        op run(): { @statusCode statusCode: 200; };
+      }
+    `;
+        const results = await emit(spec);
+        const server = results["server.rs"];
+        strictEqual(server.includes('let cache_key = "my-key";'), true);
+        strictEqual(server.includes('axum::http::header::CACHE_CONTROL'), true);
+        strictEqual(server.includes('"public"'), true);
+    });
+    it("matches golden file", async () => {
+        const results = await emit(ETAG_SPEC);
+        compareWithGolden(results, "etag_cache", "server.rs");
+    });
+});
+//# sourceMappingURL=etag_cache.test.js.map

package/dist/test/etag_cache.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"etag_cache.test.js","sourceRoot":"","sources":["../../test/etag_cache.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,MAAM,SAAS,GAAG;;;;;;;;;;;;;;;;;;CAkBjB,CAAC;AAEF,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QACpC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,IAAI,CAAC,CAAC;QAC1D,WAAW,CACT,MAAM,CAAC,QAAQ,CAAC,4CAA4C,CAAC,EAC7D,IAAI,CACL,CAAC;QACF,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,sCAAsC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QACpC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,sCAAsC,CAAC,EAAE,IAAI,CAAC,CAAC;QAC3E,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,+BAA+B,CAAC,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,IAAI,GAAG;;;;;;;;;;;;KAYZ,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QACpC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,EAAE,IAAI,CAAC,CAAC;QAChE,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,mCAAmC,CAAC,EAAE,IAAI,CAAC,CAAC;QACxE,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;QACnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC;QACtC,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/test/test-host.d.ts

@@ -2,3 +2,14 @@ import { Diagnostic } from "@typespec/compiler";
 export declare const Tester: import("@typespec/compiler/testing").EmitterTester<import("@typespec/compiler/testing").TestEmitterCompileResult>;
 export declare function emitWithDiagnostics(code: string): Promise<[Record<string, string>, readonly Diagnostic[]]>;
 export declare function emit(code: string): Promise<Record<string, string>>;
+/**
+ * compareWithGolden
+ *
+ * Reads an expected file from test/golden/<goldenDir>/<fileName>
+ * and asserts that the emitted output matches it exactly.
+ *
+ * @param emitted  - Record produced by emit() e.g. { "types.rs": "...", "server.rs": "..." }
+ * @param goldenDir - Subdirectory name inside test/golden/
+ * @param fileName  - File key to check, e.g. "server.rs"
+ */
+export declare function compareWithGolden(emitted: Record<string, string>, goldenDir: string, fileName: string): void;

package/dist/test/test-host.js

@@ -1,6 +1,7 @@
 import { resolvePath } from "@typespec/compiler";
 import { expectDiagnosticEmpty } from "@typespec/compiler/testing";
 import { createTester } from "@typespec/compiler/testing";
+import { readFileSync } from "node:fs";
 export const Tester = createTester(resolvePath(import.meta.dirname, "../.."), {
     libraries: [
         "@typespec/http",
@@ -18,4 +19,31 @@ export async function emit(code) {
     expectDiagnosticEmpty(diagnostics);
     return result;
 }
+/**
+ * compareWithGolden
+ *
+ * Reads an expected file from test/golden/<goldenDir>/<fileName>
+ * and asserts that the emitted output matches it exactly.
+ *
+ * @param emitted  - Record produced by emit() e.g. { "types.rs": "...", "server.rs": "..." }
+ * @param goldenDir - Subdirectory name inside test/golden/
+ * @param fileName  - File key to check, e.g. "server.rs"
+ */
+export function compareWithGolden(emitted, goldenDir, fileName) {
+    const goldenPath = resolvePath(import.meta.dirname, "../../test", "golden", goldenDir, fileName);
+    const expected = readFileSync(goldenPath, "utf8");
+    const actual = emitted[fileName];
+    if (actual === undefined) {
+        throw new Error(`Emitter did not produce "${fileName}". Keys: ${Object.keys(emitted).join(", ")}`);
+    }
+    if (actual !== expected) {
+        // Show a useful diff-style message.
+        const expectedLines = expected.split("\n");
+        const actualLines = actual.split("\n");
+        const firstDiff = expectedLines.findIndex((l, i) => l !== actualLines[i]);
+        throw new Error(`Golden mismatch in ${goldenDir}/${fileName} at line ${firstDiff + 1}.\n` +
+            `Expected: ${expectedLines[firstDiff]}\n` +
+            `Actual:   ${actualLines[firstDiff]}`);
+    }
+}
 //# sourceMappingURL=test-host.js.map

package/dist/test/test-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-host.js","sourceRoot":"","sources":["../../test/test-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,CAAC,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;IAC5E,SAAS,EAAE;QACT,gBAAgB;QAChB,eAAe;QACf,kBAAkB;QAClB,uBAAuB;KACxB;CACF,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;AAEjC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,IAAY;IAEZ,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACzE,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,IAAY;IACrC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC9D,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACnC,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"test-host.js","sourceRoot":"","sources":["../../test/test-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,MAAM,CAAC,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;IAC5E,SAAS,EAAE;QACT,gBAAgB;QAChB,eAAe;QACf,kBAAkB;QAClB,uBAAuB;KACxB;CACF,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;AAEjC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,IAAY;IAEZ,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACzE,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,IAAY;IACrC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC9D,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACnC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAA+B,EAC/B,SAAiB,EACjB,QAAgB;IAEhB,MAAM,UAAU,GAAG,WAAW,CAC5B,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,QAAQ,CACT,CAAC;IACF,MAAM,QAAQ,GAAG,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,4BAA4B,QAAQ,YAAY,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAClF,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxB,oCAAoC;QACpC,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1E,MAAM,IAAI,KAAK,CACb,sBAAsB,SAAS,IAAI,QAAQ,YAAY,SAAS,GAAG,CAAC,KAAK;YACvE,aAAa,aAAa,CAAC,SAAS,CAAC,IAAI;YACzC,aAAa,WAAW,CAAC,SAAS,CAAC,EAAE,CACxC,CAAC;IACJ,CAAC;AACH,CAAC"}

package/example/main.tsp

@@ -43,8 +43,16 @@ model Item {
 
 @route("/items")
 namespace Items {
+  @cacheControl("no-cache")
   @get
-  op getItem(@query id: string): {
+  op list(): {
+    @statusCode statusCode: 200;
+    @body items: Item[];
+  };
+
+  @get
+  @route("/{id}")
+  op getItem(@path id: string): {
     @statusCode status: 200;
     @body body: Item;
   };
@@ -64,6 +72,24 @@ namespace Items {
   };
 }
 
+model Article {
+  id: string;
+  title: string;
+}
+
+@route("/articles")
+namespace Articles {
+  @etagCache("article-list")
+  @cacheControl("public, max-age=3600")
+  @get
+  op getArticle(@path id: string): {
+    @statusCode statusCode: 200;
+    @body body: Article;
+  } | {
+    @statusCode statusCode: 304;
+  };
+}
+
 @route("/consuming")
 namespace Consuming {
   @rustOwn

package/example/output-rust/Cargo.lock

@@ -117,6 +117,29 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "axum-extra"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9963ff19f40c6102c76756ef0a46004c0d58957d87259fc9208ff8441c12ab96"
+dependencies = [
+ "axum",
+ "axum-core",
+ "bytes",
+ "futures-util",
+ "headers",
+ "http",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "rustversion",
+ "serde_core",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -562,6 +585,30 @@ dependencies = [
  "hashbrown 0.15.5",
 ]
 
+[[package]]
+name = "headers"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3314d5adb5d94bcdf56771f2e50dbbc80bb4bdf88967526706205ac9eff24eb"
+dependencies = [
+ "base64",
+ "bytes",
+ "headers-core",
+ "http",
+ "httpdate",
+ "mime",
+ "sha1",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
+dependencies = [
+ "http",
+]
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1032,6 +1079,7 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "axum",
+ "axum-extra",
  "chrono",
  "eyre",
  "futures",

package/example/output-rust/Cargo.toml

@@ -12,6 +12,7 @@ thiserror = "2.0.18"
 uuid = { version = "1.23.0", features = ["serde", "v4"] }
 sqlx = { version = "0.8", features = ["runtime-tokio", "postgres", "derive"] }
 axum = { version = "0.8.8", features = ["multipart"] }
+axum-extra = { version = "0.10", features = ["typed-header"] }
 eyre = "0.6"
 async-trait = "0.1"
 tokio = { version = "1.50.0", features = ["full"] }

package/example/output-rust/src/generated/server.rs

@@ -9,6 +9,18 @@ use axum::response::IntoResponse;
 use axum::Json;
 use eyre::Result;
 
+
+/// Pluggable ETag cache backend.
+/// Implement this for Redis, Memcached, in-memory HashMap, or any store.
+pub trait EtagCache {
+    /// Return the stored ETag string for `key`, or `None` if not cached.
+    fn get(&self, key: &str) -> Option<String>;
+    /// Store `etag` under `key`.
+    fn set(&self, key: &str, etag: &str);
+}
+
+
+
 #[async_trait]
 pub trait Server: Send + Sync {
     type Claims: Send + Sync + 'static;
@@ -16,9 +28,13 @@ pub trait Server: Send + Sync {
 
     async fn events_accounts_events(&self, account_id: String) -> Result<EventsAccountsEventsResponse>;
     async fn pets_list(&self, first_query: String, second_query: String) -> Result<PetsListResponse>;
+    async fn items_list(&self) -> Result<ItemsListResponse>;
     async fn items_get_item(&self, id: String) -> Result<ItemsGetItemResponse>;
     async fn items_create_item(&mut self, body: Item) -> Result<ItemsCreateItemResponse>;
     async fn items_update_item(&mut self, id: String, body: Item) -> Result<ItemsUpdateItemResponse>;
+    async fn articles_get_article<C: EtagCache + Send + Sync>(
+        &self, cache: &C, id: String
+    ) -> Result<ArticlesGetArticleResponse>;
     async fn consuming_consume_and_delete(self, id: String) -> Result<ConsumingConsumeAndDeleteResponse>;
     async fn consuming_upload(&self, account_id: uuid::Uuid, body: Multipart) -> Result<ConsumingUploadResponse>;
 }
@@ -50,6 +66,20 @@ impl IntoResponse for PetsListResponse {
     }
 }
 
+#[allow(clippy::type_complexity)]
+pub enum ItemsListResponse {
+    Ok(Json<Vec<Item>>),
+}
+
+impl IntoResponse for ItemsListResponse {
+    fn into_response(self) -> axum::response::Response {
+        match self {
+
+            ItemsListResponse::Ok(body) => (StatusCode::OK, body).into_response(),
+        }
+    }
+}
+
 #[allow(clippy::type_complexity)]
 pub enum ItemsGetItemResponse {
     Ok(Json<Item>),
@@ -92,6 +122,22 @@ impl IntoResponse for ItemsUpdateItemResponse {
     }
 }
 
+#[allow(clippy::type_complexity)]
+pub enum ArticlesGetArticleResponse {
+    Ok(Json<Article>),
+    NotModified,
+}
+
+impl IntoResponse for ArticlesGetArticleResponse {
+    fn into_response(self) -> axum::response::Response {
+        match self {
+
+            ArticlesGetArticleResponse::Ok(body) => (StatusCode::OK, body).into_response(),
+            ArticlesGetArticleResponse::NotModified => StatusCode::NOT_MODIFIED.into_response(),
+        }
+    }
+}
+
 #[allow(clippy::type_complexity)]
 pub enum ConsumingConsumeAndDeleteResponse {
     Ok,
@@ -137,12 +183,6 @@ pub struct PetsListQuery {
     pub second_query: String
 }
 
-#[derive(Debug, Clone, serde::Deserialize)]
-pub struct ItemsGetItemQuery {
-    #[serde(rename = "id")]
-    pub id: String
-}
-
 #[derive(Debug, Clone, serde::Deserialize)]
 pub struct ItemsUpdateItemQuery {
     #[serde(rename = "id")]
@@ -195,15 +235,41 @@ where
     }
 }
 
+pub async fn items_list_handler<S>(
+    axum::extract::State(service): axum::extract::State<S>,
+
+) -> impl axum::response::IntoResponse
+where
+    S: Server+ Clone + Send + Sync + 'static,
+    S::Claims: Send + Sync + Clone + 'static,
+{
+    let result = service.items_list().await;
+    match result {
+        Ok(response) => {
+            let mut res = response.into_response();
+            res.headers_mut().insert(
+                axum::http::header::CACHE_CONTROL,
+                axum::http::HeaderValue::from_static("no-cache"),
+            );
+            res
+        }
+        Err(e) => (
+            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+            format!("Internal error: {e}"),
+        )
+            .into_response(),
+    }
+}
+
 pub async fn items_get_item_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
-    Query(params): Query<ItemsGetItemQuery>,
+    Path(id): Path<String>,
 ) -> impl axum::response::IntoResponse
 where
     S: Server+ Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
 {
-    let result = service.items_get_item(params.id).await;
+    let result = service.items_get_item(id).await;
     match result {
         Ok(response) => response.into_response(),
         Err(e) => (
@@ -253,6 +319,48 @@ where
     }
 }
 
+pub async fn articles_get_article_handler<S, C>(
+    axum::extract::State(service): axum::extract::State<S>,
+    axum::extract::State(cache): axum::extract::State<C>,
+    if_none_match: Option<axum_extra::TypedHeader<axum_extra::headers::IfNoneMatch>>,
+    Path(id): Path<String>,
+) -> impl axum::response::IntoResponse
+where
+    S: Server + Send + Sync + 'static,
+    C: EtagCache + Clone + Send + Sync + 'static,
+{
+    // Check If-None-Match against the cache
+    let cache_key = "article-list";
+    if let (Some(stored_etag), Some(axum_extra::TypedHeader(inm))) = (cache.get(cache_key.as_ref()), if_none_match) {
+        // If the client's ETag matches, respond 304 immediately
+        if stored_etag == format!("{:?}", inm).trim_matches('"') {
+            let mut res = axum::http::StatusCode::NOT_MODIFIED.into_response();
+            res.headers_mut().insert(axum::http::header::CACHE_CONTROL, axum::http::HeaderValue::from_static("public, max-age=3600"));
+            return res;
+        }
+    }
+    // Forward to business logic
+    let result = service.articles_get_article(&cache, id).await;
+    match result {
+        Ok(response) => {
+            let mut res = response.into_response();
+            if let Some(stored_etag) = cache.get(cache_key.as_ref()) {
+                res.headers_mut().insert(
+                    axum::http::header::ETAG,
+                    axum::http::HeaderValue::from_str(&stored_etag).unwrap(),
+                );
+            }
+            res.headers_mut().insert(axum::http::header::CACHE_CONTROL, axum::http::HeaderValue::from_static("public, max-age=3600"));
+            res
+        }
+        Err(e) => (
+            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+            format!("Internal error: {e}"),
+        )
+            .into_response(),
+    }
+}
+
 // NOTE: consuming_consume_and_delete takes self and cannot be used with the router pattern.
 // It consumes the service, so you need to implement your own handler pattern.
 pub async fn consuming_consume_and_delete_handler<S>(
@@ -294,19 +402,22 @@ where
     }
 }
 
-pub fn create_router<S, M>(service: S, middleware: M) -> Router
+pub fn create_router<S, C, M>(service: S, cache: C, middleware: M) -> Router
 where
     S: Server + Clone + Send + Sync + 'static,
     S::Claims: Send + Sync + Clone + 'static,
+    C: EtagCache + Clone + Send + Sync + 'static + axum::extract::FromRef<S>,
     M: FnOnce(Router<S>) -> Router<S> + Clone + Send + Sync + 'static,
 {
-    let mut router = Router::new();
+    let mut router = Router::new().with_state(cache);
     let public = Router::new()
         .route("/events/{accountId}", get(events_accounts_events_handler::<S>))
         .route("/pets", get(pets_list_handler::<S>))
-        .route("/items", get(items_get_item_handler::<S>))
+        .route("/items", get(items_list_handler::<S>))
+        .route("/items/{id}", get(items_get_item_handler::<S>))
         .route("/items", post(items_create_item_handler::<S>))
         .route("/items", put(items_update_item_handler::<S>))
+        .route("/articles", get(articles_get_article_handler::<S, C>))
         .route("/consuming", post(consuming_upload_handler::<S>))
         ;
     router = router.merge(public);

package/example/output-rust/src/generated/types.rs

@@ -16,6 +16,12 @@ pub struct Item {
   pub value: i32,
 }
 
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct Article {
+  pub id: String,
+  pub title: String,
+}
+
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 #[serde(untagged)]
 pub enum MyEvent {