@azure-tools/typespec-ts 0.50.2 → 0.50.3

package/dist/src/modular/helpers/operationHelpers.d.ts

@@ -1,10 +1,10 @@
-import { FunctionDeclarationStructure, OptionalKind } from "ts-morph";
+import { FunctionDeclarationStructure, OptionalKind, TypeAliasDeclarationStructure } from "ts-morph";
 import { ServiceOperation } from "../../utils/operationUtil.js";
 import { ModelOverrideOptions } from "../serialization/serializeUtils.js";
 import { SdkContext } from "../../utils/interfaces.js";
 import { SdkClientType, SdkHttpOperation, SdkHttpParameter, SdkLroPagingServiceMethod, SdkLroServiceMethod, SdkMethod, SdkModelPropertyType, SdkModelType, SdkPagingServiceMethod, SdkServiceResponseHeader, SdkType } from "@azure-tools/typespec-client-generator-core";
 export declare function getSendPrivateFunction(dpgContext: SdkContext, method: [string[], ServiceOperation], clientType: string, client?: SdkClientType<SdkHttpOperation>): OptionalKind<FunctionDeclarationStructure>;
-export declare function getDeserializePrivateFunction(context: SdkContext, operation: ServiceOperation): OptionalKind<FunctionDeclarationStructure>;
+export declare function getDeserializePrivateFunction(context: SdkContext, method: [string[], ServiceOperation]): OptionalKind<FunctionDeclarationStructure>;
 /**
  * Generates a private function to deserialize response headers.
  * Only generated when response headers are present and include-headers-in-response
@@ -82,4 +82,24 @@ export declare function getExpectedStatuses(operation: ServiceOperation): string
  * @returns Array of unique response headers
  */
 export declare function getResponseHeaders(responses: SdkHttpOperation["responses"]): SdkServiceResponseHeader[];
+/**
+ * Returns the name for a non-model response wrapper type.
+ * The name follows the pattern: {OperationGroupName}{MethodName}Response
+ * @param method - The method tuple [prefixes, operation]
+ */
+export declare function getOperationResponseTypeName(method: [string[], ServiceOperation]): string;
+/**
+ * Determines whether wrapping the non-model return type is needed for an operation.
+ * Returns an object with `shouldWrap` (whether to wrap) and `isBinary` (whether it's a binary response).
+ */
+export declare function checkWrapNonModelReturn(context: SdkContext, operation: ServiceOperation): {
+    shouldWrap: boolean;
+    isBinary: boolean;
+};
+/**
+ * Builds a TypeAliasDeclarationStructure for the non-model response wrapper type.
+ * - For binary responses: { blobBody?: Promise<Blob>; readableStreamBody?: NodeJS.ReadableStream }
+ * - For other non-model responses: { body: <type> }
+ */
+export declare function buildNonModelResponseTypeDeclaration(context: SdkContext, method: [string[], ServiceOperation], isBinary: boolean): TypeAliasDeclarationStructure;
 //# sourceMappingURL=operationHelpers.d.ts.map

package/dist/src/modular/helpers/operationHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/operationHelpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"operationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/operationHelpers.ts"],"names":[],"mappings":"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"}

package/dist/src/modular/helpers/operationHelpers.js

@@ -76,15 +76,22 @@ export function getSendPrivateFunction(dpgContext, method, clientType, client) {
         statements
     };
 }
-export function getDeserializePrivateFunction(context, operation) {
+export function getDeserializePrivateFunction(context, method) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
+    const operation = method[1];
     const { name } = getOperationName(operation);
     const dependencies = useDependencies();
     const PathUncheckedResponseReference = resolveReference(dependencies.PathUncheckedResponse);
+    // Check if we need to wrap the non-model return type
+    const { shouldWrap, isBinary } = checkWrapNonModelReturn(context, operation);
+    // For binary wrap, the deserializer receives a StreamableMethod directly
+    const resultParamType = shouldWrap && isBinary
+        ? resolveReference(dependencies.StreamableMethod)
+        : PathUncheckedResponseReference;
     const parameters = [
         {
             name: "result",
-            type: PathUncheckedResponseReference
+            type: resultParamType
         }
     ];
     const isLroOnly = isLroOnlyOperation(operation);
@@ -106,6 +113,13 @@ export function getDeserializePrivateFunction(context, operation) {
             type: getTypeExpression(context, restResponse.type)
         };
     }
+    else if (shouldWrap) {
+        // Use the wrapper response type name (resolved via binder for cross-file imports)
+        returnType = {
+            name: getOperationResponseTypeName(method),
+            type: resolveReference(refkey(operation, "response"))
+        };
+    }
     else if (response.type) {
         returnType = {
             name: (_b = response.name) !== null && _b !== void 0 ? _b : "",
@@ -124,8 +138,11 @@ export function getDeserializePrivateFunction(context, operation) {
     };
     const statements = [];
     const createRestErrorReference = resolveReference(dependencies.createRestError);
-    statements.push(`const expectedStatuses = ${getExpectedStatuses(operation)};`);
-    statements.push(`if(!expectedStatuses.includes(result.status)){`, `${getExceptionThrowStatement(context, operation)}`, "}");
+    // For binary wrap, parameter is StreamableMethod - skip status check
+    if (!(shouldWrap && isBinary)) {
+        statements.push(`const expectedStatuses = ${getExpectedStatuses(operation)};`);
+        statements.push(`if(!expectedStatuses.includes(result.status)){`, `${getExceptionThrowStatement(context, operation)}`, "}");
+    }
     const deserializedType = isLroOnly || isLroAndPaging
         ? (_d = (_c = operation === null || operation === void 0 ? void 0 : operation.lroMetadata) === null || _c === void 0 ? void 0 : _c.finalResponse) === null || _d === void 0 ? void 0 : _d.result
         : isPagingOnly && (restResponse === null || restResponse === void 0 ? void 0 : restResponse.type)
@@ -220,6 +237,28 @@ export function getDeserializePrivateFunction(context, operation) {
                 nameOnly: true,
                 skipDiscriminatedUnionSuffix: false
             });
+            // Handle wrap-non-model-return for non-LRO, non-paging operations
+            if (shouldWrap) {
+                if (isBinary) {
+                    const getBinaryResponseBodyReference = resolveReference(SerializationHelpers.getBinaryResponseBody);
+                    const deserializeError = getExceptionDetails(context, operation).defaultDeserializer;
+                    const deserializeErrorStr = deserializeError
+                        ? `, ${deserializeError}`
+                        : "";
+                    statements.push(`return ${getBinaryResponseBodyReference}(result, ${getExpectedStatuses(operation)}${deserializeErrorStr});
+`);
+                }
+                else {
+                    // Non-model response: wrap with body property
+                    // Generate the appropriate deserialization for the body value
+                    const bodyValue = deserializeResponseValue(context, deserializedType, "result.body", true, getEncodeForType(deserializedType));
+                    statements.push(`return { body: ${bodyValue} };`);
+                }
+                return {
+                    ...functionStatement,
+                    statements
+                };
+            }
             if (deserializeFunctionName) {
                 statements.push(`return ${deserializeFunctionName}(${deserializedRoot})${multipartCastSuffix}`);
             }
@@ -630,8 +669,17 @@ export function getOperationFunction(context, method, clientType) {
     if (response.type) {
         bodyType = getTypeExpression(context, response.type);
     }
+    // Check if we need to wrap the non-model return type
+    const { shouldWrap: wrapReturn, isBinary: wrapReturnIsBinary } = checkWrapNonModelReturn(context, operation);
     let returnType = { name: "", type: "void" };
-    if (response.type) {
+    if (wrapReturn) {
+        // Use the wrapper response type name (resolved via binder for cross-file imports)
+        returnType = {
+            name: getOperationResponseTypeName(method),
+            type: resolveReference(refkey(operation, "response"))
+        };
+    }
+    else if (response.type) {
         const type = response.type;
         // If feature flag enabled, we'll append the response headers to the operation response type.
         if (type.kind === "model" &&
@@ -705,6 +753,17 @@ export function getOperationFunction(context, method, clientType) {
     const paramNames = new Set(parameters.map((p) => p.name));
     const resultVarName = generateLocallyUniqueName("result", paramNames);
     const parameterList = parameters.map((p) => p.name).join(", ");
+    // For binary wrap, pass the StreamableMethod directly to the deserializer.
+    // The deserializer uses asBrowserStream()/asNodeStream() to build the wrapper.
+    if (wrapReturn && wrapReturnIsBinary) {
+        const streamableMethodVarName = generateLocallyUniqueName("streamableMethod", paramNames);
+        statements.push(`const ${streamableMethodVarName} = _${name}Send(${parameterList});`);
+        statements.push(`return _${name}Deserialize(${streamableMethodVarName});`);
+        return {
+            ...functionStatement,
+            statements
+        };
+    }
     // When storage-compat is enabled, set up the onResponse interceptor before sending
     const storageCompatVarName = generateLocallyUniqueName("_storageCompat", paramNames);
     if (isStorageCompatEnabled) {
@@ -1060,7 +1119,8 @@ function getHeaderAndBodyParameters(dpgContext, operation, optionalParamName = "
 // Specially handle the type for headers because we only allow string/number/boolean values
 function buildHeaderParameter(program, paramMap, param, optionalParamName = "options") {
     const paramName = param.name;
-    if (!param.optional && isTypeNullable(param.type) === true) {
+    const effectiveOptional = getEffectiveOptional(param);
+    if (!effectiveOptional && isTypeNullable(param.type) === true) {
         reportDiagnostic(program, {
             code: "nullable-required-header",
             target: NoTarget
@@ -1068,7 +1128,7 @@ function buildHeaderParameter(program, paramMap, param, optionalParamName = "opt
         return paramMap;
     }
     const conditions = [];
-    if (param.optional) {
+    if (effectiveOptional) {
         conditions.push(`${optionalParamName}?.${paramName} !== undefined`);
     }
     if (isTypeNullable(param.type) === true) {
@@ -1222,8 +1282,32 @@ function getContentTypeValue(param, optionalParamName = "options") {
             : `${optionalParamName}.` + param.name + " as any"}`;
     }
 }
+/**
+ * Gets the effective optionality for an HTTP parameter by checking
+ * the linked method parameter via methodParameterSegments.
+ * This is needed because @@override can change a method parameter's
+ * optionality without updating the HTTP parameter's optional flag.
+ * For client-level parameters (onClient), preserve the HTTP parameter's own flag.
+ */
+function getEffectiveOptional(param) {
+    var _a, _b;
+    // For client-level parameters, the HTTP parameter's optional flag is authoritative
+    if (param.onClient) {
+        return Boolean(param.optional);
+    }
+    // For method-level parameters with a direct mapping to a single method param,
+    // use the method parameter's optional flag (correctly reflects @@override changes)
+    if (((_a = param.methodParameterSegments) === null || _a === void 0 ? void 0 : _a.length) === 1 &&
+        ((_b = param.methodParameterSegments[0]) === null || _b === void 0 ? void 0 : _b.length) === 1) {
+        const methodParam = param.methodParameterSegments[0][0];
+        if (methodParam) {
+            return Boolean(methodParam.optional);
+        }
+    }
+    return Boolean(param.optional);
+}
 function isRequired(param) {
-    return !param.optional;
+    return !getEffectiveOptional(param);
 }
 function getRequired(context, param, serializedName) {
     const clientValue = `${param.onClient ? "context." : ""}${param.name}`;
@@ -1243,7 +1327,7 @@ function isConstant(param) {
     return param.kind === "constant";
 }
 function isOptional(param) {
-    return Boolean(param.optional);
+    return getEffectiveOptional(param);
 }
 function getOptional(context, param, optionalParamName, serializedName) {
     const paramName = `${param.onClient ? "context." : `${optionalParamName}?.`}${param.name}`;
@@ -2042,4 +2126,89 @@ function buildHeaderOnlyResponseValue(context, headers) {
     });
     return `{ ${props.join(", ")} }`;
 }
+/**
+ * Returns the name for a non-model response wrapper type.
+ * The name follows the pattern: {OperationGroupName}{MethodName}Response
+ * @param method - The method tuple [prefixes, operation]
+ */
+export function getOperationResponseTypeName(method) {
+    const prefixes = method[0];
+    const operation = method[1];
+    const prefix = !operation.name.includes("_")
+        ? getClassicalLayerPrefix(prefixes, NameType.Interface)
+        : "";
+    return `${prefix}${normalizeName(operation.name, NameType.Interface)}Response`;
+}
+/**
+ * Determines whether wrapping the non-model return type is needed for an operation.
+ * Returns an object with `shouldWrap` (whether to wrap) and `isBinary` (whether it's a binary response).
+ */
+export function checkWrapNonModelReturn(context, operation) {
+    var _a, _b, _c;
+    const noWrap = { shouldWrap: false, isBinary: false };
+    // Only for non-LRO, non-paging normal operations
+    if (isLroOnlyOperation(operation) ||
+        isLroAndPagingOperation(operation) ||
+        isPagingOnlyOperation(operation)) {
+        return noWrap;
+    }
+    // Only if the feature flag is enabled
+    if (!((_a = context.rlcOptions) === null || _a === void 0 ? void 0 : _a.wrapNonModelReturn)) {
+        return noWrap;
+    }
+    const response = operation.response;
+    if (!response.type) {
+        return noWrap; // void return type - no wrap needed
+    }
+    const type = response.type;
+    const contentTypes = (_c = (_b = operation.operation.responses[0]) === null || _b === void 0 ? void 0 : _b.contentTypes) !== null && _c !== void 0 ? _c : [];
+    // Check if it's a binary (bytes with binary content type) response
+    if (type.__raw && isBinaryPayload(context, type.__raw, contentTypes)) {
+        return { shouldWrap: true, isBinary: true };
+    }
+    // Check if it's a non-model, non-record type (array, scalar, enum, etc.)
+    if (type.kind !== "model" && type.kind !== "dict") {
+        return { shouldWrap: true, isBinary: false };
+    }
+    return noWrap;
+}
+/**
+ * Builds a TypeAliasDeclarationStructure for the non-model response wrapper type.
+ * - For binary responses: { blobBody?: Promise<Blob>; readableStreamBody?: NodeJS.ReadableStream }
+ * - For other non-model responses: { body: <type> }
+ */
+export function buildNonModelResponseTypeDeclaration(context, method, isBinary) {
+    const typeName = getOperationResponseTypeName(method);
+    const operation = method[1];
+    let typeBody;
+    if (isBinary) {
+        typeBody = `{
+      /**
+       * BROWSER ONLY
+       *
+       * The response body as a browser Blob.
+       * Always \`undefined\` in node.js.
+       */
+      blobBody?: Promise<Blob>;
+      /**
+       * NODEJS ONLY
+       *
+       * The response body as a node.js Readable stream.
+       * Always \`undefined\` in the browser.
+       */
+      readableStreamBody?: NodeJS.ReadableStream;
+  }`;
+    }
+    else {
+        const returnType = getTypeExpression(context, operation.response.type);
+        typeBody = `{ body: ${returnType} }`;
+    }
+    return {
+        kind: StructureKind.TypeAlias,
+        name: typeName,
+        type: typeBody,
+        isExported: true,
+        leadingTrivia: "\n"
+    };
+}
 //# sourceMappingURL=operationHelpers.js.map