@azure-tools/typespec-ts 0.47.0 → 0.47.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.47.0",
+  "version": "0.47.1",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -18,15 +18,15 @@
   "license": "MIT",
   "devDependencies": {
     "@azure-rest/core-client": "^2.3.1",
-    "@typespec/http-specs": "0.1.0-alpha.29-dev.5",
-    "@typespec/spector": "0.1.0-alpha.21-dev.3",
-    "@typespec/spec-api": "0.1.0-alpha.11-dev.1",
-    "@typespec/tspd": "0.73.1",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.33-dev.4",
-    "@azure-tools/typespec-autorest": "^0.62.0",
-    "@azure-tools/typespec-azure-core": "^0.62.0",
-    "@azure-tools/typespec-azure-resource-manager": "^0.62.1",
-    "@azure-tools/typespec-client-generator-core": "^0.62.0",
+    "@typespec/http-specs": "0.1.0-alpha.30-dev.0",
+    "@typespec/spector": "0.1.0-alpha.22-dev.0",
+    "@typespec/spec-api": "0.1.0-alpha.12-dev.0",
+    "@typespec/tspd": "0.73.2",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.34-dev.1",
+    "@azure-tools/typespec-autorest": "^0.63.0",
+    "@azure-tools/typespec-azure-core": "^0.63.0",
+    "@azure-tools/typespec-azure-resource-manager": "^0.63.0",
+    "@azure-tools/typespec-client-generator-core": "^0.63.0",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -40,12 +40,12 @@
     "@types/mocha": "^10.0.6",
     "@typescript-eslint/eslint-plugin": "^8.28.0",
     "@typescript-eslint/parser": "^8.28.0",
-    "@typespec/compiler": "^1.6.0",
-    "@typespec/http": "^1.6.0",
-    "@typespec/openapi": "^1.6.0",
-    "@typespec/rest": "^0.76.0",
+    "@typespec/compiler": "^1.7.0",
+    "@typespec/http": "^1.7.0",
+    "@typespec/openapi": "^1.7.0",
+    "@typespec/rest": "^0.77.0",
     "@typespec/ts-http-runtime": "^0.1.0",
-    "@typespec/versioning": "^0.76.0",
+    "@typespec/versioning": "^0.77.0",
     "chai": "^4.3.6",
     "chalk": "^4.0.0",
     "cross-env": "^7.0.3",
@@ -64,16 +64,16 @@
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": "^0.62.0",
-    "@azure-tools/typespec-client-generator-core": "^0.62.0",
-    "@typespec/compiler": "^1.6.0",
-    "@typespec/http": "^1.6.0",
-    "@typespec/rest": "^0.76.0",
-    "@typespec/versioning": "^0.76.0",
-    "@typespec/xml": "^0.76.0"
+    "@azure-tools/typespec-azure-core": "^0.63.0",
+    "@azure-tools/typespec-client-generator-core": "^0.63.0",
+    "@typespec/compiler": "^1.7.0",
+    "@typespec/http": "^1.7.0",
+    "@typespec/rest": "^0.77.0",
+    "@typespec/versioning": "^0.77.0",
+    "@typespec/xml": "^0.77.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.47.0",
+    "@azure-tools/rlc-common": "^0.47.1",
     "fs-extra": "^11.1.0",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",

package/src/framework/hooks/sdkTypes.ts

@@ -168,7 +168,7 @@ function enrichFlattenProperties(
         baseModel,
         getAllAncestors(baseModel)
       )
-        .filter((p) => p.flatten === false || p.flatten === undefined)
+        .filter((p) => !(p.flatten && p.type.kind === "model"))
         .map((p) => normalizeModelPropertyName(context, p));
       baseModelProperties.set(
         baseModel,
@@ -185,10 +185,7 @@ function enrichFlattenProperties(
     const conflictMap = new Map<SdkModelPropertyType, string>();
     const flattenModel = flattenProperty.type;
 
-    if (flattenModel.kind !== "model") {
-      continue;
-    }
-    if (baseModelProperties.has(flattenModel)) {
+    if (baseModelProperties.has(flattenModel as SdkModelType)) {
       // If the flatten model is also a base model of other flatten properties, which means it has multiple consecutive flatten operations
       // Since we cannot handle the flatten transition, report warning and skip it for now
       reportDiagnostic(context.program, {

package/src/framework/load-static-helpers.ts

@@ -28,10 +28,10 @@ export function isStaticHelperMetadata(
 ): metadata is StaticHelperMetadata {
   return Boolean(
     metadata &&
-      metadata.name &&
-      metadata.kind &&
-      metadata.location &&
-      metadata[SourceFileSymbol]
+    metadata.name &&
+    metadata.kind &&
+    metadata.location &&
+    metadata[SourceFileSymbol]
   );
 }
 
@@ -39,8 +39,7 @@ export type StaticHelpers = Record<string, StaticHelperMetadata>;
 
 const DEFAULT_STATIC_HELPERS_PATH = "static/static-helpers";
 
-export interface LoadStaticHelpersOptions
-  extends Partial<ModularEmitterOptions> {
+export interface LoadStaticHelpersOptions extends Partial<ModularEmitterOptions> {
   helpersAssetDirectory?: string;
   sourcesDir?: string;
   program?: Program;

package/src/modular/buildClientContext.ts

@@ -78,31 +78,60 @@ export function buildClientContext(
     getClientContextPath(clientMap, emitterOptions)
   );
 
+  // Get all client parameters (both required and optional) for the interface
+  const requiredInterfaceProperties = getClientParameters(client, dpgContext, {
+    onClientOnly: false,
+    requiredOnly: true,
+    apiVersionAsRequired: true
+  })
+    .filter((p) => {
+      const clientParamName = getClientParameterName(p);
+      return (
+        clientParamName !== "endpointParam" && clientParamName !== "credential"
+      );
+    })
+    .map((p) => {
+      return {
+        name: getClientParameterName(p),
+        type: getTypeExpression(dpgContext, p.type),
+        hasQuestionToken: false,
+        docs: getDocsWithKnownVersion(dpgContext, p)
+      };
+    });
+
+  // Collect names of required properties to avoid duplicates
+  const requiredPropertyNames = new Set(
+    requiredInterfaceProperties.map((p) => p.name)
+  );
+
+  const optionalInterfaceProperties = getClientParameters(client, dpgContext, {
+    onClientOnly: false,
+    optionalOnly: true
+  })
+    .filter((p) => {
+      const clientParamName = getClientParameterName(p);
+      return (
+        clientParamName !== "endpointParam" &&
+        clientParamName !== "credential" &&
+        clientParamName !== "endpoint" &&
+        !requiredPropertyNames.has(clientParamName) // Avoid duplicating required properties
+      );
+    })
+    .map((p) => {
+      return {
+        name: getClientParameterName(p),
+        type: getTypeExpression(dpgContext, p.type),
+        hasQuestionToken: true,
+        docs: getDocsWithKnownVersion(dpgContext, p)
+      };
+    });
+
   clientContextFile.addInterface({
     isExported: true,
     name: `${rlcClientName}`,
     extends: [resolveReference(dependencies.Client)],
     docs: getDocsFromDescription(client.doc),
-    properties: getClientParameters(client, dpgContext, {
-      onClientOnly: false,
-      requiredOnly: true,
-      apiVersionAsRequired: true
-    })
-      .filter((p) => {
-        const clientParamName = getClientParameterName(p);
-        return (
-          clientParamName !== "endpointParam" &&
-          clientParamName !== "credential"
-        );
-      })
-      .map((p) => {
-        return {
-          name: getClientParameterName(p),
-          type: getTypeExpression(dpgContext, p.type),
-          hasQuestionToken: false,
-          docs: getDocsWithKnownVersion(dpgContext, p)
-        };
-      })
+    properties: [...requiredInterfaceProperties, ...optionalInterfaceProperties]
   });
 
   const propertiesInOptions = getClientParameters(client, dpgContext, {
@@ -168,11 +197,8 @@ export function buildClientContext(
     isExported: true
   });
 
-  const endpointParam = buildGetClientEndpointParam(
-    factoryFunction,
-    dpgContext,
-    client
-  );
+  const { endpointParamName: endpointParam, assignedOptionalParams } =
+    buildGetClientEndpointParam(factoryFunction, dpgContext, client);
   const credentialParam = buildGetClientCredentialParam(client, emitterOptions);
   const optionsParam = buildGetClientOptionsParam(
     factoryFunction,
@@ -262,13 +288,44 @@ export function buildClientContext(
       p.name !== "credential" &&
       p.name !== "options"
   );
-  if (contextRequiredParam.length) {
+
+  // Collect names of required parameters to avoid duplicates
+  const requiredParamNames = new Set(contextRequiredParam.map((p) => p.name));
+
+  // Also include optional parameters from clientInitialization that should be passed through
+  const contextOptionalParams = getClientParameters(client, dpgContext, {
+    optionalOnly: true,
+    onClientOnly: false
+  }).filter((p) => {
+    const clientParamName = getClientParameterName(p);
+    return (
+      clientParamName !== "endpointParam" &&
+      clientParamName !== "credential" &&
+      clientParamName !== "endpoint" &&
+      !requiredParamNames.has(clientParamName) // Avoid duplicating required parameters
+    );
+  });
+
+  // Build context params, checking if param was already assigned as a required param
+  const allContextParams = [
+    ...contextRequiredParam.map((p) => p.name),
+    ...contextOptionalParams.map((p) => {
+      const clientParamName = getClientParameterName(p);
+      // If this param was already assigned (e.g., as a required param or in endpoint building), use the value directly
+      // Otherwise, get it from options
+      if (
+        requiredParamNames.has(clientParamName) ||
+        (assignedOptionalParams && assignedOptionalParams.has(clientParamName))
+      ) {
+        return clientParamName;
+      }
+      return `${clientParamName}: options.${clientParamName}`;
+    })
+  ];
+
+  if (allContextParams.length) {
     factoryFunction.addStatements(
-      `return { ...clientContext, ${contextRequiredParam
-        .map((p) => {
-          return p.name;
-        })
-        .join(", ")}} as ${rlcClientName};`
+      `return { ...clientContext, ${allContextParams.join(", ")}} as ${rlcClientName};`
     );
   } else {
     factoryFunction.addStatements(`return clientContext;`);

package/src/modular/emitModels.ts

@@ -501,7 +501,7 @@ function buildModelInterface(
       .filter((p) => !isMetadata(context.program, p.__raw!))
       .filter((p) => {
         // filter out the flatten property to be processed later
-        if (p.flatten) {
+        if (p.flatten && p.type.kind === "model") {
           flattenPropertySet.add(p);
           return false;
         }
@@ -512,9 +512,6 @@ function buildModelInterface(
       })
   } as InterfaceStructure;
   for (const flatten of flattenPropertySet.keys()) {
-    if (flatten.type?.kind !== "model" || !flatten.type.properties) {
-      continue;
-    }
     const conflictMap =
       useContext("sdkTypes").flattenProperties.get(flatten)?.conflictMap;
     const allProperties = getAllProperties(

package/src/modular/helpers/clientHelpers.ts

@@ -174,7 +174,8 @@ export function buildGetClientEndpointParam(
   context: StatementedNode,
   dpgContext: SdkContext,
   client: SdkClientType<SdkServiceOperation>
-): string {
+): { endpointParamName: string; assignedOptionalParams?: Set<string> } {
+  const assignedOptionalParams = new Set<string>();
   let coreEndpointParam = "";
   if (dpgContext.rlcOptions?.flavor === "azure") {
     const cloudSettingSuffix = dpgContext.arm
@@ -209,8 +210,10 @@ export function buildGetClientEndpointParam(
           context.addStatements(
             `const ${paramName} = options.${paramName} ?? ${defaultValue};`
           );
+          assignedOptionalParams.add(paramName);
         } else if (templateParam.optional) {
           context.addStatements(`const ${paramName} = options.${paramName};`);
+          assignedOptionalParams.add(paramName);
         }
         parameterizedEndpointUrl = parameterizedEndpointUrl.replace(
           `{${templateParam.name}}`,
@@ -219,7 +222,7 @@ export function buildGetClientEndpointParam(
       }
       const endpointUrl = `const endpointUrl = ${coreEndpointParam} ?? \`${parameterizedEndpointUrl}\`;`;
       context.addStatements(endpointUrl);
-      return "endpointUrl";
+      return { endpointParamName: "endpointUrl", assignedOptionalParams };
     } else if (endpointParam.type.kind === "endpoint") {
       const clientDefaultValue =
         endpointParam.type.templateArguments[0]?.clientDefaultValue;
@@ -231,14 +234,14 @@ export function buildGetClientEndpointParam(
             : `String(${getClientParameterName(endpointParam)})`;
       const endpointUrl = `const endpointUrl = ${coreEndpointParam} ?? ${defaultValueStr};`;
       context.addStatements(endpointUrl);
-      return "endpointUrl";
+      return { endpointParamName: "endpointUrl" };
     }
     const endpointUrl = `const endpointUrl = ${coreEndpointParam} ?? String(${getClientParameterName(endpointParam)});`;
     context.addStatements(endpointUrl);
-    return "endpointUrl";
+    return { endpointParamName: "endpointUrl" };
   }
 
-  return "endpointUrl";
+  return { endpointParamName: "endpointUrl" };
 }
 
 /**

package/src/modular/helpers/operationHelpers.ts

@@ -391,8 +391,9 @@ function getOperationSignatureParameters(
         p.type.kind !== "constant" &&
         operation.operation.parameters.filter((param) => {
           return (
-            param.correspondingMethodParams.length === 1 &&
-            param.correspondingMethodParams[0] === p
+            param.methodParameterSegments.length === 1 &&
+            param.methodParameterSegments[0]?.length === 1 &&
+            param.methodParameterSegments[0]?.[0] === p
           );
         })[0]?.kind !== "cookie" &&
         p.clientDefaultValue === undefined &&
@@ -742,8 +743,8 @@ function getHeaderAndBodyParameters(
       }
       // Check if this parameter still exists in the corresponding method params (after override)
       if (
-        param.correspondingMethodParams &&
-        param.correspondingMethodParams.length > 0
+        param.methodParameterSegments &&
+        param.methodParameterSegments.length > 0
       ) {
         parametersImplementation[param.kind].push({
           paramMap: getParameterMap(dpgContext, param, optionalParamName),
@@ -1075,9 +1076,12 @@ function getPathParameters(
   const pathParams: string[] = [];
   for (const param of operation.operation.parameters) {
     if (param.kind === "path") {
-      pathParams.push(
-        `"${param.serializedName}": ${getPathParamExpr(param.correspondingMethodParams[0]!, getDefaultValue(param) as string, optionalParamName)}`
-      );
+      const methodParam = param.methodParameterSegments[0]?.[0];
+      if (methodParam) {
+        pathParams.push(
+          `"${param.serializedName}": ${getPathParamExpr(methodParam, getDefaultValue(param) as string, optionalParamName)}`
+        );
+      }
     }
   }
 
@@ -1108,8 +1112,8 @@ function getQueryParameters(
     if (param.kind === "query") {
       // Check if this parameter still exists in the corresponding method params (after override)
       if (
-        param.correspondingMethodParams &&
-        param.correspondingMethodParams.length > 0
+        param.methodParameterSegments &&
+        param.methodParameterSegments.length > 0
       ) {
         parametersImplementation[param.kind].push({
           paramMap: getParameterMap(dpgContext, {
@@ -1207,7 +1211,7 @@ export function getSerializationExpression(
   propertyPath: string,
   enableFlatten: boolean = true
 ): string {
-  if (property.flatten && enableFlatten) {
+  if (property.flatten && property.type.kind === "model" && enableFlatten) {
     return getSerializationExpressionForFlatten(context, property, "item");
   }
   const dot = propertyPath.endsWith("?") ? "." : "";

package/src/modular/helpers/typeHelpers.ts

@@ -132,9 +132,11 @@ export function buildPropertyNameMapper(
  * @returns
  */
 export function isSpreadBodyParameter(body: SdkBodyParameter) {
-  const methodParams = body.correspondingMethodParams;
+  const methodParams = body.methodParameterSegments;
   return (
     methodParams.length > 1 ||
-    (methodParams.length === 1 && methodParams[0]?.type !== body.type)
+    (methodParams.length === 1 &&
+      methodParams[0]?.length === 1 &&
+      methodParams[0][0]?.type !== body.type)
   );
 }

package/src/modular/serialization/serializeUtils.ts

@@ -144,8 +144,8 @@ export function isDiscriminatedUnion(
   }
   return Boolean(
     type?.kind === "model" &&
-      type.discriminatorProperty &&
-      type.discriminatedSubtypes
+    type.discriminatorProperty &&
+    type.discriminatedSubtypes
   );
 }
 

package/src/transform/transformApiVersionInfo.ts

@@ -30,7 +30,7 @@ export function transformApiVersionInfo(
     queryVersionDetail || pathVersionDetail
       ? Boolean(
           pathVersionDetail?.isCrossedVersion ||
-            queryVersionDetail?.isCrossedVersion
+          queryVersionDetail?.isCrossedVersion
         )
       : undefined;
   const defaultValue =

package/src/utils/mediaTypes.ts

@@ -107,8 +107,8 @@ export function isMediaTypeJsonMergePatch(
   if (Array.isArray(mediaType)) {
     return Boolean(
       mediaType.length === 1 &&
-        mediaType[0] &&
-        isMediaTypeJsonMergePatch(mediaType[0])
+      mediaType[0] &&
+      isMediaTypeJsonMergePatch(mediaType[0])
     );
   }
   const mt = parseMediaType(mediaType);
@@ -133,8 +133,8 @@ export function isMediaTypeMultipartFormData(
   if (Array.isArray(mediaType)) {
     return Boolean(
       mediaType.length === 1 &&
-        mediaType[0] &&
-        isMediaTypeMultipartFormData(mediaType[0])
+      mediaType[0] &&
+      isMediaTypeMultipartFormData(mediaType[0])
     );
   }