@azure-tools/typespec-ts 0.20.0 → 0.21.0

package/src/transform/transformApiVersionInfo.ts

@@ -57,9 +57,38 @@ function getOperationApiVersion(
   program: Program,
   dpgContext: SdkContext
 ): ApiVersionInfo | undefined {
-  const operationGroups = listOperationGroups(dpgContext, client);
   const apiVersionTypes = new Set<string>();
   const locations = new Set<ApiVersionPosition>();
+  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+  for (const clientOp of clientOperations) {
+    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    // ignore overload base operation
+    if (route.overloads && route.overloads?.length > 0) {
+      continue;
+    }
+    const params = route.parameters.parameters.filter(
+      (p) =>
+        (p.type === "query" || p.type === "path") && isApiVersion(dpgContext, p)
+    );
+    params.map((p) => {
+      const type = getSchemaForType(
+        dpgContext,
+        p.param.type,
+        [SchemaContext.Exception, SchemaContext.Input],
+        false,
+        p.param
+      );
+      if (p.type !== "header") {
+        locations.add(p.type);
+      }
+      const typeString = JSON.stringify(trimUsage(type));
+      apiVersionTypes.add(typeString);
+    });
+    if (apiVersionTypes.size > 1) {
+      break;
+    }
+  }
+  const operationGroups = listOperationGroups(dpgContext, client, true);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
       dpgContext,
@@ -96,35 +125,6 @@ function getOperationApiVersion(
       }
     }
   }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    // ignore overload base operation
-    if (route.overloads && route.overloads?.length > 0) {
-      continue;
-    }
-    const params = route.parameters.parameters.filter(
-      (p) =>
-        (p.type === "query" || p.type === "path") && isApiVersion(dpgContext, p)
-    );
-    params.map((p) => {
-      const type = getSchemaForType(
-        dpgContext,
-        p.param.type,
-        [SchemaContext.Exception, SchemaContext.Input],
-        false,
-        p.param
-      );
-      if (p.type !== "header") {
-        locations.add(p.type);
-      }
-      const typeString = JSON.stringify(trimUsage(type));
-      apiVersionTypes.add(typeString);
-    });
-    if (apiVersionTypes.size > 1) {
-      break;
-    }
-  }
   // If no api-version parameter defined return directly
   if (apiVersionTypes.size === 0) {
     return;

package/src/transform/transformHelperFunctionDetails.ts

@@ -50,7 +50,21 @@ export function transformHelperFunctionDetails(
   }
   // TODO: Remove this when @pageable is finally removed.
   const nextLinks = new Set<string>();
-  const operationGroups = listOperationGroups(dpgContext, client);
+  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+  for (const clientOp of clientOperations) {
+    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    // ignore overload base operation
+    if (route.overloads && route.overloads?.length > 0) {
+      continue;
+    }
+    if (getPageable(program, route.operation)) {
+      const nextLinkName = getPageable(program, route.operation) || "nextLink";
+      if (nextLinkName) {
+        nextLinks.add(nextLinkName);
+      }
+    }
+  }
+  const operationGroups = listOperationGroups(dpgContext, client, true);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
       dpgContext,
@@ -71,20 +85,6 @@ export function transformHelperFunctionDetails(
       }
     }
   }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    // ignore overload base operation
-    if (route.overloads && route.overloads?.length > 0) {
-      continue;
-    }
-    if (getPageable(program, route.operation)) {
-      const nextLinkName = getPageable(program, route.operation) || "nextLink";
-      if (nextLinkName) {
-        nextLinks.add(nextLinkName);
-      }
-    }
-  }
   if (nextLinks.size === 0) {
     return {
       ...annotationDetails,
@@ -123,7 +123,16 @@ function extractPageDetailFromCore(
   // Add default values
   nextLinks.add("nextLink");
   itemNames.add("value");
-  const operationGroups = listOperationGroups(dpgContext, client);
+  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+  for (const clientOp of clientOperations) {
+    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    // ignore overload base operation
+    if (route.overloads && route.overloads?.length > 0) {
+      continue;
+    }
+    extractPageDetailFromCoreForRoute(route);
+  }
+  const operationGroups = listOperationGroups(dpgContext, client, true);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
       dpgContext,
@@ -138,15 +147,6 @@ function extractPageDetailFromCore(
       extractPageDetailFromCoreForRoute(route);
     }
   }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    // ignore overload base operation
-    if (route.overloads && route.overloads?.length > 0) {
-      continue;
-    }
-    extractPageDetailFromCoreForRoute(route);
-  }
 
   function extractPageDetailFromCoreForRoute(route: HttpOperation) {
     for (const response of route.responses) {
@@ -188,7 +188,32 @@ function extractSpecialSerializeInfo(
   let hasTsvCollection = false;
   let hasSsvCollection = false;
   let hasCsvCollection = false;
-  const operationGroups = listOperationGroups(dpgContext, client);
+  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+  for (const clientOp of clientOperations) {
+    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    route.parameters.parameters.forEach((parameter) => {
+      const serializeInfo = getSpecialSerializeInfo(
+        parameter.type,
+        (parameter as any).format
+      );
+      hasMultiCollection = hasMultiCollection
+        ? hasMultiCollection
+        : serializeInfo.hasMultiCollection;
+      hasPipeCollection = hasPipeCollection
+        ? hasPipeCollection
+        : serializeInfo.hasPipeCollection;
+      hasTsvCollection = hasTsvCollection
+        ? hasTsvCollection
+        : serializeInfo.hasTsvCollection;
+      hasSsvCollection = hasSsvCollection
+        ? hasSsvCollection
+        : serializeInfo.hasSsvCollection;
+      hasCsvCollection = hasCsvCollection
+        ? hasCsvCollection
+        : serializeInfo.hasCsvCollection;
+    });
+  }
+  const operationGroups = listOperationGroups(dpgContext, client, true);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
       dpgContext,
@@ -219,31 +244,6 @@ function extractSpecialSerializeInfo(
       });
     }
   }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    route.parameters.parameters.forEach((parameter) => {
-      const serializeInfo = getSpecialSerializeInfo(
-        parameter.type,
-        (parameter as any).format
-      );
-      hasMultiCollection = hasMultiCollection
-        ? hasMultiCollection
-        : serializeInfo.hasMultiCollection;
-      hasPipeCollection = hasPipeCollection
-        ? hasPipeCollection
-        : serializeInfo.hasPipeCollection;
-      hasTsvCollection = hasTsvCollection
-        ? hasTsvCollection
-        : serializeInfo.hasTsvCollection;
-      hasSsvCollection = hasSsvCollection
-        ? hasSsvCollection
-        : serializeInfo.hasSsvCollection;
-      hasCsvCollection = hasCsvCollection
-        ? hasCsvCollection
-        : serializeInfo.hasCsvCollection;
-    });
-  }
   return {
     hasMultiCollection,
     hasPipeCollection,

package/src/transform/transformParameters.ts

@@ -48,9 +48,18 @@ export function transformToParameterTypes(
   dpgContext: SdkContext
 ): OperationParameter[] {
   const program = dpgContext.program;
-  const operationGroups = listOperationGroups(dpgContext, client);
   const rlcParameters: OperationParameter[] = [];
   const outputImportedSet = new Set<string>();
+  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+  for (const clientOp of clientOperations) {
+    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    // ignore overload base operation
+    if (route.overloads && route.overloads?.length > 0) {
+      continue;
+    }
+    transformToParameterTypesForRoute(program, route);
+  }
+  const operationGroups = listOperationGroups(dpgContext, client, true);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
       dpgContext,
@@ -65,15 +74,7 @@ export function transformToParameterTypes(
       transformToParameterTypesForRoute(program, route);
     }
   }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    // ignore overload base operation
-    if (route.overloads && route.overloads?.length > 0) {
-      continue;
-    }
-    transformToParameterTypesForRoute(program, route);
-  }
+
   if (outputImportedSet.size > 0) {
     importDetails.parameter.importsSet = outputImportedSet;
   }

package/src/transform/transformPaths.ts

@@ -38,8 +38,17 @@ export function transformPaths(
   client: SdkClient,
   dpgContext: SdkContext
 ): Paths {
-  const operationGroups = listOperationGroups(dpgContext, client);
   const paths: Paths = {};
+  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+  for (const clientOp of clientOperations) {
+    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    // ignore overload base operation
+    if (route.overloads && route.overloads?.length > 0) {
+      continue;
+    }
+    transformOperation(dpgContext, route, paths);
+  }
+  const operationGroups = listOperationGroups(dpgContext, client, true);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
       dpgContext,
@@ -54,15 +63,7 @@ export function transformPaths(
       transformOperation(dpgContext, route, paths);
     }
   }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    // ignore overload base operation
-    if (route.overloads && route.overloads?.length > 0) {
-      continue;
-    }
-    transformOperation(dpgContext, route, paths);
-  }
+
   return paths;
 }
 

package/src/transform/transformResponses.ts

@@ -43,9 +43,18 @@ export function transformToResponseTypes(
   dpgContext: SdkContext
 ): OperationResponse[] {
   const program = dpgContext.program;
-  const operationGroups = listOperationGroups(dpgContext, client);
   const rlcResponses: OperationResponse[] = [];
   const inputImportedSet = new Set<string>();
+  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+  for (const clientOp of clientOperations) {
+    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    // ignore overload base operation
+    if (route.overloads && route.overloads?.length > 0) {
+      continue;
+    }
+    transformToResponseTypesForRoute(route);
+  }
+  const operationGroups = listOperationGroups(dpgContext, client, true);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
       dpgContext,
@@ -60,15 +69,6 @@ export function transformToResponseTypes(
       transformToResponseTypesForRoute(route);
     }
   }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    // ignore overload base operation
-    if (route.overloads && route.overloads?.length > 0) {
-      continue;
-    }
-    transformToResponseTypesForRoute(route);
-  }
   if (inputImportedSet.size > 0) {
     importDetails.response.importsSet = inputImportedSet;
   }

package/src/transform/transformSchemas.ts

@@ -28,8 +28,17 @@ export function transformSchemas(
     SchemaContext[]
   >();
   const schemaMap: Map<any, any> = new Map<any, any>();
-  const operationGroups = listOperationGroups(dpgContext, client);
   const modelKey = Symbol("typescript-models-" + client.name);
+  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+  for (const clientOp of clientOperations) {
+    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    // ignore overload base operation
+    if (route.overloads && route.overloads?.length > 0) {
+      continue;
+    }
+    transformSchemaForRoute(route);
+  }
+  const operationGroups = listOperationGroups(dpgContext, client, true);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
       dpgContext,
@@ -44,15 +53,6 @@ export function transformSchemas(
       transformSchemaForRoute(route);
     }
   }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    // ignore overload base operation
-    if (route.overloads && route.overloads?.length > 0) {
-      continue;
-    }
-    transformSchemaForRoute(route);
-  }
   function transformSchemaForRoute(route: HttpOperation) {
     if (route.parameters) {
       for (const param of route.parameters.parameters) {

package/src/transform/transformTelemetryInfo.ts

@@ -30,7 +30,16 @@ function getCustomRequestHeaderNameForClient(
   client: SdkClient
 ) {
   const program = dpgContext.program;
-  const operationGroups = listOperationGroups(dpgContext, client);
+  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+  for (const clientOp of clientOperations) {
+    const headerName = getCustomRequestHeaderNameForOperation(
+      ignoreDiagnostics(getHttpOperation(program, clientOp))
+    );
+    if (headerName !== undefined) {
+      return headerName;
+    }
+  }
+  const operationGroups = listOperationGroups(dpgContext, client, true);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
       dpgContext,
@@ -45,14 +54,5 @@ function getCustomRequestHeaderNameForClient(
       }
     }
   }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const headerName = getCustomRequestHeaderNameForOperation(
-      ignoreDiagnostics(getHttpOperation(program, clientOp))
-    );
-    if (headerName !== undefined) {
-      return headerName;
-    }
-  }
   return undefined;
 }

package/src/transform/transfromRLCOptions.ts

@@ -180,7 +180,17 @@ function detectIfNameConflicts(dpgContext: SdkContext) {
   for (const client of clients) {
     // only consider it's conflict when there are conflicts in the same client
     const nameSet = new Set<string>();
-    const operationGroups = listOperationGroups(dpgContext, client);
+    const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+    for (const clientOp of clientOperations) {
+      const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+      const name = getOperationName(program, route.operation);
+      if (nameSet.has(name)) {
+        return true;
+      } else {
+        nameSet.add(name);
+      }
+    }
+    const operationGroups = listOperationGroups(dpgContext, client, true);
     for (const operationGroup of operationGroups) {
       const operations = listOperationsInOperationGroup(
         dpgContext,
@@ -196,16 +206,6 @@ function detectIfNameConflicts(dpgContext: SdkContext) {
         }
       }
     }
-    const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-    for (const clientOp of clientOperations) {
-      const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-      const name = getOperationName(program, route.operation);
-      if (nameSet.has(name)) {
-        return true;
-      } else {
-        nameSet.add(name);
-      }
-    }
   }
 
   // No conflicts if we didn't detect any

package/src/utils/namespaceUtils.ts

@@ -5,7 +5,7 @@ import {
   isService,
   Operation
 } from "@typespec/compiler";
-import { SdkContext } from "../utils/interfaces.js";
+import { SdkContext } from "./interfaces.js";
 
 export function getModelNamespaceName(
   dpgContext: SdkContext,
@@ -40,7 +40,11 @@ export function getOperationNamespaceInterfaceName(
       result.push(operation.interface.name);
       return result;
     }
-    if (operation.interface.namespace) {
+    if (
+      operation.interface.namespace &&
+      !isGlobalNamespace(dpgContext.program, operation.interface.namespace) &&
+      !isService(dpgContext.program, operation.interface.namespace)
+    ) {
       result.push(
         ...getModelNamespaceName(dpgContext, operation.interface.namespace)
       );

package/src/utils/operationUtil.ts

@@ -292,8 +292,8 @@ export function extractOperationLroDetail(
     const metadata = getLroMetadata(program, operation.operation);
     precedence =
       metadata?.finalStep &&
-      metadata?.finalStep.target &&
       metadata.finalStep.kind === "pollingSuccessProperty" &&
+      metadata?.finalStep.target &&
       metadata?.finalStep?.target?.name === "result"
         ? OPERATION_LRO_HIGH_PRIORITY
         : OPERATION_LRO_LOW_PRIORITY;
@@ -312,7 +312,18 @@ export function hasPollingOperations(
   client: SdkClient,
   dpgContext: SdkContext
 ) {
-  const operationGroups = listOperationGroups(dpgContext, client);
+  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+  for (const clientOp of clientOperations) {
+    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    // ignore overload base operation
+    if (route.overloads && route.overloads?.length > 0) {
+      continue;
+    }
+    if (isLongRunningOperation(program, route)) {
+      return true;
+    }
+  }
+  const operationGroups = listOperationGroups(dpgContext, client, true);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
       dpgContext,
@@ -329,18 +340,6 @@ export function hasPollingOperations(
       }
     }
   }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    // ignore overload base operation
-    if (route.overloads && route.overloads?.length > 0) {
-      continue;
-    }
-    if (isLongRunningOperation(program, route)) {
-      return true;
-    }
-  }
-
   return false;
 }
 
@@ -359,7 +358,18 @@ export function hasPagingOperations(
   client: SdkClient,
   dpgContext: SdkContext
 ) {
-  const operationGroups = listOperationGroups(dpgContext, client);
+  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
+  for (const clientOp of clientOperations) {
+    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    // ignore overload base operation
+    if (route.overloads && route.overloads?.length > 0) {
+      continue;
+    }
+    if (isPagingOperation(program, route)) {
+      return true;
+    }
+  }
+  const operationGroups = listOperationGroups(dpgContext, client, true);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
       dpgContext,
@@ -376,17 +386,6 @@ export function hasPagingOperations(
       }
     }
   }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    // ignore overload base operation
-    if (route.overloads && route.overloads?.length > 0) {
-      continue;
-    }
-    if (isPagingOperation(program, route)) {
-      return true;
-    }
-  }
   return false;
 }