@azure/core-client 1.4.0-alpha.20211206.10 → 1.4.0

package/CHANGELOG.md

@@ -1,17 +1,15 @@
 # Release History
 
-## 1.4.0 (Unreleased)
+## 1.4.0 (2022-01-06)
 
 ### Features Added
 
 - Added a new function `authorizeRequestOnClaimChallenge`, that can be used with the `@azure/core-rest-pipeline`'s `bearerTokenAuthenticationPolicy` to support [Continuous Access Evaluation (CAE) challenges](https://docs.microsoft.com/azure/active-directory/conditional-access/concept-continuous-access-evaluation).
 - Call the `bearerTokenAuthenticationPolicy` with the following options: `bearerTokenAuthenticationPolicy({ authorizeRequestOnChallenge: authorizeRequestOnClaimChallenge })`. Once provided, the `bearerTokenAuthenticationPolicy` policy will internally handle Continuous Access Evaluation (CAE) challenges. When it can't complete a challenge it will return the 401 (unauthorized) response from ARM.
 
-### Breaking Changes
-
 ### Bugs Fixed
 
-### Other Changes
+- Fixed a serializer issue with nested polymorphics. [PR #19455](https://github.com/Azure/azure-sdk-for-js/pull/19455)
 
 ## 1.3.3 (2021-12-02)
 

package/dist/index.js

@@ -117,7 +117,7 @@ function flattenResponse(fullResponse, responseSpec) {
         body: fullResponse.parsedBody,
         headers: parsedHeaders,
         hasNullableType: isNullable,
-        shouldWrapBody: isPrimitiveBody(fullResponse.parsedBody, expectedBodyTypeName)
+        shouldWrapBody: isPrimitiveBody(fullResponse.parsedBody, expectedBodyTypeName),
     });
 }
 
@@ -172,7 +172,7 @@ class SerializerImpl {
             throw new Error(`"${objectName}" with value "${value}" should satisfy the constraint "${constraintName}": ${constraintValue}.`);
         };
         if (mapper.constraints && value !== undefined && value !== null) {
-            const { ExclusiveMaximum, ExclusiveMinimum, InclusiveMaximum, InclusiveMinimum, MaxItems, MaxLength, MinItems, MinLength, MultipleOf, Pattern, UniqueItems } = mapper.constraints;
+            const { ExclusiveMaximum, ExclusiveMinimum, InclusiveMaximum, InclusiveMinimum, MaxItems, MaxLength, MinItems, MinLength, MultipleOf, Pattern, UniqueItems, } = mapper.constraints;
             if (ExclusiveMaximum !== undefined && value >= ExclusiveMaximum) {
                 failValidation("ExclusiveMaximum", ExclusiveMaximum);
             }
@@ -231,8 +231,8 @@ class SerializerImpl {
             xml: {
                 rootName: (_a = options.xml.rootName) !== null && _a !== void 0 ? _a : "",
                 includeRoot: (_b = options.xml.includeRoot) !== null && _b !== void 0 ? _b : false,
-                xmlCharKey: (_c = options.xml.xmlCharKey) !== null && _c !== void 0 ? _c : XML_CHARKEY
-            }
+                xmlCharKey: (_c = options.xml.xmlCharKey) !== null && _c !== void 0 ? _c : XML_CHARKEY,
+            },
         };
         let payload = {};
         const mapperType = mapper.type.name;
@@ -320,8 +320,8 @@ class SerializerImpl {
             xml: {
                 rootName: (_a = options.xml.rootName) !== null && _a !== void 0 ? _a : "",
                 includeRoot: (_b = options.xml.includeRoot) !== null && _b !== void 0 ? _b : false,
-                xmlCharKey: (_c = options.xml.xmlCharKey) !== null && _c !== void 0 ? _c : XML_CHARKEY
-            }
+                xmlCharKey: (_c = options.xml.xmlCharKey) !== null && _c !== void 0 ? _c : XML_CHARKEY,
+            },
         };
         if (responseBody === undefined || responseBody === null) {
             if (this.isXML && mapper.type.name === "Sequence" && !mapper.xmlIsWrapped) {
@@ -426,9 +426,7 @@ function bufferToBase64Url(buffer) {
     // Uint8Array to Base64.
     const str = encodeByteArray(buffer);
     // Base64 to Base64Url.
-    return trimEnd(str, "=")
-        .replace(/\+/g, "-")
-        .replace(/\//g, "_");
+    return trimEnd(str, "=").replace(/\+/g, "-").replace(/\//g, "_");
 }
 function base64UrlToByteArray(str) {
     if (!str) {
@@ -587,14 +585,21 @@ function serializeDateTypes(typeName, value, objectName) {
     return value;
 }
 function serializeSequenceType(serializer, mapper, object, objectName, isXml, options) {
+    var _a;
     if (!Array.isArray(object)) {
         throw new Error(`${objectName} must be of type Array.`);
     }
-    const elementType = mapper.type.element;
+    let elementType = mapper.type.element;
     if (!elementType || typeof elementType !== "object") {
         throw new Error(`element" metadata for an Array must be defined in the ` +
             `mapper and it must of type "object" in ${objectName}.`);
     }
+    // Quirk: Composite mappers referenced by `element` might
+    // not have *all* properties declared (like uberParent),
+    // so let's try to look up the full definition by name.
+    if (elementType.type.name === "Composite" && elementType.type.className) {
+        elementType = (_a = serializer.modelMappers[elementType.type.className]) !== null && _a !== void 0 ? _a : elementType;
+    }
     const tempArray = [];
     for (let i = 0; i < object.length; i++) {
         const serializedValue = serializer.serialize(elementType, object[i], objectName, options);
@@ -950,8 +955,8 @@ function deserializeDictionaryType(serializer, mapper, responseBody, objectName,
     return responseBody;
 }
 function deserializeSequenceType(serializer, mapper, responseBody, objectName, options) {
-    /* jshint validthis: true */
-    const element = mapper.type.element;
+    var _a;
+    let element = mapper.type.element;
     if (!element || typeof element !== "object") {
         throw new Error(`element" metadata for an Array must be defined in the ` +
             `mapper and it must of type "object" in ${objectName}`);
@@ -961,6 +966,12 @@ function deserializeSequenceType(serializer, mapper, responseBody, objectName, o
             // xml2js will interpret a single element array as just the element, so force it to be an array
             responseBody = [responseBody];
         }
+        // Quirk: Composite mappers referenced by `element` might
+        // not have *all* properties declared (like uberParent),
+        // so let's try to look up the full definition by name.
+        if (element.type.name === "Composite" && element.type.className) {
+            element = (_a = serializer.modelMappers[element.type.className]) !== null && _a !== void 0 ? _a : element;
+        }
         const tempArray = [];
         for (let i = 0; i < responseBody.length; i++) {
             tempArray[i] = serializer.deserialize(element, responseBody[i], `${objectName}[${i}]`, options);
@@ -972,8 +983,12 @@ function deserializeSequenceType(serializer, mapper, responseBody, objectName, o
 function getPolymorphicMapper(serializer, mapper, object, polymorphicPropertyName) {
     const polymorphicDiscriminator = getPolymorphicDiscriminatorRecursively(serializer, mapper);
     if (polymorphicDiscriminator) {
-        const discriminatorName = polymorphicDiscriminator[polymorphicPropertyName];
+        let discriminatorName = polymorphicDiscriminator[polymorphicPropertyName];
         if (discriminatorName) {
+            // The serializedName might have \\, which we just want to ignore
+            if (polymorphicPropertyName === "serializedName") {
+                discriminatorName = discriminatorName.replace(/\\/gi, "");
+            }
             const discriminatorValue = object[discriminatorName];
             if (discriminatorValue !== undefined && discriminatorValue !== null) {
                 const typeName = mapper.type.uberParent || mapper.type.className;
@@ -1018,7 +1033,7 @@ const MapperTypeNames = {
     String: "String",
     Stream: "Stream",
     TimeSpan: "TimeSpan",
-    UnixTime: "UnixTime"
+    UnixTime: "UnixTime",
 };
 
 // Copyright (c) Microsoft Corporation.
@@ -1104,7 +1119,7 @@ function getOperationArgumentValueFromParameter(operationArguments, parameter, f
             const propertyPath = parameterPath[propertyName];
             const propertyValue = getOperationArgumentValueFromParameter(operationArguments, {
                 parameterPath: propertyPath,
-                mapper: propertyMapper
+                mapper: propertyMapper,
             }, fallbackObject);
             if (propertyValue !== undefined) {
                 if (!value) {
@@ -1150,7 +1165,7 @@ const CollectionFormatToDelimiterMap = {
     SSV: " ",
     Multi: "Multi",
     TSV: "\t",
-    Pipes: "|"
+    Pipes: "|",
 };
 function getRequestUrl(baseUri, operationSpec, operationArguments, fallbackObject) {
     const urlReplacements = calculateUrlReplacements(operationSpec, operationArguments, fallbackObject);
@@ -1285,7 +1300,7 @@ function calculateQueryParameters(operationSpec, operationArguments, fallbackObj
     }
     return {
         queryParams: result,
-        sequenceParams
+        sequenceParams,
     };
 }
 function simpleParseQueryParams(queryString) {
@@ -1399,15 +1414,15 @@ function deserializationPolicy(options = {}) {
         xml: {
             rootName: (_e = serializerOptions === null || serializerOptions === void 0 ? void 0 : serializerOptions.xml.rootName) !== null && _e !== void 0 ? _e : "",
             includeRoot: (_f = serializerOptions === null || serializerOptions === void 0 ? void 0 : serializerOptions.xml.includeRoot) !== null && _f !== void 0 ? _f : false,
-            xmlCharKey: (_g = serializerOptions === null || serializerOptions === void 0 ? void 0 : serializerOptions.xml.xmlCharKey) !== null && _g !== void 0 ? _g : XML_CHARKEY
-        }
+            xmlCharKey: (_g = serializerOptions === null || serializerOptions === void 0 ? void 0 : serializerOptions.xml.xmlCharKey) !== null && _g !== void 0 ? _g : XML_CHARKEY,
+        },
     };
     return {
         name: deserializationPolicyName,
         async sendRequest(request, next) {
             const response = await next(request);
             return deserializeResponseBody(jsonContentTypes, xmlContentTypes, response, updatedOptions, parseXML);
-        }
+        },
     };
 }
 function getOperationResponseMap(parsedResponse) {
@@ -1477,7 +1492,7 @@ async function deserializeResponseBody(jsonContentTypes, xmlContentTypes, respon
                 const restError = new coreRestPipeline.RestError(`Error ${deserializeError} occurred in deserializing the responseBody - ${parsedResponse.bodyAsText}`, {
                     statusCode: parsedResponse.status,
                     request: parsedResponse.request,
-                    response: parsedResponse
+                    response: parsedResponse,
                 });
                 throw restError;
             }
@@ -1520,7 +1535,7 @@ function handleErrorResponse(parsedResponse, operationSpec, responseSpec) {
     const error = new coreRestPipeline.RestError(initialErrorMessage, {
         statusCode: parsedResponse.status,
         request: parsedResponse.request,
-        response: parsedResponse
+        response: parsedResponse,
     });
     // If the item failed but there's no error spec or default spec to deserialize the error,
     // we should fail so we just throw the parsed response
@@ -1557,7 +1572,8 @@ function handleErrorResponse(parsedResponse, operationSpec, responseSpec) {
         }
         // If error response has headers, try to deserialize it using default header mapper
         if (parsedResponse.headers && defaultHeadersMapper) {
-            error.response.parsedHeaders = operationSpec.serializer.deserialize(defaultHeadersMapper, parsedResponse.headers.toJSON(), "operationRes.parsedHeaders");
+            error.response.parsedHeaders =
+                operationSpec.serializer.deserialize(defaultHeadersMapper, parsedResponse.headers.toJSON(), "operationRes.parsedHeaders");
         }
     }
     catch (defaultError) {
@@ -1596,7 +1612,7 @@ async function parse(jsonContentTypes, xmlContentTypes, operationResponse, opts,
                 code: errCode,
                 statusCode: operationResponse.status,
                 request: operationResponse.request,
-                response: operationResponse
+                response: operationResponse,
             });
             throw e;
         }
@@ -1626,7 +1642,7 @@ function serializationPolicy(options = {}) {
                 serializeRequestBody(request, operationArguments, operationSpec, stringifyXML);
             }
             return next(request);
-        }
+        },
     };
 }
 /**
@@ -1671,14 +1687,14 @@ function serializeRequestBody(request, operationArguments, operationSpec, string
         xml: {
             rootName: (_b = serializerOptions === null || serializerOptions === void 0 ? void 0 : serializerOptions.xml.rootName) !== null && _b !== void 0 ? _b : "",
             includeRoot: (_c = serializerOptions === null || serializerOptions === void 0 ? void 0 : serializerOptions.xml.includeRoot) !== null && _c !== void 0 ? _c : false,
-            xmlCharKey: (_d = serializerOptions === null || serializerOptions === void 0 ? void 0 : serializerOptions.xml.xmlCharKey) !== null && _d !== void 0 ? _d : XML_CHARKEY
-        }
+            xmlCharKey: (_d = serializerOptions === null || serializerOptions === void 0 ? void 0 : serializerOptions.xml.xmlCharKey) !== null && _d !== void 0 ? _d : XML_CHARKEY,
+        },
     };
     const xmlCharKey = updatedOptions.xml.xmlCharKey;
     if (operationSpec.requestBody && operationSpec.requestBody.mapper) {
         request.body = getOperationArgumentValueFromParameter(operationArguments, operationSpec.requestBody);
         const bodyMapper = operationSpec.requestBody.mapper;
-        const { required, serializedName, xmlName, xmlElementName, xmlNamespace, xmlNamespacePrefix, nullable } = bodyMapper;
+        const { required, serializedName, xmlName, xmlElementName, xmlNamespace, xmlNamespacePrefix, nullable, } = bodyMapper;
         const typeName = bodyMapper.type.name;
         try {
             if ((request.body !== undefined && request.body !== null) ||
@@ -1696,7 +1712,7 @@ function serializeRequestBody(request, operationArguments, operationSpec, string
                     else if (!isStream) {
                         request.body = stringifyXML(value, {
                             rootName: xmlName || serializedName,
-                            xmlCharKey
+                            xmlCharKey,
                         });
                     }
                 }
@@ -1764,12 +1780,12 @@ function createClientPipeline(options = {}) {
     if (options.credentialOptions) {
         pipeline.addPolicy(coreRestPipeline.bearerTokenAuthenticationPolicy({
             credential: options.credentialOptions.credential,
-            scopes: options.credentialOptions.credentialScopes
+            scopes: options.credentialOptions.credentialScopes,
         }));
     }
     pipeline.addPolicy(serializationPolicy(options.serializationOptions), { phase: "Serialize" });
     pipeline.addPolicy(deserializationPolicy(options.deserializationOptions), {
-        phase: "Deserialize"
+        phase: "Deserialize",
     });
     return pipeline;
 }
@@ -1813,7 +1829,7 @@ class ServiceClient {
         // not part of OperationArguments
         const url = getRequestUrl(baseUri, operationSpec, operationArguments, this);
         const request = coreRestPipeline.createPipelineRequest({
-            url
+            url,
         });
         request.method = operationSpec.httpMethod;
         const operationInfo = getOperationRequestInfo(request);
@@ -1953,7 +1969,7 @@ async function authorizeRequestOnClaimChallenge(onChallengeOptions) {
         return false;
     }
     const accessToken = await onChallengeOptions.getAccessToken(parsedChallenge.scope ? [parsedChallenge.scope] : scopes, {
-        claims: decodeStringToString(parsedChallenge.claims)
+        claims: decodeStringToString(parsedChallenge.claims),
     });
     if (!accessToken) {
         return false;