@azure/core-client 1.6.1-alpha.20220601.1 → 1.6.2-alpha.20220805.4

package/dist/index.js

@@ -980,7 +980,30 @@ function deserializeSequenceType(serializer, mapper, responseBody, objectName, o
     }
     return responseBody;
 }
+function getIndexDiscriminator(discriminators, discriminatorValue, typeName) {
+    const typeNamesToCheck = [typeName];
+    while (typeNamesToCheck.length) {
+        const currentName = typeNamesToCheck.shift();
+        const indexDiscriminator = discriminatorValue === currentName
+            ? discriminatorValue
+            : currentName + "." + discriminatorValue;
+        if (Object.prototype.hasOwnProperty.call(discriminators, indexDiscriminator)) {
+            return discriminators[indexDiscriminator];
+        }
+        else {
+            for (const [name, mapper] of Object.entries(discriminators)) {
+                if (name.startsWith(currentName + ".") &&
+                    mapper.type.uberParent === currentName &&
+                    mapper.type.className) {
+                    typeNamesToCheck.push(mapper.type.className);
+                }
+            }
+        }
+    }
+    return undefined;
+}
 function getPolymorphicMapper(serializer, mapper, object, polymorphicPropertyName) {
+    var _a;
     const polymorphicDiscriminator = getPolymorphicDiscriminatorRecursively(serializer, mapper);
     if (polymorphicDiscriminator) {
         let discriminatorName = polymorphicDiscriminator[polymorphicPropertyName];
@@ -990,12 +1013,9 @@ function getPolymorphicMapper(serializer, mapper, object, polymorphicPropertyNam
                 discriminatorName = discriminatorName.replace(/\\/gi, "");
             }
             const discriminatorValue = object[discriminatorName];
-            if (discriminatorValue !== undefined && discriminatorValue !== null) {
-                const typeName = mapper.type.uberParent || mapper.type.className;
-                const indexDiscriminator = discriminatorValue === typeName
-                    ? discriminatorValue
-                    : typeName + "." + discriminatorValue;
-                const polymorphicMapper = serializer.modelMappers.discriminators[indexDiscriminator];
+            const typeName = (_a = mapper.type.uberParent) !== null && _a !== void 0 ? _a : mapper.type.className;
+            if (typeof discriminatorValue === "string" && typeName) {
+                const polymorphicMapper = getIndexDiscriminator(serializer.modelMappers.discriminators, discriminatorValue, typeName);
                 if (polymorphicMapper) {
                     mapper = polymorphicMapper;
                 }