Properly exclude operation templates when scanning for routes

microsoft · Jun 8, 2022 · a1388d5 · a1388d5
1 parent 18178c9
commit a1388d5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/common/changes/@cadl-lang/rest/fix-template-operation-exclusion_2022-06-08-12-11.json b/common/changes/@cadl-lang/rest/fix-template-operation-exclusion_2022-06-08-12-11.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@cadl-lang/rest",
+      "comment": "Properly exclude operation templates when scanning for routes",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@cadl-lang/rest"
+}
diff --git a/packages/rest/src/route.ts b/packages/rest/src/route.ts
@@ -419,7 +419,7 @@ function buildRoutes(
     }
 
     // Skip templated operations
-    if (op.templateArguments && op.templateArguments.length > 0) {
+    if (isUninstantiatedTemplateOperation(op)) {
       continue;
     }
 
@@ -482,6 +482,11 @@ function isUninstantiatedTemplateInterface(maybeInterface: Type): boolean {
   );
 }
 
+function isUninstantiatedTemplateOperation(maybeOperation: Type): boolean {
+  // Any operation statement with template parameters is inherently uninstantiated
+  return maybeOperation.kind === "Operation" && maybeOperation.node.templateParameters.length > 0;
+}
+
 export function getAllRoutes(
   program: Program,
   options?: RouteOptions