@azure-tools/typespec-ts 0.41.1 → 0.42.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.41.1",
+  "version": "0.42.0",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -18,14 +18,14 @@
   "license": "MIT",
   "devDependencies": {
     "@azure-rest/core-client": "^2.3.1",
-    "@typespec/http-specs": "0.1.0-alpha.24-dev.0",
-    "@typespec/spector": "0.1.0-alpha.16-dev.0",
-    "@typespec/spec-api": "0.1.0-alpha.7-dev.0",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.20-dev.0",
-    "@azure-tools/typespec-autorest": "^0.57.0",
+    "@typespec/http-specs": "0.1.0-alpha.24-dev.2",
+    "@typespec/spector": "0.1.0-alpha.16-dev.2",
+    "@typespec/spec-api": "0.1.0-alpha.7-dev.1",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.22",
+    "@azure-tools/typespec-autorest": "^0.57.1",
     "@azure-tools/typespec-azure-core": "^0.57.0",
-    "@azure-tools/typespec-azure-resource-manager": "^0.57.0",
-    "@azure-tools/typespec-client-generator-core": "^0.57.1",
+    "@azure-tools/typespec-azure-resource-manager": "^0.57.2",
+    "@azure-tools/typespec-client-generator-core": "^0.57.3",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -68,7 +68,7 @@
   },
   "peerDependencies": {
     "@azure-tools/typespec-azure-core": "^0.57.0",
-    "@azure-tools/typespec-client-generator-core": "^0.57.1",
+    "@azure-tools/typespec-client-generator-core": "^0.57.3",
     "@typespec/compiler": "^1.1.0",
     "@typespec/http": "^1.1.0",
     "@typespec/rest": "^0.71.0",
@@ -76,7 +76,7 @@
     "@typespec/xml": "^0.71.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.41.1",
+    "@azure-tools/rlc-common": "^0.42.0",
     "fs-extra": "^11.1.0",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",
@@ -145,6 +145,6 @@
     "stop-test-server": "npx tsp-spector server stop",
     "unit-test": "npm-run-all --parallel unit-test:rlc unit-test:modular",
     "unit-test:rlc": "cross-env TS_NODE_PROJECT=tsconfig.json mocha -r ts-node/register --experimental-specifier-resolution=node --experimental-modules=true  --timeout 36000 './test/unit/**/*.spec.ts'",
-    "unit-test:modular": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha -r ts-node/register --experimental-specifier-resolution=node --experimental-modules=true  --no-timeout './test/modularUnit/**/*.spec.ts'"
+    "unit-test:modular": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha -r ts-node/register --experimental-specifier-resolution=node --experimental-modules=true  --no-timeout './test/modularUnit/**/*.spec.ts' --reporter-options maxDiffSize=20000"
   }
 }

package/src/framework/declaration.ts

@@ -32,38 +32,46 @@ export function addDeclaration(
   sourceFile: SourceFile,
   declaration: ClassDeclarationStructure,
   refkey: unknown
-): ClassDeclaration;
+): void;
 
 export function addDeclaration(
   sourceFile: SourceFile,
   declaration: EnumDeclarationStructure,
   refkey: unknown
-): EnumDeclaration;
+): void;
 
 export function addDeclaration(
   sourceFile: SourceFile,
   declaration: FunctionDeclarationStructure,
   refkey: unknown
-): FunctionDeclaration;
+): void;
 
 export function addDeclaration(
   sourceFile: SourceFile,
   declaration: InterfaceDeclarationStructure,
   refkey: unknown
-): InterfaceDeclaration;
+): void;
 
 export function addDeclaration(
   sourceFile: SourceFile,
   declaration: TypeAliasDeclarationStructure,
   refkey: unknown
-): TypeAliasDeclaration;
+): void;
 export function addDeclaration(
   sourceFile: SourceFile,
-  declaration: DeclarationStructures,
+  declaration: string,
   refkey: unknown
-): Declarations {
+): void;
+export function addDeclaration(
+  sourceFile: SourceFile,
+  input: DeclarationStructures | string,
+  refkey: unknown
+): void {
   const binder = useBinder();
-
+  const declaration: DeclarationStructures =
+    typeof input === "string"
+      ? ({ name: input, kind: StructureKind.TypeAlias } as any)
+      : input;
   if (!declaration.name) {
     throw new Error(
       `Declaration must have a name ${JSON.stringify(declaration)}`
@@ -82,15 +90,22 @@ export function addDeclaration(
 
   switch (trackedDeclaration.kind) {
     case StructureKind.Class:
-      return sourceFile.addClass(trackedDeclaration);
+      sourceFile.addClass(trackedDeclaration);
+      break;
     case StructureKind.Enum:
-      return sourceFile.addEnum(trackedDeclaration);
+      sourceFile.addEnum(trackedDeclaration);
+      break;
     case StructureKind.Function:
-      return sourceFile.addFunction(trackedDeclaration);
+      sourceFile.addFunction(trackedDeclaration);
+      break;
     case StructureKind.Interface:
-      return sourceFile.addInterface(trackedDeclaration);
+      sourceFile.addInterface(trackedDeclaration);
+      break;
     case StructureKind.TypeAlias:
-      return sourceFile.addTypeAlias(trackedDeclaration);
+      if (trackedDeclaration.type) {
+        sourceFile.addTypeAlias(trackedDeclaration);
+      }
+      break;
     default:
       throw new Error(
         `Unsupported declaration kind ${(trackedDeclaration as any).kind}`

package/src/index.ts

@@ -199,7 +199,7 @@ export async function $onEmit(context: EmitContext) {
     options.generateTest =
       options.generateTest === true ||
       (options.generateTest === undefined &&
-        !hasTestFolder &&
+        (!hasTestFolder || (options.azureSdkForJs && options.azureArm)) &&
         isAzurePackage({ options: options }));
     dpgContext.rlcOptions = options;
   }
@@ -403,8 +403,7 @@ export async function $onEmit(context: EmitContext) {
     );
     const hasPackageFile = await existsSync(existingPackageFilePath);
     const shouldGenerateMetadata =
-      option.generateMetadata === true ||
-      (option.generateMetadata === undefined && !hasPackageFile);
+      option.generateMetadata === true || !hasPackageFile;
     const existingTestFolderPath = join(
       dpgContext.generationPathDetail?.metadataDir ?? "",
       "test"
@@ -519,7 +518,7 @@ export async function $onEmit(context: EmitContext) {
     }
 
     // Generate test relevant files
-    if (option.generateTest && isAzureFlavor) {
+    if (option.generateTest && isAzureFlavor && !hasTestFolder) {
       await emitContentByBuilder(
         program,
         [buildRecordedClientFile, buildSampleTest],

package/src/modular/buildClassicalClient.ts

@@ -308,7 +308,11 @@ function addChildClient(
       ${parentParams
         .filter((p) => !p.name.includes("options"))
         .map((p) => `this._clientParams.${p.name}`)
-        .join(",")},
+        .join(",")}${
+        parentParams.filter((p) => !p.name.includes("options")).length > 0
+          ? ","
+          : ""
+      }
       ${diffParams
         .filter((p) => p.name !== "options")
         .map((p) => `${p.name}`)

package/src/modular/emitModels.ts

@@ -230,8 +230,10 @@ function emitType(context: SdkContext, type: SdkType, sourceFile: SourceFile) {
     addDeclaration(sourceFile, unionType, type);
     addSerializationFunctions(context, type, sourceFile);
   } else if (type.kind === "dict") {
+    addDeclaration(sourceFile, normalizeModelName(context, type), type);
     addSerializationFunctions(context, type, sourceFile);
   } else if (type.kind === "array") {
+    addDeclaration(sourceFile, normalizeModelName(context, type), type);
     addSerializationFunctions(context, type, sourceFile);
   } else if (type.kind === "nullable") {
     const nullableType = buildNullableType(context, type);
@@ -320,8 +322,7 @@ function addSerializationFunctions(
   if (
     serializationFunction &&
     typeof serializationFunction !== "string" &&
-    serializationFunction.name &&
-    !sourceFile.getFunction(serializationFunction.name)
+    serializationFunction.name
   ) {
     addDeclaration(sourceFile, serializationFunction, serializerRefkey);
   }
@@ -333,8 +334,7 @@ function addSerializationFunctions(
   if (
     deserializationFunction &&
     typeof deserializationFunction !== "string" &&
-    deserializationFunction.name &&
-    !sourceFile.getFunction(deserializationFunction.name)
+    deserializationFunction.name
   ) {
     addDeclaration(sourceFile, deserializationFunction, deserailizerRefKey);
   }

package/src/modular/emitSamples.ts

@@ -323,9 +323,9 @@ function prepareExampleParameters(
   }
   // required/optional body parameters
   const bodyParam = method.operation.bodyParam;
-  const bodyName = bodyParam?.serializedName;
-  const bodyExample = parameterMap[bodyName ?? ""];
-  if (bodyName && bodyExample && bodyExample.value) {
+  const bodySerializeName = bodyParam?.serializedName;
+  const bodyExample = parameterMap[bodySerializeName ?? ""];
+  if (bodySerializeName && bodyExample && bodyExample.value) {
     if (
       isSpreadBodyParameter(bodyParam) &&
       bodyParam.type.kind === "model" &&
@@ -348,7 +348,7 @@ function prepareExampleParameters(
     } else {
       result.push(
         prepareExampleValue(
-          bodyName,
+          bodyParam.name,
           bodyExample.value,
           bodyParam.optional,
           bodyParam.onClient

package/src/modular/helpers/clientHelpers.ts

@@ -170,13 +170,8 @@ export function buildGetClientEndpointParam(
   dpgContext: SdkContext,
   client: SdkClientType<SdkServiceOperation>
 ): string {
-  let coreEndpointParam = "";
-  if (dpgContext.rlcOptions?.flavor === "azure") {
-    coreEndpointParam = `options.endpoint ?? options.baseUrl`;
-  } else {
-    // unbranded does not have the deprecated baseUrl parameter
-    coreEndpointParam = `options.endpoint`;
-  }
+  const coreEndpointParam = `options.endpoint`;
+
   // Special case: endpoint URL not defined
   const endpointParam = getClientParameters(client, dpgContext, {
     onClientOnly: true,

package/src/modular/helpers/operationHelpers.ts

@@ -678,7 +678,7 @@ function getHeaderAndBodyParameters(
     return "";
   }
   const operationParameters = operation.operation.parameters.filter(
-    (p) => (!p.onClient || p.isApiVersionParam) && !isContentType(p)
+    (p) => !isContentType(p)
   );
 
   const contentTypeParameter =
@@ -782,7 +782,11 @@ function buildBodyParameter(
     true
   );
 
-  const bodyParamName = normalizeName(bodyParameter.name, NameType.Parameter);
+  const bodyParamName = normalizeName(
+    bodyParameter.name,
+    NameType.Parameter,
+    true
+  );
   const bodyNameExpression = bodyParameter.optional
     ? `${optionalParamName}["${bodyParamName}"]`
     : bodyParamName;
@@ -1016,7 +1020,7 @@ function getPathParameters(
   for (const param of operation.operation.parameters) {
     if (param.kind === "path") {
       pathParams.push(
-        `"${param.serializedName}": ${getPathParamExpr(param, getDefaultValue(param) as string, optionalParamName)}`
+        `"${param.serializedName}": ${getPathParamExpr(param.correspondingMethodParams[0]!, getDefaultValue(param) as string, optionalParamName)}`
       );
     }
   }
@@ -1035,7 +1039,7 @@ function getQueryParameters(
     return [];
   }
   const operationParameters = operation.operation.parameters.filter(
-    (p) => (!p.onClient || p.isApiVersionParam) && !isContentType(p)
+    (p) => !isContentType(p)
   );
   const parametersImplementation: Record<
     "query",
@@ -1075,7 +1079,7 @@ function escapeUriTemplateParamName(name: string) {
 }
 
 function getPathParamExpr(
-  param: SdkServiceParameter,
+  param: SdkModelPropertyType,
   defaultValue?: string,
   optionalParamName: string = "options"
 ) {
@@ -1546,14 +1550,10 @@ export function getPropertyFullName(
  * @param operation The operation
  */
 export function getExpectedStatuses(operation: ServiceOperation): string {
-  const statusCodes = operation.operation.responses.map((x) => x.statusCodes);
+  let statusCodes = operation.operation.responses.map((x) => x.statusCodes);
   // LROs may call the same path but with GET to get the operation status.
-  if (
-    isLroOnlyOperation(operation) &&
-    operation.operation.verb !== "get" &&
-    !statusCodes.includes(200)
-  ) {
-    statusCodes.push(200);
+  if (isLroOnlyOperation(operation) && operation.operation.verb !== "get") {
+    statusCodes = Array.from(new Set([...statusCodes, 200, 202]));
   }
 
   return `[${statusCodes.map((x) => `"${x}"`).join(", ")}]`;

package/src/modular/serialization/buildDeserializerFunction.ts

@@ -122,7 +122,7 @@ function buildPolymorphicDeserializer(
         type: "any"
       }
     ],
-    returnType: normalizeModelName(context, type),
+    returnType: resolveReference(refkey(type, "polymorphicType")),
     statements: []
   };
   if (!type.discriminatorProperty) {
@@ -249,7 +249,7 @@ function buildDiscriminatedUnionDeserializer(
         type: "any"
       }
     ],
-    returnType: normalizeModelName(context, type),
+    returnType: resolveReference(refkey(type, "polymorphicType")),
     statements: output.join("\n")
   };
   return deserializerFunction;
@@ -290,7 +290,7 @@ function buildUnionDeserializer(
         type: "any"
       }
     ],
-    returnType: normalizeModelName(context, type),
+    returnType: resolveReference(refkey(type)),
     statements: ["return item;"]
   };
   return deserializerFunction;
@@ -326,12 +326,7 @@ function buildModelTypeDeserializer(
         type: "any"
       }
     ],
-    returnType: normalizeModelName(
-      context,
-      type,
-      NameType.Interface,
-      options.skipDiscriminatedUnionSuffix
-    ),
+    returnType: resolveReference(refkey(type)),
     statements: ["return item;"]
   };
   const nullabilityPrefix = "";
@@ -436,7 +431,7 @@ function buildDictTypeDeserializer(
         type: "Record<string, any>"
       }
     ],
-    returnType: `Record<string, ${normalizeModelName(context, type.valueType as any) ?? "any"}>`,
+    returnType: `Record<string, ${resolveReference(refkey(type.valueType)) ?? "any"}>`,
     statements: [
       `
   const result: Record<string, any> = {};

package/src/modular/serialization/buildSerializerFunction.ts

@@ -127,7 +127,7 @@ function buildPolymorphicSerializer(
     parameters: [
       {
         name: "item",
-        type: normalizeModelName(context, type)
+        type: resolveReference(refkey(type, "polymorphicType"))
       }
     ],
     returnType: "any",
@@ -253,7 +253,7 @@ function buildDiscriminatedUnionSerializer(
     parameters: [
       {
         name: "item",
-        type: normalizeModelName(context, type)
+        type: resolveReference(refkey(type, "polymorphicType"))
       }
     ],
     returnType: "any",
@@ -294,7 +294,7 @@ function buildUnionSerializer(
     parameters: [
       {
         name: "item",
-        type: normalizeModelName(context, type)
+        type: resolveReference(refkey(type))
       }
     ],
     returnType: "any",
@@ -330,12 +330,7 @@ function buildModelTypeSerializer(
     parameters: [
       {
         name: "item",
-        type: normalizeModelName(
-          context,
-          type,
-          NameType.Interface,
-          options.skipDiscriminatedUnionSuffix
-        )
+        type: resolveReference(refkey(type))
       }
     ],
     returnType: "any",
@@ -497,7 +492,7 @@ function buildDictTypeSerializer(
     parameters: [
       {
         name: "item",
-        type: `Record<string, ${normalizeModelName(context, type.valueType as any) ?? "any"}>`
+        type: `Record<string, ${resolveReference(type.valueType) ?? "any"}>`
       }
     ],
     returnType: "Record<string, any>",

package/src/utils/clientUtils.ts

@@ -85,7 +85,7 @@ export function getModularClientOptions(
 ) {
   const [hierarchy, client] = clientMap;
   const clientOptions: ModularClientOptions = {
-    rlcClientName: `${client.name.replace("Client", "")}Context`
+    rlcClientName: `${client.name.replace(/Client$/, "")}Context`
   };
   clientOptions.subfolder = hierarchy.join("/");
   return clientOptions;