typespec-rust-emitter 0.5.0 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespec-rust-emitter",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "TypeSpec emitter that generates idiomatic Rust types and structs",
   "keywords": [
     "typespec",

package/src/emitter.ts

@@ -65,12 +65,14 @@ export function $rustDerive(
         : "";
 
   if (!ns.startsWith("TypeSpec")) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const info = (target as any)[rustDeriveKey] as RustDeriveInfo | undefined;
     if (info) {
       if (!info.derives.includes(derive)) {
         info.derives.push(derive);
       }
     } else {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (target as any)[rustDeriveKey] = { derives: [derive] };
     }
   }
@@ -111,12 +113,14 @@ export function $rustAttr(
         : "";
 
   if (!ns.startsWith("TypeSpec")) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const info = (target as any)[rustAttrKey] as RustAttrInfo | undefined;
     if (info) {
       if (!info.attrs.includes(attr)) {
         info.attrs.push(attr);
       }
     } else {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (target as any)[rustAttrKey] = { attrs: [attr] };
     }
   }
@@ -160,7 +164,9 @@ interface ResponseInfo {
   bodyDescription: string | undefined;
 }
 
-function getDecoratorName(decorator: any): string {
+function getDecoratorName(decorator: {
+  node?: { target?: { sv?: string; kind?: string } };
+}): string {
   if (!decorator) return "";
   if (typeof decorator !== "object") return "";
 
@@ -177,7 +183,13 @@ function getDecoratorName(decorator: any): string {
   return "";
 }
 
-function getDecoratorArgValue(decorator: any, index: number = 0): string {
+function getDecoratorArgValue(
+  decorator: {
+    args?: { jsValue?: unknown; value?: unknown }[];
+    arguments?: { jsValue?: unknown; value?: unknown }[];
+  },
+  index: number = 0,
+): string {
   if (!decorator) return "";
   const args = decorator.args || decorator.arguments;
   if (!args) return "";
@@ -191,6 +203,7 @@ function getHttpMethod(
   _program: Program,
   operation: Operation,
 ): HttpMethod | undefined {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const decorators = (operation as any).decorators;
   if (!decorators) return undefined;
 
@@ -208,6 +221,7 @@ function getHttpMethod(
 }
 
 function getRoute(_program: Program, target: Namespace | Operation): string {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const decorators = (target as any).decorators;
   if (!decorators) return "";
 
@@ -221,7 +235,23 @@ function getRoute(_program: Program, target: Namespace | Operation): string {
   return "";
 }
 
+function getFullRoute(program: Program, ns: Namespace): string {
+  const routes: string[] = [];
+  let current: Namespace | undefined = ns;
+
+  while (current) {
+    const route = getRoute(program, current);
+    if (route) {
+      routes.unshift(route);
+    }
+    current = current.namespace;
+  }
+
+  return routes.join("");
+}
+
 function hasAuthDecorator(operation: Operation): boolean {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const decorators = (operation as any).decorators;
   if (!decorators) return false;
 
@@ -244,6 +274,7 @@ function getOperationParameters(
   const model = operation.parameters;
 
   for (const [propName, prop] of model.properties) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const decorators = (prop as any).decorators;
 
     // Skip body parameters - they are handled separately
@@ -308,6 +339,7 @@ function getOperationParameters(
 
 function getOperationBody(operation: Operation): ModelProperty | undefined {
   for (const [_propName, prop] of operation.parameters.properties) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const decorators = (prop as any).decorators;
     if (!decorators) continue;
 
@@ -367,6 +399,7 @@ function getStatusCode(variant: { type: Type }): number {
     const model = variant.type as Model;
     for (const [propName, prop] of model.properties) {
       if (propName === "statusCode") {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const typeAny = prop.type as any;
         if (typeAny.value !== undefined) {
           return typeAny.value as number;
@@ -385,7 +418,20 @@ function getBodyFromResponse(
   if (variant.type.kind === "Model") {
     const model = variant.type as Model;
     for (const [propName, prop] of model.properties) {
-      if (propName === "body") {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const decorators = (prop as any).decorators;
+      let isBody = false;
+      if (decorators) {
+        for (const key of Object.keys(decorators)) {
+          const decorator = decorators[key];
+          const name = getDecoratorName(decorator);
+          if (name === "body" || name === "bodyRoot") {
+            isBody = true;
+            break;
+          }
+        }
+      }
+      if (isBody) {
         const { type: rustType } = getRustTypeForProperty(
           prop.type,
           program,
@@ -408,9 +454,10 @@ function getAllOperations(
     namespace(ns: Namespace) {
       const route = getRoute(program, ns);
       if (!route) return;
-      if (!seenNamespaces.has(ns.name)) {
-        seenNamespaces.add(ns.name);
-        namespaceOps.set(ns.name, { ns, ops: [] });
+      const fullName = getNamespaceFullName(ns);
+      if (!seenNamespaces.has(fullName)) {
+        seenNamespaces.add(fullName);
+        namespaceOps.set(fullName, { ns, ops: [] });
       }
     },
     operation(op: Operation) {
@@ -418,11 +465,12 @@ function getAllOperations(
       if (!method) return;
       const ns = op.namespace;
       if (!ns) return;
-      if (!seenNamespaces.has(ns.name)) {
-        seenNamespaces.add(ns.name);
-        namespaceOps.set(ns.name, { ns, ops: [] });
+      const fullName = getNamespaceFullName(ns);
+      if (!seenNamespaces.has(fullName)) {
+        seenNamespaces.add(fullName);
+        namespaceOps.set(fullName, { ns, ops: [] });
       }
-      const entry = namespaceOps.get(ns.name);
+      const entry = namespaceOps.get(fullName);
       if (entry) {
         entry.ops.push(op);
       }
@@ -670,7 +718,7 @@ function generateRouter(
   const usedMethods = new Set<string>();
 
   for (const group of namespaceGroups) {
-    const nsRoute = getRoute(program, group.namespace);
+    const nsRoute = getFullRoute(program, group.namespace);
     if (!nsRoute) continue;
 
     const nsName = toPascalCase(
@@ -739,7 +787,7 @@ function generateRouter(
       const serverCall = `service.${traitFnName}(${serverArgsStr}).await`;
 
       // All handlers use <S> generics, Claims is now an associated type
-      let handlerCode = `pub async fn ${handlerFnName}_handler<S>(
+      const handlerCode = `pub async fn ${handlerFnName}_handler<S>(
     axum::extract::State(service): axum::extract::State<S>,
 ${extractorLines.join("\n")}
 ) -> impl axum::response::IntoResponse
@@ -760,7 +808,7 @@ where
 
       handlers.push(handlerCode);
 
-      let routePath = `"${opInfo.path}"`;
+      const routePath = `"${opInfo.path}"`;
       let routeStmt = "";
       if (isProtected) {
         routeStmt = `.route(${routePath}, ${method}(${handlerFnName}_handler::<S>))`;
@@ -796,14 +844,6 @@ ${routerBody}
   return parts.join("\n");
 }
 
-function hasOnlyPathParams(
-  hasPath: boolean,
-  hasQuery: boolean,
-  hasBody: boolean,
-): boolean {
-  return hasPath && !hasQuery && !hasBody;
-}
-
 function buildRouterBody(
   publicRoutes: string[],
   protectedRoutes: string[],
@@ -1144,6 +1184,7 @@ function emitModel(
     "serde::Deserialize",
   ];
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const customDerives = (model as any)[rustDeriveKey] as
     | RustDeriveInfo
     | undefined;
@@ -1161,6 +1202,7 @@ function emitModel(
     parts.push('#[error("{code}: {message}")]');
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const customAttrs = (model as any)[rustAttrKey] as RustAttrInfo | undefined;
   if (customAttrs) {
     for (const attr of customAttrs.attrs) {
@@ -1245,6 +1287,7 @@ function emitEnum(enumType: Enum): string {
     "serde::Deserialize",
   ];
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const customDerives = (enumType as any)[rustDeriveKey] as
     | RustDeriveInfo
     | undefined;
@@ -1253,6 +1296,7 @@ function emitEnum(enumType: Enum): string {
     allDerives.push(...customDerives.derives);
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const customAttrs = (enumType as any)[rustAttrKey] as
     | RustAttrInfo
     | undefined;
@@ -1477,7 +1521,7 @@ export async function $onEmit(
 
   const namespaceGroups = getAllOperations(context.program);
 
-  const outputContent = content.join("\n");
+  const outputContent = "#![allow(unused)]\n\n" + content.join("\n") + "\n";
 
   await emitFile(context.program, {
     path: resolvePath(context.emitterOutputDir, "types.rs"),
@@ -1501,7 +1545,10 @@ export async function $onEmit(
       anonymousEnums,
     );
 
-    const serverContent = [serverTrait, responseEnums, router].join("\n");
+    const serverContent =
+      "#![allow(unused)]\n\n" +
+      [serverTrait, responseEnums, router].join("\n") +
+      "\n";
 
     await emitFile(context.program, {
       path: resolvePath(context.emitterOutputDir, "server.rs"),