@azure-tools/typespec-ts 0.57.0-dev.4 → 0.57.0-dev.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.57.0-dev.4",
+  "version": "0.57.0-dev.6",
   "description": "A TypeSpec emitter for TypeScript",
   "main": "dist/src/index.js",
   "type": "module",
@@ -39,17 +39,17 @@
     "@microsoft/api-extractor": "^7.58.1",
     "@types/pluralize": "^0.0.33",
     "yaml": "^2.8.3",
-    "@azure-tools/spector-runner": "^0.1.0",
     "@typespec/http-specs": "^0.1.0-alpha.41",
+    "@azure-tools/spector-runner": "^0.1.0",
     "@typespec/spector": "^0.1.0-alpha.28",
-    "@typespec/tspd": "^0.77.0",
-    "@typespec/compiler": "^1.15.0",
     "@typespec/spec-api": "^0.1.0-alpha.16",
+    "@typespec/compiler": "^1.15.0",
+    "@typespec/tspd": "^0.77.0",
     "@typespec/http": "^1.15.0",
     "@typespec/openapi": "^1.15.0",
-    "@typespec/rest": "^0.85.0",
+    "@typespec/versioning": "^0.85.0",
     "@typespec/xml": "^0.85.0",
-    "@typespec/versioning": "^0.85.0"
+    "@typespec/rest": "^0.85.0"
   },
   "peerDependencies": {
     "@azure-tools/typespec-azure-core": "^0.71.0 || >= 0.72.0-dev.0",

package/src/modular/build-classical-client.ts

@@ -19,7 +19,7 @@ import { useContext } from "../context-manager.js";
 import { useDependencies } from "../framework/hooks/use-dependencies.js";
 import { resolveReference } from "../framework/reference.js";
 import { refkey } from "../framework/refkey.js";
-import { getClientModuleInfo, isMultiEndpointClient } from "../utils/client-utils.js";
+import { getClientModuleInfo } from "../utils/client-utils.js";
 import type { SdkContext } from "../utils/interfaces.js";
 import { NameType, normalizeName } from "../utils/name-utils.js";
 import { getMethodHierarchiesMap, isTenantLevelOperation } from "../utils/operation-util.js";
@@ -68,19 +68,11 @@ export function buildClassicalClient(
   });
 
   // Add the private client member. This will be the client context from /api
-  if (isMultiEndpointClient(dpgContext)) {
-    clientClass.addProperty({
-      name: "_client",
-      type: `Client.${clientName}`,
-      scope: Scope.Private,
-    });
-  } else {
-    clientClass.addProperty({
-      name: "_client",
-      type: `${clientName}`,
-      scope: Scope.Private,
-    });
-  }
+  clientClass.addProperty({
+    name: "_client",
+    type: `${clientName}`,
+    scope: Scope.Private,
+  });
   // Add the pipeline member. This will be the pipeline from /api
   clientClass.addProperty({
     name: "pipeline",
@@ -190,11 +182,10 @@ function importAllApis(clientFile: SourceFile, srcPath: string, subfolder: strin
 
 function generateMethod(
   context: SdkContext,
-  clientType: string,
   method: [string[], SdkServiceMethod<SdkServiceOperation>],
 ): MethodDeclarationStructure[] {
   const res: MethodDeclarationStructure[] = [];
-  const declaration = getOperationFunction(context, method, clientType);
+  const declaration = getOperationFunction(context, method, "Client");
   const methodName = declaration.propertyName ?? declaration.name ?? "FIXME";
   const methodParams = declaration.parameters?.filter((p) => p.name !== "context") ?? [];
   const declarationRefKey = resolveReference(refkey(method[1], "api"));
@@ -268,19 +259,14 @@ function buildClientOperationGroups(
   dpgContext: SdkContext,
   clientClass: ClassDeclaration,
 ) {
-  let clientType = "Client";
   const [_hierarchy, client] = clientMap;
-  const { subfolder } = getClientModuleInfo(clientMap);
-  if (subfolder && subfolder !== "") {
-    clientType = `Client.${clientClass.getName()}`;
-  }
   const methodMap = getMethodHierarchiesMap(dpgContext, client);
   for (const [prefixKey, operations] of methodMap) {
     const prefixes = prefixKey.split("/");
     const layer = 0;
     if (prefixKey === "") {
       operations.forEach((op) => {
-        const methods = generateMethod(dpgContext, clientType, [prefixes, op]);
+        const methods = generateMethod(dpgContext, [prefixes, op]);
         clientClass.addMethods(methods);
       });
     } else {
@@ -296,7 +282,7 @@ function buildClientOperationGroups(
       if (!existProperty || existProperty.length === 0) {
         clientClass.addProperty({
           name: groupName,
-          type: resolveReference(refkey(propertyType, layer, "classicOperations")),
+          type: resolveReference(refkey(client, propertyType, layer, "classicOperations")),
           scope: Scope.Public,
           isReadonly: true,
           docs: ["The operation groups for " + groupName],
@@ -304,7 +290,7 @@ function buildClientOperationGroups(
         clientClass
           .getConstructors()[0]
           ?.addStatements(
-            `this.${groupName} = ${resolveReference(refkey(operationName, layer, "getClassicOperations"))}(this._client)`,
+            `this.${groupName} = ${resolveReference(refkey(client, operationName, layer, "getClassicOperations"))}(this._client)`,
           );
       }
     }

package/src/modular/build-operations.ts

@@ -22,7 +22,7 @@ import { addDeclaration } from "../framework/declaration.js";
 import { useDependencies } from "../framework/hooks/use-dependencies.js";
 import { resolveReference } from "../framework/reference.js";
 import { refkey } from "../framework/refkey.js";
-import { getClientModuleInfo, isMultiEndpointClient } from "../utils/client-utils.js";
+import { getClientModuleInfo } from "../utils/client-utils.js";
 import type { SdkContext } from "../utils/interfaces.js";
 import { NameType, normalizeName } from "../utils/name-utils.js";
 import {
@@ -49,8 +49,7 @@ export function buildOperationFiles(
   const [_, client] = clientMap;
   const operationFiles: Set<SourceFile> = new Set();
   const { subfolder, clientName } = getClientModuleInfo(clientMap);
-  const isMultiEndpoint = isMultiEndpointClient(dpgContext);
-  const clientType = isMultiEndpoint ? `Client.${clientName}` : "Client";
+  const clientType = "Client";
   const methodMap = getMethodHierarchiesMap(dpgContext, client);
   for (const [prefixKey, operations] of methodMap) {
     const prefixes = prefixKey.split("/");

package/src/modular/emit-models.ts

@@ -314,6 +314,35 @@ export function getModelsPath(sourceRoot: string, modelNamespace: string[] = [])
   );
 }
 
+/** Finds the namespace prefix shared by every service in the package. */
+function getCommonServiceNamespace(context: SdkContext): string[] {
+  if (context.commonServiceNamespace) {
+    return context.commonServiceNamespace;
+  }
+
+  const serviceNamespaces = context.allServiceNamespaces ?? listAllServiceNamespaces(context);
+  if (serviceNamespaces.length === 0) {
+    context.commonServiceNamespace = [];
+    return context.commonServiceNamespace;
+  }
+
+  // Start with the first namespace and shorten it at the first segment that
+  // differs in each subsequent service namespace.
+  const commonNamespace = getNamespaceFullName(serviceNamespaces[0]!).split(".");
+  for (const serviceNamespace of serviceNamespaces.slice(1)) {
+    const segments = getNamespaceFullName(serviceNamespace).split(".");
+    const commonLength = commonNamespace.findIndex((segment, index) => segment !== segments[index]);
+    if (commonLength !== -1) {
+      commonNamespace.length = commonLength;
+    }
+    if (commonNamespace.length === 0) {
+      break;
+    }
+  }
+  context.commonServiceNamespace = commonNamespace;
+  return context.commonServiceNamespace;
+}
+
 export function getModelNamespaces(context: SdkContext, model: SdkType): string[] {
   if (model.kind === "model" || model.kind === "enum" || model.kind === "union") {
     if (
@@ -325,22 +354,11 @@ export function getModelNamespaces(context: SdkContext, model: SdkType): string[
       return [];
     }
     const segments = model.namespace.split(".");
-    // Keep full namespace segments if multiple services are present because there isn't a root namespace to trim
-    if (context.emitterOptions?.isMultiService) {
-      return segments;
-    }
-
-    const allServiceNamespaces = context.allServiceNamespaces ?? listAllServiceNamespaces(context);
-    const deepestNamespace = getNamespaceFullName(allServiceNamespaces[0]!);
-    const rootNamespace = deepestNamespace.split(".") ?? [];
-    if (segments.length > rootNamespace.length) {
-      while (segments[0] === rootNamespace[0]) {
-        segments.shift();
-        rootNamespace.shift();
-      }
-      return segments;
-    }
-    return [];
+    const commonNamespace = getCommonServiceNamespace(context);
+    const modelUsesCommonNamespace = commonNamespace.every(
+      (segment, index) => segment === segments[index],
+    );
+    return modelUsesCommonNamespace ? segments.slice(commonNamespace.length) : segments;
   } else if (model.kind === "array" || model.kind === "dict") {
     return getModelNamespaces(context, model.valueType);
   } else if (model.kind === "nullable") {

package/src/modular/helpers/classical-operation-helpers.ts

@@ -58,6 +58,7 @@ export function getClassicalOperation(
 ) {
   const prefixes = operationGroup[0];
   const operations = operationGroup[1];
+  const client = clientMap[1];
   const { clientName } = getClientModuleInfo(clientMap);
   const hasClientContextImport = classicFile.getImportDeclarations().filter((i) => {
     return (
@@ -119,7 +120,9 @@ export function getClassicalOperation(
       properties.push({
         kind: StructureKind.PropertySignature,
         name,
-        type: resolveReference(refkey(nextLayerInterfaceName, layer + 1, "classicOperations")),
+        type: resolveReference(
+          refkey(client, nextLayerInterfaceName, layer + 1, "classicOperations"),
+        ),
       });
     }
   } else {
@@ -197,7 +200,7 @@ export function getClassicalOperation(
     addDeclaration(
       classicFile,
       interfaceDeclaration,
-      refkey(interfaceName, layer, "classicOperations"),
+      refkey(client, interfaceName, layer, "classicOperations"),
     );
   }
 
@@ -286,7 +289,7 @@ export function getClassicalOperation(
     addDeclaration(
       classicFile,
       functionDeclaration,
-      refkey(functionName, layer, "getClassicOperation"),
+      refkey(client, functionName, layer, "getClassicOperation"),
     );
   }
 
@@ -319,11 +322,11 @@ export function getClassicalOperation(
           ${normalizeName(
             prefixes[layer + 1] ?? "FIXME",
             NameType.Property,
-          )}: ${resolveReference(refkey(nextLayerOperationFunctionName, layer + 1, "getClassicOperations"))}(context)}`;
+          )}: ${resolveReference(refkey(client, nextLayerOperationFunctionName, layer + 1, "getClassicOperations"))}(context)}`;
         }
       } else {
         statement = `,
-      ...${resolveReference(refkey(nextLayerOperationFunctionName, layer + 1, "getClassicOperations"))}(context)}`;
+      ...${resolveReference(refkey(client, nextLayerOperationFunctionName, layer + 1, "getClassicOperations"))}(context)}`;
       }
 
       if (statement) {
@@ -342,23 +345,23 @@ export function getClassicalOperation(
           type: clientName,
         },
       ],
-      returnType: resolveReference(refkey(interfaceName, layer, "classicOperations")),
+      returnType: resolveReference(refkey(client, interfaceName, layer, "classicOperations")),
       statements:
         layer !== prefixes.length - 1
           ? `return {
             ${normalizeName(
               prefixes[layer + 1] ?? "FIXME",
               NameType.Property,
-            )}: ${resolveReference(refkey(nextLayerOperationFunctionName, layer + 1, "getClassicOperations"))}(context)   
+            )}: ${resolveReference(refkey(client, nextLayerOperationFunctionName, layer + 1, "getClassicOperations"))}(context)
       }`
           : `return {
-        ...${resolveReference(refkey(functionName, layer, "getClassicOperation"))}(context)
+        ...${resolveReference(refkey(client, functionName, layer, "getClassicOperation"))}(context)
       }`,
     };
     addDeclaration(
       classicFile,
       functions,
-      refkey(operationFunctionName, layer, "getClassicOperations"),
+      refkey(client, operationFunctionName, layer, "getClassicOperations"),
     );
   }
 

package/src/utils/interfaces.ts

@@ -8,6 +8,7 @@ export interface SdkContext extends TCGCSdkContext {
   generationPathDetail?: GenerationDirDetail;
   hasApiVersionInClient?: boolean;
   allServiceNamespaces?: Namespace[];
+  commonServiceNamespace?: string[];
 }
 
 export interface GenerationDirDetail {

package/static/static-helpers/urlTemplate.ts

@@ -69,7 +69,8 @@ function getExpandedValue(option: ValueOptions): string {
       // prepare the following parts: separator, varName, value
       vals.push(`${getFirstOrSep(op, isFirst)}`);
       if (named && varName) {
-        vals.push(`${encodeURIComponent(varName)}`);
+        // No need to encode varName considering it is already encoded
+        vals.push(`${varName}`);
         if (val === "") {
           vals.push(ifEmpty);
         } else {
@@ -108,7 +109,8 @@ function getNonExpandedValue(option: ValueOptions): string | undefined {
   const first = getFirstOrSep(op, isFirst);
   const [named, ifEmpty] = getNamedAndIfEmpty(op);
   if (named && varName) {
-    vals.push(encodeComponent(varName, reserved, op));
+    // No need to encode varName considering it is already encoded
+    vals.push(varName);
     if (value === "") {
       if (!ifEmpty) {
         vals.push(ifEmpty);