@azure/search-documents 11.3.1 → 11.3.2

package/dist/index.js

@@ -2,17 +2,40 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
 var tslib = require('tslib');
-var coreHttp = require('@azure/core-http');
+var coreRestPipeline = require('@azure/core-rest-pipeline');
+var coreClient = require('@azure/core-client');
 var coreAuth = require('@azure/core-auth');
 var logger$1 = require('@azure/logger');
 var coreTracing = require('@azure/core-tracing');
-var EventEmitter = _interopDefault(require('events'));
+var EventEmitter = require('events');
 var util = require('util');
 var fs = require('fs');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+function _interopNamespace(e) {
+    if (e && e.__esModule) return e;
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n["default"] = e;
+    return Object.freeze(n);
+}
+
+var coreClient__namespace = /*#__PURE__*/_interopNamespace(coreClient);
+var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
+var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
+
 /*
  * Copyright (c) Microsoft Corporation.
  * Licensed under the MIT License.
@@ -20,7 +43,7 @@ var fs = require('fs');
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-const SearchError = {
+const SearchError$1 = {
     type: {
         name: "Composite",
         className: "SearchError",
@@ -643,9 +666,9 @@ const AutocompleteRequest = {
     }
 };
 
-var Mappers = /*#__PURE__*/Object.freeze({
+var Mappers$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    SearchError: SearchError,
+    SearchError: SearchError$1,
     SearchDocumentsResult: SearchDocumentsResult,
     FacetResult: FacetResult,
     SearchRequest: SearchRequest,
@@ -669,7 +692,7 @@ var Mappers = /*#__PURE__*/Object.freeze({
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-const accept = {
+const accept$1 = {
     parameterPath: "accept",
     mapper: {
         defaultValue: "application/json",
@@ -680,7 +703,7 @@ const accept = {
         }
     }
 };
-const endpoint = {
+const endpoint$1 = {
     parameterPath: "endpoint",
     mapper: {
         serializedName: "endpoint",
@@ -691,7 +714,7 @@ const endpoint = {
     },
     skipEncoding: true
 };
-const indexName = {
+const indexName$1 = {
     parameterPath: "indexName",
     mapper: {
         serializedName: "indexName",
@@ -701,16 +724,7 @@ const indexName = {
         }
     }
 };
-const xMsClientRequestId = {
-    parameterPath: ["options", "requestOptionsParam", "xMsClientRequestId"],
-    mapper: {
-        serializedName: "x-ms-client-request-id",
-        type: {
-            name: "Uuid"
-        }
-    }
-};
-const apiVersion = {
+const apiVersion$1 = {
     parameterPath: "apiVersion",
     mapper: {
         serializedName: "api-version",
@@ -751,7 +765,7 @@ const facets = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Multi
+    collectionFormat: "Multi"
 };
 const filter = {
     parameterPath: ["options", "searchOptions", "filter"],
@@ -775,7 +789,7 @@ const highlightFields = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const highlightPostTag = {
     parameterPath: ["options", "searchOptions", "highlightPostTag"],
@@ -817,7 +831,7 @@ const orderBy = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const queryType = {
     parameterPath: ["options", "searchOptions", "queryType"],
@@ -842,7 +856,7 @@ const scoringParameters = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Multi
+    collectionFormat: "Multi"
 };
 const scoringProfile = {
     parameterPath: ["options", "searchOptions", "scoringProfile"],
@@ -866,7 +880,7 @@ const searchFields = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const searchMode = {
     parameterPath: ["options", "searchOptions", "searchMode"],
@@ -897,7 +911,7 @@ const sessionId = {
         }
     }
 };
-const select = {
+const select$1 = {
     parameterPath: ["options", "searchOptions", "select"],
     mapper: {
         serializedName: "$select",
@@ -910,7 +924,7 @@ const select = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const skip = {
     parameterPath: ["options", "searchOptions", "skip"],
@@ -930,7 +944,7 @@ const top = {
         }
     }
 };
-const contentType = {
+const contentType$1 = {
     parameterPath: ["options", "contentType"],
     mapper: {
         defaultValue: "application/json",
@@ -968,7 +982,7 @@ const selectedFields = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const searchText1 = {
     parameterPath: "searchText",
@@ -1048,7 +1062,7 @@ const orderBy1 = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const searchFields1 = {
     parameterPath: ["options", "suggestOptions", "searchFields"],
@@ -1063,7 +1077,7 @@ const searchFields1 = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const select1 = {
     parameterPath: ["options", "suggestOptions", "select"],
@@ -1078,7 +1092,7 @@ const select1 = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const top1 = {
     parameterPath: ["options", "suggestOptions", "top"],
@@ -1165,7 +1179,7 @@ const searchFields2 = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const top2 = {
     parameterPath: ["options", "autocompleteOptions", "top"],
@@ -1189,7 +1203,7 @@ const autocompleteRequest = {
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 /** Class representing a Documents. */
-class Documents {
+class DocumentsImpl {
     /**
      * Initialize a new instance of the class Documents class.
      * @param client Reference to the service client
@@ -1202,20 +1216,14 @@ class Documents {
      * @param options The options parameters.
      */
     count(options) {
-        const operationArguments = {
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, countOperationSpec);
+        return this.client.sendOperationRequest({ options }, countOperationSpec);
     }
     /**
      * Searches for documents in the index.
      * @param options The options parameters.
      */
     searchGet(options) {
-        const operationArguments = {
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, searchGetOperationSpec);
+        return this.client.sendOperationRequest({ options }, searchGetOperationSpec);
     }
     /**
      * Searches for documents in the index.
@@ -1223,11 +1231,7 @@ class Documents {
      * @param options The options parameters.
      */
     searchPost(searchRequest, options) {
-        const operationArguments = {
-            searchRequest,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, searchPostOperationSpec);
+        return this.client.sendOperationRequest({ searchRequest, options }, searchPostOperationSpec);
     }
     /**
      * Retrieves a document from the index.
@@ -1235,11 +1239,7 @@ class Documents {
      * @param options The options parameters.
      */
     get(key, options) {
-        const operationArguments = {
-            key,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getOperationSpec);
+        return this.client.sendOperationRequest({ key, options }, getOperationSpec$5);
     }
     /**
      * Suggests documents in the index that match the given partial query text.
@@ -1250,12 +1250,7 @@ class Documents {
      * @param options The options parameters.
      */
     suggestGet(searchText, suggesterName, options) {
-        const operationArguments = {
-            searchText,
-            suggesterName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, suggestGetOperationSpec);
+        return this.client.sendOperationRequest({ searchText, suggesterName, options }, suggestGetOperationSpec);
     }
     /**
      * Suggests documents in the index that match the given partial query text.
@@ -1263,11 +1258,7 @@ class Documents {
      * @param options The options parameters.
      */
     suggestPost(suggestRequest, options) {
-        const operationArguments = {
-            suggestRequest,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, suggestPostOperationSpec);
+        return this.client.sendOperationRequest({ suggestRequest, options }, suggestPostOperationSpec);
     }
     /**
      * Sends a batch of document write actions to the index.
@@ -1275,11 +1266,7 @@ class Documents {
      * @param options The options parameters.
      */
     index(batch, options) {
-        const operationArguments = {
-            batch,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, indexOperationSpec);
+        return this.client.sendOperationRequest({ batch, options }, indexOperationSpec);
     }
     /**
      * Autocompletes incomplete query terms based on input text and matching terms in the index.
@@ -1289,12 +1276,7 @@ class Documents {
      * @param options The options parameters.
      */
     autocompleteGet(searchText, suggesterName, options) {
-        const operationArguments = {
-            searchText,
-            suggesterName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, autocompleteGetOperationSpec);
+        return this.client.sendOperationRequest({ searchText, suggesterName, options }, autocompleteGetOperationSpec);
     }
     /**
      * Autocompletes incomplete query terms based on input text and matching terms in the index.
@@ -1302,15 +1284,11 @@ class Documents {
      * @param options The options parameters.
      */
     autocompletePost(autocompleteRequest, options) {
-        const operationArguments = {
-            autocompleteRequest,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, autocompletePostOperationSpec);
+        return this.client.sendOperationRequest({ autocompleteRequest, options }, autocompletePostOperationSpec);
     }
 }
 // Operation Specifications
-const serializer = new coreHttp.Serializer(Mappers, /* isXml */ false);
+const serializer$6 = coreClient__namespace.createSerializer(Mappers$1, /* isXml */ false);
 const countOperationSpec = {
     path: "/docs/$count",
     httpMethod: "GET",
@@ -1319,13 +1297,13 @@ const countOperationSpec = {
             bodyMapper: { type: { name: "Number" } }
         },
         default: {
-            bodyMapper: SearchError
+            bodyMapper: SearchError$1
         }
     },
-    queryParameters: [apiVersion],
-    urlParameters: [endpoint, indexName],
-    headerParameters: [accept, xMsClientRequestId],
-    serializer
+    queryParameters: [apiVersion$1],
+    urlParameters: [endpoint$1, indexName$1],
+    headerParameters: [accept$1],
+    serializer: serializer$6
 };
 const searchGetOperationSpec = {
     path: "/docs",
@@ -1335,11 +1313,11 @@ const searchGetOperationSpec = {
             bodyMapper: SearchDocumentsResult
         },
         default: {
-            bodyMapper: SearchError
+            bodyMapper: SearchError$1
         }
     },
     queryParameters: [
-        apiVersion,
+        apiVersion$1,
         searchText,
         includeTotalResultCount,
         facets,
@@ -1356,13 +1334,13 @@ const searchGetOperationSpec = {
         searchMode,
         scoringStatistics,
         sessionId,
-        select,
+        select$1,
         skip,
         top
     ],
-    urlParameters: [endpoint, indexName],
-    headerParameters: [accept, xMsClientRequestId],
-    serializer
+    urlParameters: [endpoint$1, indexName$1],
+    headerParameters: [accept$1],
+    serializer: serializer$6
 };
 const searchPostOperationSpec = {
     path: "/docs/search.post.search",
@@ -1372,21 +1350,17 @@ const searchPostOperationSpec = {
             bodyMapper: SearchDocumentsResult
         },
         default: {
-            bodyMapper: SearchError
+            bodyMapper: SearchError$1
         }
     },
     requestBody: searchRequest,
-    queryParameters: [apiVersion],
-    urlParameters: [endpoint, indexName],
-    headerParameters: [
-        accept,
-        xMsClientRequestId,
-        contentType
-    ],
+    queryParameters: [apiVersion$1],
+    urlParameters: [endpoint$1, indexName$1],
+    headerParameters: [accept$1, contentType$1],
     mediaType: "json",
-    serializer
+    serializer: serializer$6
 };
-const getOperationSpec = {
+const getOperationSpec$5 = {
     path: "/docs('{key}')",
     httpMethod: "GET",
     responses: {
@@ -1394,13 +1368,13 @@ const getOperationSpec = {
             bodyMapper: { type: { name: "any" } }
         },
         default: {
-            bodyMapper: SearchError
+            bodyMapper: SearchError$1
         }
     },
-    queryParameters: [apiVersion, selectedFields],
-    urlParameters: [endpoint, indexName, key],
-    headerParameters: [accept, xMsClientRequestId],
-    serializer
+    queryParameters: [apiVersion$1, selectedFields],
+    urlParameters: [endpoint$1, indexName$1, key],
+    headerParameters: [accept$1],
+    serializer: serializer$6
 };
 const suggestGetOperationSpec = {
     path: "/docs/search.suggest",
@@ -1410,11 +1384,11 @@ const suggestGetOperationSpec = {
             bodyMapper: SuggestDocumentsResult
         },
         default: {
-            bodyMapper: SearchError
+            bodyMapper: SearchError$1
         }
     },
     queryParameters: [
-        apiVersion,
+        apiVersion$1,
         searchText1,
         suggesterName,
         filter1,
@@ -1427,9 +1401,9 @@ const suggestGetOperationSpec = {
         select1,
         top1
     ],
-    urlParameters: [endpoint, indexName],
-    headerParameters: [accept, xMsClientRequestId],
-    serializer
+    urlParameters: [endpoint$1, indexName$1],
+    headerParameters: [accept$1],
+    serializer: serializer$6
 };
 const suggestPostOperationSpec = {
     path: "/docs/search.post.suggest",
@@ -1439,19 +1413,15 @@ const suggestPostOperationSpec = {
             bodyMapper: SuggestDocumentsResult
         },
         default: {
-            bodyMapper: SearchError
+            bodyMapper: SearchError$1
         }
     },
     requestBody: suggestRequest,
-    queryParameters: [apiVersion],
-    urlParameters: [endpoint, indexName],
-    headerParameters: [
-        accept,
-        xMsClientRequestId,
-        contentType
-    ],
+    queryParameters: [apiVersion$1],
+    urlParameters: [endpoint$1, indexName$1],
+    headerParameters: [accept$1, contentType$1],
     mediaType: "json",
-    serializer
+    serializer: serializer$6
 };
 const indexOperationSpec = {
     path: "/docs/search.index",
@@ -1464,19 +1434,15 @@ const indexOperationSpec = {
             bodyMapper: IndexDocumentsResult
         },
         default: {
-            bodyMapper: SearchError
+            bodyMapper: SearchError$1
         }
     },
     requestBody: batch,
-    queryParameters: [apiVersion],
-    urlParameters: [endpoint, indexName],
-    headerParameters: [
-        accept,
-        xMsClientRequestId,
-        contentType
-    ],
+    queryParameters: [apiVersion$1],
+    urlParameters: [endpoint$1, indexName$1],
+    headerParameters: [accept$1, contentType$1],
     mediaType: "json",
-    serializer
+    serializer: serializer$6
 };
 const autocompleteGetOperationSpec = {
     path: "/docs/search.autocomplete",
@@ -1486,11 +1452,11 @@ const autocompleteGetOperationSpec = {
             bodyMapper: AutocompleteResult
         },
         default: {
-            bodyMapper: SearchError
+            bodyMapper: SearchError$1
         }
     },
     queryParameters: [
-        apiVersion,
+        apiVersion$1,
         searchText1,
         suggesterName,
         autocompleteMode,
@@ -1502,9 +1468,9 @@ const autocompleteGetOperationSpec = {
         searchFields2,
         top2
     ],
-    urlParameters: [endpoint, indexName],
-    headerParameters: [accept, xMsClientRequestId],
-    serializer
+    urlParameters: [endpoint$1, indexName$1],
+    headerParameters: [accept$1],
+    serializer: serializer$6
 };
 const autocompletePostOperationSpec = {
     path: "/docs/search.post.autocomplete",
@@ -1514,19 +1480,15 @@ const autocompletePostOperationSpec = {
             bodyMapper: AutocompleteResult
         },
         default: {
-            bodyMapper: SearchError
+            bodyMapper: SearchError$1
         }
     },
     requestBody: autocompleteRequest,
-    queryParameters: [apiVersion],
-    urlParameters: [endpoint, indexName],
-    headerParameters: [
-        accept,
-        xMsClientRequestId,
-        contentType
-    ],
+    queryParameters: [apiVersion$1],
+    urlParameters: [endpoint$1, indexName$1],
+    headerParameters: [accept$1, contentType$1],
     mediaType: "json",
-    serializer
+    serializer: serializer$6
 };
 
 /*
@@ -1536,10 +1498,8 @@ const autocompletePostOperationSpec = {
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-const packageName = "@azure/search-documents";
-const packageVersion = "11.3.1";
 /** @internal */
-class SearchClientContext extends coreHttp.ServiceClient {
+class SearchClientContext extends coreClient__namespace.ServiceClient {
     /**
      * Initializes a new instance of the SearchClientContext class.
      * @param endpoint The endpoint URL of the search service.
@@ -1561,13 +1521,11 @@ class SearchClientContext extends coreHttp.ServiceClient {
         if (!options) {
             options = {};
         }
-        if (!options.userAgent) {
-            const defaultUserAgent = coreHttp.getDefaultUserAgentValue();
-            options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
-        }
-        super(undefined, options);
-        this.requestContentType = "application/json; charset=utf-8";
-        this.baseUri = options.endpoint || "{endpoint}/indexes('{indexName}')";
+        const defaults = {
+            requestContentType: "application/json; charset=utf-8"
+        };
+        const optionsWithDefaults = Object.assign(Object.assign(Object.assign({}, defaults), options), { baseUri: options.endpoint || "{endpoint}/indexes('{indexName}')" });
+        super(optionsWithDefaults);
         // Parameter assignments
         this.endpoint = endpoint;
         this.indexName = indexName;
@@ -1583,7 +1541,7 @@ class SearchClientContext extends coreHttp.ServiceClient {
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 /** @internal */
-class SearchClient extends SearchClientContext {
+class SearchClient$1 extends SearchClientContext {
     /**
      * Initializes a new instance of the SearchClient class.
      * @param endpoint The endpoint URL of the search service.
@@ -1593,44 +1551,29 @@ class SearchClient extends SearchClientContext {
      */
     constructor(endpoint, indexName, apiVersion, options) {
         super(endpoint, indexName, apiVersion, options);
-        this.documents = new Documents(this);
+        this.documents = new DocumentsImpl(this);
     }
 }
 
 // Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 const API_KEY_HEADER_NAME = "api-key";
+const searchApiKeyCredentialPolicy = "SearchApiKeyCredentialPolicy";
 /**
  * Create an HTTP pipeline policy to authenticate a request
  * using an `AzureKeyCredential` for Azure Cognitive Search
  */
 function createSearchApiKeyCredentialPolicy(credential) {
     return {
-        create: (nextPolicy, options) => {
-            return new SearchApiKeyCredentialPolicy(nextPolicy, options, credential);
-        }
+        name: searchApiKeyCredentialPolicy,
+        async sendRequest(request, next) {
+            if (!request.headers.has(API_KEY_HEADER_NAME)) {
+                request.headers.set(API_KEY_HEADER_NAME, credential.key);
+            }
+            return next(request);
+        },
     };
 }
-/**
- * A concrete implementation of an AzureKeyCredential policy
- * using the appropriate header for Azure Cognitive Search
- */
-class SearchApiKeyCredentialPolicy extends coreHttp.BaseRequestPolicy {
-    constructor(nextPolicy, options, credential) {
-        super(nextPolicy, options);
-        this.credential = credential;
-    }
-    async sendRequest(webResource) {
-        if (!webResource) {
-            throw new Error("webResource cannot be null or undefined");
-        }
-        webResource.headers.set(API_KEY_HEADER_NAME, this.credential.key);
-        return this._nextPolicy.sendRequest(webResource);
-    }
-}
-
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-const SDK_VERSION = "11.3.1";
 
 // Copyright (c) Microsoft Corporation.
 /**
@@ -1640,17 +1583,18 @@ const logger = logger$1.createClientLogger("search");
 
 // Copyright (c) Microsoft Corporation.
 /**
- * Creates a span using the global tracer.
+ * Creates a tracing client using the global tracer.
  * @internal
  */
-const createSpan = coreTracing.createSpanFunction({
-    packagePrefix: "Azure.Search",
-    namespace: "Microsoft.Search"
+const tracingClient = coreTracing.createTracingClient({
+    namespace: "Microsoft.Search",
+    packageName: "Azure.Search",
 });
+const createSpan = tracingClient.startSpan;
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-const WorldGeodeticSystem1984 = "EPSG:4326"; // See https://epsg.io/4326
+const WorldGeodeticSystem1984$1 = "EPSG:4326"; // See https://epsg.io/4326
 /**
  * Represents a geographic point in global coordinates.
  */
@@ -1671,15 +1615,15 @@ class GeographyPoint {
         return {
             type: "Point",
             coordinates: [this.longitude, this.latitude],
-            crs: { type: "name", properties: { name: WorldGeodeticSystem1984 } }
+            crs: { type: "name", properties: { name: WorldGeodeticSystem1984$1 } },
         };
     }
 }
 
 // Copyright (c) Microsoft Corporation.
-const ISO8601DateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{3})?Z$/i;
+const ISO8601DateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{1,3})?Z$/i;
 const GeoJSONPointTypeName = "Point";
-const WorldGeodeticSystem1984$1 = "EPSG:4326"; // See https://epsg.io/4326
+const WorldGeodeticSystem1984 = "EPSG:4326"; // See https://epsg.io/4326
 function serialize(obj) {
     return walk(obj, (value) => {
         const result = serializeSpecialNumbers(value);
@@ -1699,7 +1643,7 @@ function walk(start, mapper) {
     const seenMarker = new WeakMap();
     const result = { value: undefined };
     const queue = [
-        { value: start, parent: result, key: "value" }
+        { value: start, parent: result, key: "value" },
     ];
     while (queue.length) {
         const current = queue.shift();
@@ -1720,7 +1664,7 @@ function walk(start, mapper) {
                 queue.push({
                     value: mapped[key],
                     parent: mapped,
-                    key
+                    key,
                 });
             }
         }
@@ -1784,7 +1728,7 @@ function isGeoJSONPoint(obj) {
                 default:
                     return false;
             }
-        }
+        },
     });
 }
 function isCoordinateArray(maybeCoordinates) {
@@ -1811,7 +1755,7 @@ function isCrs(maybeCrs) {
                 default:
                     return false;
             }
-        }
+        },
     });
 }
 function isCrsProperties(maybeProperties) {
@@ -1819,12 +1763,12 @@ function isCrsProperties(maybeProperties) {
         requiredKeys: ["name"],
         propertyValidator: (key) => {
             if (key === "name") {
-                return maybeProperties.name === WorldGeodeticSystem1984$1;
+                return maybeProperties.name === WorldGeodeticSystem1984;
             }
             else {
                 return false;
             }
-        }
+        },
     });
 }
 function isValidObject(obj, options = {}) {
@@ -1850,28 +1794,22 @@ function isValidObject(obj, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 const AcceptHeaderName = "Accept";
+const odataMetadataPolicy = "OdataMetadataPolicy";
 /**
  * A policy factory for setting the Accept header to ignore odata metadata
  * @internal
  */
-function odataMetadataPolicy(metadataLevel) {
+function createOdataMetadataPolicy(metadataLevel) {
     return {
-        create: (nextPolicy, options) => {
-            return new OdataMetadataPolicy(nextPolicy, options, { metadataLevel });
-        }
+        name: odataMetadataPolicy,
+        async sendRequest(request, next) {
+            request.headers.set(AcceptHeaderName, `application/json;odata.metadata=${metadataLevel}`);
+            return next(request);
+        },
     };
 }
-class OdataMetadataPolicy extends coreHttp.BaseRequestPolicy {
-    constructor(nextPolicy, options, policyOptions) {
-        super(nextPolicy, options);
-        this.metadataLevel = policyOptions.metadataLevel;
-    }
-    async sendRequest(webResource) {
-        webResource.headers.set(AcceptHeaderName, `application/json;odata.metadata=${this.metadataLevel}`);
-        return this._nextPolicy.sendRequest(webResource);
-    }
-}
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -1921,7 +1859,7 @@ class IndexDocumentsBatch {
             const batch = keyValues.map((keyValue) => {
                 return {
                     __actionType: "delete",
-                    [keyName]: keyValue
+                    [keyName]: keyValue,
                 };
             });
             this.actions.push(...batch);
@@ -1958,6 +1896,11 @@ function decode(value) {
 function isComplexField(field) {
     return field.type === "Edm.ComplexType" || field.type === "Collection(Edm.ComplexType)";
 }
+/**
+ * Defines values for TokenizerName.
+ * @readonly
+ */
+exports.KnownTokenizerNames = void 0;
 (function (KnownTokenizerNames) {
     /**
      * Grammar-based tokenizer that is suitable for processing most European-language documents. See
@@ -2026,6 +1969,11 @@ function isComplexField(field) {
      */
     KnownTokenizerNames["Whitespace"] = "whitespace";
 })(exports.KnownTokenizerNames || (exports.KnownTokenizerNames = {}));
+/**
+ * Defines values for TokenFilterName.
+ * @readonly
+ */
+exports.KnownTokenFilterNames = void 0;
 (function (KnownTokenFilterNames) {
     /**
      * A token filter that applies the Arabic normalizer to normalize the orthography. See
@@ -2204,6 +2152,11 @@ function isComplexField(field) {
      */
     KnownTokenFilterNames["WordDelimiter"] = "word_delimiter";
 })(exports.KnownTokenFilterNames || (exports.KnownTokenFilterNames = {}));
+/**
+ * Defines values for CharFilterName.
+ * @readonly
+ */
+exports.KnownCharFilterNames = void 0;
 (function (KnownCharFilterNames) {
     /**
      * A character filter that attempts to strip out HTML constructs. See
@@ -2211,6 +2164,12 @@ function isComplexField(field) {
      */
     KnownCharFilterNames["HtmlStrip"] = "html_strip";
 })(exports.KnownCharFilterNames || (exports.KnownCharFilterNames = {}));
+/**
+ * Defines values for AnalyzerName.
+ * See https://docs.microsoft.com/rest/api/searchservice/Language-support
+ * @readonly
+ */
+exports.KnownAnalyzerNames = void 0;
 (function (KnownAnalyzerNames) {
     /**
      * Arabic
@@ -2718,28 +2677,28 @@ function convertFieldsToPublic(fields) {
         return fields;
     }
     return fields.map((field) => {
-        let result;
         if (field.type === "Collection(Edm.ComplexType)" || field.type === "Edm.ComplexType") {
-            return {
+            const result = {
                 name: field.name,
                 type: field.type,
-                fields: convertFieldsToPublic(field.fields)
+                fields: convertFieldsToPublic(field.fields),
             };
+            return result;
         }
         else {
+            const { synonymMaps, retrievable } = field, restField = tslib.__rest(field, ["synonymMaps", "retrievable"]);
+            const type = field.type;
+            const hidden = typeof retrievable === "boolean" ? !retrievable : retrievable;
             const analyzerName = field.analyzer;
             const searchAnalyzerName = field.searchAnalyzer;
             const indexAnalyzerName = field.indexAnalyzer;
-            const synonymMapNames = field.synonymMaps;
-            const { retrievable } = field, restField = tslib.__rest(field, ["retrievable"]);
-            const hidden = typeof retrievable === "boolean" ? !retrievable : retrievable;
-            result = Object.assign(Object.assign({}, restField), { hidden,
+            const result = Object.assign(Object.assign({}, restField), { type,
+                hidden,
                 analyzerName,
                 searchAnalyzerName,
-                indexAnalyzerName,
-                synonymMapNames });
+                indexAnalyzerName, synonymMapNames: synonymMaps });
+            return result;
         }
-        return result;
     });
 }
 function convertFieldsToGenerated(fields) {
@@ -2749,7 +2708,7 @@ function convertFieldsToGenerated(fields) {
             return {
                 name: field.name,
                 type: field.type,
-                fields: convertFieldsToGenerated(field.fields)
+                fields: convertFieldsToGenerated(field.fields),
             };
         }
         else {
@@ -2810,17 +2769,6 @@ function convertSimilarityToPublic(similarity) {
         return similarity;
     }
 }
-function extractOperationOptions(obj) {
-    const { abortSignal, requestOptions, tracingOptions } = obj, restOptions = tslib.__rest(obj, ["abortSignal", "requestOptions", "tracingOptions"]);
-    return {
-        operationOptions: {
-            abortSignal,
-            requestOptions,
-            tracingOptions
-        },
-        restOptions
-    };
-}
 function convertEncryptionKeyToPublic(encryptionKey) {
     if (!encryptionKey) {
         return encryptionKey;
@@ -2828,7 +2776,7 @@ function convertEncryptionKeyToPublic(encryptionKey) {
     const result = {
         keyName: encryptionKey.keyName,
         keyVersion: encryptionKey.keyVersion,
-        vaultUrl: encryptionKey.vaultUri
+        vaultUrl: encryptionKey.vaultUri,
     };
     if (encryptionKey.accessCredentials) {
         result.applicationId = encryptionKey.accessCredentials.applicationId;
@@ -2843,12 +2791,12 @@ function convertEncryptionKeyToGenerated(encryptionKey) {
     const result = {
         keyName: encryptionKey.keyName,
         keyVersion: encryptionKey.keyVersion,
-        vaultUri: encryptionKey.vaultUrl
+        vaultUri: encryptionKey.vaultUrl,
     };
     if (encryptionKey.applicationId) {
         result.accessCredentials = {
             applicationId: encryptionKey.applicationId,
-            applicationSecret: encryptionKey.applicationSecret
+            applicationSecret: encryptionKey.applicationSecret,
         };
     }
     return result;
@@ -2867,7 +2815,7 @@ function generatedIndexToPublicIndex(generatedIndex) {
         charFilters: generatedIndex.charFilters,
         scoringProfiles: generatedIndex.scoringProfiles,
         fields: convertFieldsToPublic(generatedIndex.fields),
-        similarity: convertSimilarityToPublic(generatedIndex.similarity)
+        similarity: convertSimilarityToPublic(generatedIndex.similarity),
     };
 }
 function generatedSearchResultToPublicSearchResult(results) {
@@ -2877,7 +2825,9 @@ function generatedSearchResultToPublicSearchResult(results) {
         const obj = {
             score: _score,
             highlights: _highlights,
-            document: doc
+            rerankerScore,
+            captions,
+            document: doc,
         };
         return obj;
     });
@@ -2889,43 +2839,23 @@ function generatedSuggestDocumentsResultToPublicSuggestDocumentsResult(searchDoc
         const doc = Object.assign({}, restProps);
         const obj = {
             text: _text,
-            document: doc
+            document: doc,
         };
         return obj;
     });
     const result = {
         results: results,
-        coverage: searchDocumentsResult.coverage
+        coverage: searchDocumentsResult.coverage,
     };
     return result;
 }
 function publicIndexToGeneratedIndex(index) {
-    return {
-        name: index.name,
-        defaultScoringProfile: index.defaultScoringProfile,
-        corsOptions: index.corsOptions,
-        suggesters: index.suggesters,
-        encryptionKey: convertEncryptionKeyToGenerated(index.encryptionKey),
-        etag: index.etag,
-        tokenFilters: convertTokenFiltersToGenerated(index.tokenFilters),
-        charFilters: index.charFilters,
-        scoringProfiles: index.scoringProfiles,
-        analyzers: convertAnalyzersToGenerated(index.analyzers),
-        tokenizers: convertTokenizersToGenerated(index.tokenizers),
-        fields: convertFieldsToGenerated(index.fields),
-        similarity: convertSimilarityToGenerated(index.similarity)
-    };
+    const { encryptionKey, tokenFilters, analyzers, tokenizers, fields, similarity } = index, props = tslib.__rest(index, ["encryptionKey", "tokenFilters", "analyzers", "tokenizers", "fields", "similarity"]);
+    return Object.assign(Object.assign({}, props), { encryptionKey: convertEncryptionKeyToGenerated(encryptionKey), tokenFilters: convertTokenFiltersToGenerated(tokenFilters), analyzers: convertAnalyzersToGenerated(analyzers), tokenizers: convertTokenizersToGenerated(tokenizers), fields: convertFieldsToGenerated(fields), similarity: convertSimilarityToGenerated(similarity) });
 }
 function generatedSkillsetToPublicSkillset(generatedSkillset) {
-    return {
-        name: generatedSkillset.name,
-        description: generatedSkillset.description,
-        skills: convertSkillsToPublic(generatedSkillset.skills),
-        cognitiveServicesAccount: convertCognitiveServicesAccountToPublic(generatedSkillset.cognitiveServicesAccount),
-        knowledgeStore: generatedSkillset.knowledgeStore,
-        etag: generatedSkillset.etag,
-        encryptionKey: convertEncryptionKeyToPublic(generatedSkillset.encryptionKey)
-    };
+    const { skills, cognitiveServicesAccount, encryptionKey } = generatedSkillset, props = tslib.__rest(generatedSkillset, ["skills", "cognitiveServicesAccount", "encryptionKey"]);
+    return Object.assign(Object.assign({}, props), { skills: convertSkillsToPublic(skills), cognitiveServicesAccount: convertCognitiveServicesAccountToPublic(cognitiveServicesAccount), encryptionKey: convertEncryptionKeyToPublic(encryptionKey) });
 }
 function publicSkillsetToGeneratedSkillset(skillset) {
     return {
@@ -2935,7 +2865,7 @@ function publicSkillsetToGeneratedSkillset(skillset) {
         skills: skillset.skills,
         cognitiveServicesAccount: convertCognitiveServicesAccountToGenerated(skillset.cognitiveServicesAccount),
         knowledgeStore: skillset.knowledgeStore,
-        encryptionKey: convertEncryptionKeyToGenerated(skillset.encryptionKey)
+        encryptionKey: convertEncryptionKeyToGenerated(skillset.encryptionKey),
     };
 }
 function generatedSynonymMapToPublicSynonymMap(synonymMap) {
@@ -2943,7 +2873,7 @@ function generatedSynonymMapToPublicSynonymMap(synonymMap) {
         name: synonymMap.name,
         encryptionKey: convertEncryptionKeyToPublic(synonymMap.encryptionKey),
         etag: synonymMap.etag,
-        synonyms: []
+        synonyms: [],
     };
     if (synonymMap.synonyms) {
         result.synonyms = synonymMap.synonyms.split("\n");
@@ -2956,7 +2886,7 @@ function publicSynonymMapToGeneratedSynonymMap(synonymMap) {
         format: "solr",
         encryptionKey: convertEncryptionKeyToGenerated(synonymMap.encryptionKey),
         etag: synonymMap.etag,
-        synonyms: synonymMap.synonyms.join("\n")
+        synonyms: synonymMap.synonyms.join("\n"),
     };
     result.encryptionKey = convertEncryptionKeyToGenerated(synonymMap.encryptionKey);
     return result;
@@ -2965,7 +2895,8 @@ function publicSearchIndexerToGeneratedSearchIndexer(indexer) {
     return Object.assign(Object.assign({}, indexer), { encryptionKey: convertEncryptionKeyToGenerated(indexer.encryptionKey) });
 }
 function generatedSearchIndexerToPublicSearchIndexer(indexer) {
-    return Object.assign(Object.assign({}, indexer), { encryptionKey: convertEncryptionKeyToPublic(indexer.encryptionKey) });
+    const props = tslib.__rest(indexer, ["encryptionKey"]);
+    return Object.assign(Object.assign({}, props), { encryptionKey: convertEncryptionKeyToPublic(indexer.encryptionKey) });
 }
 function publicDataSourceToGeneratedDataSource(dataSource) {
     return {
@@ -2973,13 +2904,13 @@ function publicDataSourceToGeneratedDataSource(dataSource) {
         description: dataSource.description,
         type: dataSource.type,
         credentials: {
-            connectionString: dataSource.connectionString
+            connectionString: dataSource.connectionString,
         },
         container: dataSource.container,
         etag: dataSource.etag,
         dataChangeDetectionPolicy: dataSource.dataChangeDetectionPolicy,
         dataDeletionDetectionPolicy: dataSource.dataDeletionDetectionPolicy,
-        encryptionKey: convertEncryptionKeyToGenerated(dataSource.encryptionKey)
+        encryptionKey: convertEncryptionKeyToGenerated(dataSource.encryptionKey),
     };
 }
 function generatedDataSourceToPublicDataSource(dataSource) {
@@ -2992,7 +2923,7 @@ function generatedDataSourceToPublicDataSource(dataSource) {
         etag: dataSource.etag,
         dataChangeDetectionPolicy: convertDataChangeDetectionPolicyToPublic(dataSource.dataChangeDetectionPolicy),
         dataDeletionDetectionPolicy: convertDataDeletionDetectionPolicyToPublic(dataSource.dataDeletionDetectionPolicy),
-        encryptionKey: convertEncryptionKeyToPublic(dataSource.encryptionKey)
+        encryptionKey: convertEncryptionKeyToPublic(dataSource.encryptionKey),
     };
 }
 function convertDataChangeDetectionPolicyToPublic(dataChangeDetectionPolicy) {
@@ -3023,8 +2954,22 @@ function getRandomIntegerInclusive(min, max) {
     const offset = Math.floor(Math.random() * (max - min + 1));
     return offset + min;
 }
+/**
+ * A wrapper for setTimeout that resolves a promise after timeInMs milliseconds.
+ * @param timeInMs - The number of milliseconds to be delayed.
+ * @returns Promise that is resolved after timeInMs
+ */
+function delay(timeInMs) {
+    return new Promise((resolve) => setTimeout(() => resolve(), timeInMs));
+}
+const defaultServiceVersion = "2020-06-30";
 
 // Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+/**
+ * Known values for Search Audience
+ */
+exports.KnownSearchAudience = void 0;
 (function (KnownSearchAudience) {
     /**
      * Audience for Azure China
@@ -3040,13 +2985,17 @@ function getRandomIntegerInclusive(min, max) {
     KnownSearchAudience["AzurePublicCloud"] = "https://search.azure.com";
 })(exports.KnownSearchAudience || (exports.KnownSearchAudience = {}));
 
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+const SDK_VERSION = "11.3.2";
+
 // Copyright (c) Microsoft Corporation.
 /**
  * Class used to perform operations against a search index,
  * including querying documents in the index as well as
  * adding, updating, and removing them.
  */
-class SearchClient$1 {
+class SearchClient {
     /**
      * Creates an instance of SearchClient.
      *
@@ -3057,64 +3006,56 @@ class SearchClient$1 {
      * const client = new SearchClient(
      *   "<endpoint>",
      *   "<indexName>",
-     *   new AzureKeyCredential("<Admin Key>");
+     *   new AzureKeyCredential("<Admin Key>")
      * );
      * ```
      * @param endpoint - The endpoint of the search service
      * @param indexName - The name of the index
      * @param credential - Used to authenticate requests to the service.
      * @param options - Used to configure the Search client.
+     *
+     * @typeParam TModel - An optional type that represents the documents stored in
+     * the search index. For the best typing experience, all non-key fields should
+     * be marked optional and nullable, and the key property should have the
+     * non-nullable type `string`.
      */
     constructor(endpoint, indexName, credential, options = {}) {
-        /// Maintenance note: when updating supported API versions,
-        /// the ContinuationToken logic will need to be updated below.
+        var _a, _b;
         /**
          * The API version to use when communicating with the service.
          */
-        this.apiVersion = "2020-06-30-Preview";
+        this.apiVersion = defaultServiceVersion;
         this.endpoint = endpoint;
         this.indexName = indexName;
         const libInfo = `azsdk-js-search-documents/${SDK_VERSION}`;
-        if (!options.userAgentOptions) {
-            options.userAgentOptions = {};
-        }
-        if (options.userAgentOptions.userAgentPrefix) {
-            options.userAgentOptions.userAgentPrefix = `${options.userAgentOptions.userAgentPrefix} ${libInfo}`;
+        const userAgentOptions = Object.assign(Object.assign({}, options.userAgentOptions), { userAgentPrefix: ((_a = options.userAgentOptions) === null || _a === void 0 ? void 0 : _a.userAgentPrefix)
+                ? `${options.userAgentOptions.userAgentPrefix} ${libInfo}`
+                : libInfo });
+        const loggingOptions = {
+            logger: logger.info,
+            additionalAllowedHeaderNames: [
+                "elapsed-time",
+                "Location",
+                "OData-MaxVersion",
+                "OData-Version",
+                "Prefer",
+                "throttle-reason",
+            ],
+        };
+        const internalClientPipelineOptions = Object.assign(Object.assign({}, options), { userAgentOptions,
+            loggingOptions });
+        this.apiVersion = (_b = options.apiVersion) !== null && _b !== void 0 ? _b : defaultServiceVersion;
+        this.client = new SearchClient$1(this.endpoint, this.indexName, this.apiVersion, internalClientPipelineOptions);
+        if (coreAuth.isTokenCredential(credential)) {
+            const scope = options.audience
+                ? `${options.audience}/.default`
+                : `${exports.KnownSearchAudience.AzurePublicCloud}/.default`;
+            this.client.pipeline.addPolicy(coreRestPipeline.bearerTokenAuthenticationPolicy({ credential, scopes: scope }));
         }
         else {
-            options.userAgentOptions.userAgentPrefix = libInfo;
-        }
-        const internalPipelineOptions = Object.assign(Object.assign({}, options), {
-            loggingOptions: {
-                logger: logger.info,
-                allowedHeaderNames: [
-                    "elapsed-time",
-                    "Location",
-                    "OData-MaxVersion",
-                    "OData-Version",
-                    "Prefer",
-                    "throttle-reason"
-                ]
-            }
-        });
-        const scope = options.audience
-            ? `${options.audience}/.default`
-            : `${exports.KnownSearchAudience.AzurePublicCloud}/.default`;
-        const requestPolicyFactory = coreAuth.isTokenCredential(credential)
-            ? coreHttp.bearerTokenAuthenticationPolicy(credential, scope)
-            : createSearchApiKeyCredentialPolicy(credential);
-        const pipeline = coreHttp.createPipelineFromOptions(internalPipelineOptions, requestPolicyFactory);
-        if (Array.isArray(pipeline.requestPolicyFactories)) {
-            pipeline.requestPolicyFactories.unshift(odataMetadataPolicy("none"));
-        }
-        let apiVersion = this.apiVersion;
-        if (options.apiVersion) {
-            if (!["2020-06-30-Preview", "2020-06-30"].includes(options.apiVersion)) {
-                throw new Error(`Invalid Api Version: ${options.apiVersion}`);
-            }
-            apiVersion = options.apiVersion;
+            this.client.pipeline.addPolicy(createSearchApiKeyCredentialPolicy(credential));
         }
-        this.client = new SearchClient(this.endpoint, this.indexName, apiVersion, pipeline);
+        this.client.pipeline.addPolicy(createOdataMetadataPolicy("none"));
     }
     /**
      * Retrieves the number of documents in the index.
@@ -3123,13 +3064,19 @@ class SearchClient$1 {
     async getDocumentsCount(options = {}) {
         const { span, updatedOptions } = createSpan("SearchClient-getDocumentsCount", options);
         try {
-            const result = await this.client.documents.count(coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
-            return Number(result._response.bodyAsText);
+            let documentsCount = 0;
+            await this.client.documents.count(Object.assign(Object.assign({}, updatedOptions), { onResponse: (rawResponse, flatResponse) => {
+                    documentsCount = Number(rawResponse.bodyAsText);
+                    if (updatedOptions.onResponse) {
+                        updatedOptions.onResponse(rawResponse, flatResponse);
+                    }
+                } }));
+            return documentsCount;
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3145,8 +3092,7 @@ class SearchClient$1 {
      * @param options - Options to the autocomplete operation.
      */
     async autocomplete(searchText, suggesterName, options = {}) {
-        const { operationOptions, restOptions } = this.extractOperationOptions(Object.assign({}, options));
-        const { searchFields } = restOptions, nonFieldOptions = tslib.__rest(restOptions, ["searchFields"]);
+        const { searchFields } = options, nonFieldOptions = tslib.__rest(options, ["searchFields"]);
         const fullOptions = Object.assign({ searchText: searchText, suggesterName: suggesterName, searchFields: this.convertSearchFields(searchFields) }, nonFieldOptions);
         if (!fullOptions.searchText) {
             throw new RangeError("searchText must be provided.");
@@ -3154,15 +3100,15 @@ class SearchClient$1 {
         if (!fullOptions.suggesterName) {
             throw new RangeError("suggesterName must be provided.");
         }
-        const { span, updatedOptions } = createSpan("SearchClient-autocomplete", operationOptions);
+        const { span, updatedOptions } = createSpan("SearchClient-autocomplete", options);
         try {
-            const result = await this.client.documents.autocompletePost(fullOptions, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.documents.autocompletePost(fullOptions, updatedOptions);
             return result;
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3171,27 +3117,20 @@ class SearchClient$1 {
         }
     }
     async searchDocuments(searchText, options = {}, nextPageParameters = {}) {
-        const { operationOptions, restOptions } = this.extractOperationOptions(Object.assign({}, options));
-        const { select, searchFields, orderBy } = restOptions, nonFieldOptions = tslib.__rest(restOptions, ["select", "searchFields", "orderBy"]);
-        const fullOptions = Object.assign(Object.assign({ searchFields: this.convertSearchFields(searchFields), select: this.convertSelect(select), orderBy: this.convertOrderBy(orderBy) }, nonFieldOptions), nextPageParameters);
-        const { span, updatedOptions } = createSpan("SearchClient-searchDocuments", operationOptions);
+        const { searchFields, select, orderBy, includeTotalCount } = options, restOptions = tslib.__rest(options, ["searchFields", "select", "orderBy", "includeTotalCount"]);
+        const fullOptions = Object.assign(Object.assign(Object.assign({}, restOptions), nextPageParameters), { searchFields: this.convertSearchFields(searchFields), select: this.convertSelect(select) || "*", orderBy: this.convertOrderBy(orderBy), includeTotalResultCount: includeTotalCount });
+        const { span, updatedOptions } = createSpan("SearchClient-searchDocuments", options);
         try {
-            const result = await this.client.documents.searchPost(Object.assign(Object.assign({}, fullOptions), { includeTotalResultCount: fullOptions.includeTotalCount, searchText: searchText }), coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
-            const { results, count, coverage, facets, nextLink } = result;
+            const result = await this.client.documents.searchPost(Object.assign(Object.assign({}, fullOptions), { searchText: searchText }), updatedOptions);
+            const { results, nextLink, nextPageParameters: resultNextPageParameters } = result, restResult = tslib.__rest(result, ["results", "nextLink", "nextPageParameters"]);
             const modifiedResults = generatedSearchResultToPublicSearchResult(results);
-            const converted = {
-                results: modifiedResults,
-                count,
-                coverage,
-                facets,
-                continuationToken: this.encodeContinuationToken(nextLink, result.nextPageParameters)
-            };
+            const converted = Object.assign(Object.assign({}, restResult), { results: modifiedResults, continuationToken: this.encodeContinuationToken(nextLink, resultNextPageParameters) });
             return deserialize(converted);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3215,21 +3154,28 @@ class SearchClient$1 {
     }
     listSearchResultsAll(firstPage, searchText, options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listSearchResultsAll_1() {
-            var e_1, _a;
+            var _a, e_1, _b, _c;
             yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(firstPage.results)));
             if (firstPage.continuationToken) {
                 try {
-                    for (var _b = tslib.__asyncValues(this.listSearchResultsPage(searchText, options, {
-                        continuationToken: firstPage.continuationToken
-                    })), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
-                        const page = _c.value;
-                        yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page.results)));
+                    for (var _d = true, _e = tslib.__asyncValues(this.listSearchResultsPage(searchText, options, {
+                        continuationToken: firstPage.continuationToken,
+                    })), _f; _f = yield tslib.__await(_e.next()), _a = _f.done, !_a;) {
+                        _c = _f.value;
+                        _d = false;
+                        try {
+                            const page = _c;
+                            yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page.results)));
+                        }
+                        finally {
+                            _d = true;
+                        }
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_c && !_c.done && (_a = _b.return)) yield tslib.__await(_a.call(_b));
+                        if (!_d && !_a && (_b = _e.return)) yield tslib.__await(_b.call(_e));
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
@@ -3247,7 +3193,7 @@ class SearchClient$1 {
             },
             byPage: (settings = {}) => {
                 return this.listSearchResultsPage(searchText, options, settings);
-            }
+            },
         };
     }
     /**
@@ -3260,18 +3206,12 @@ class SearchClient$1 {
         const { span, updatedOptions } = createSpan("SearchClient-search", options);
         try {
             const pageResult = await this.searchDocuments(searchText, updatedOptions);
-            const { count, coverage, facets } = pageResult;
-            return {
-                count,
-                coverage,
-                facets,
-                results: this.listSearchResults(pageResult, searchText, updatedOptions)
-            };
+            return Object.assign(Object.assign({}, pageResult), { results: this.listSearchResults(pageResult, searchText, updatedOptions) });
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3287,25 +3227,24 @@ class SearchClient$1 {
      * @param options - Options for the suggest operation
      */
     async suggest(searchText, suggesterName, options = {}) {
-        const { operationOptions, restOptions } = this.extractOperationOptions(Object.assign({}, options));
-        const { select, searchFields, orderBy } = restOptions, nonFieldOptions = tslib.__rest(restOptions, ["select", "searchFields", "orderBy"]);
-        const fullOptions = Object.assign({ searchText: searchText, suggesterName: suggesterName, searchFields: this.convertSearchFields(searchFields), select: this.convertSelect(select), orderBy: this.convertOrderBy(orderBy) }, nonFieldOptions);
+        const { select, searchFields, orderBy } = options, nonFieldOptions = tslib.__rest(options, ["select", "searchFields", "orderBy"]);
+        const fullOptions = Object.assign({ searchText: searchText, suggesterName: suggesterName, select: this.convertSelect(select), searchFields: this.convertSearchFields(searchFields), orderBy: this.convertOrderBy(orderBy) }, nonFieldOptions);
         if (!fullOptions.searchText) {
             throw new RangeError("searchText must be provided.");
         }
         if (!fullOptions.suggesterName) {
             throw new RangeError("suggesterName must be provided.");
         }
-        const { span, updatedOptions } = createSpan("SearchClient-suggest", operationOptions);
+        const { span, updatedOptions } = createSpan("SearchClient-suggest", options);
         try {
-            const result = await this.client.documents.suggestPost(fullOptions, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.documents.suggestPost(fullOptions, updatedOptions);
             const modifiedResult = generatedSuggestDocumentsResultToPublicSuggestDocumentsResult(result);
             return deserialize(modifiedResult);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3321,13 +3260,13 @@ class SearchClient$1 {
     async getDocument(key, options = {}) {
         const { span, updatedOptions } = createSpan("SearchClient-getDocument", options);
         try {
-            const result = await this.client.documents.get(key, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
-            return deserialize(result.body);
+            const result = await this.client.documents.get(key, updatedOptions);
+            return deserialize(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3350,16 +3289,22 @@ class SearchClient$1 {
     batch, options = {}) {
         const { span, updatedOptions } = createSpan("SearchClient-indexDocuments", options);
         try {
-            const result = await this.client.documents.index({ actions: serialize(batch.actions) }, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
-            if (options.throwOnAnyFailure && result._response.status === 207) {
+            let status = 0;
+            const result = await this.client.documents.index({ actions: serialize(batch.actions) }, Object.assign(Object.assign({}, updatedOptions), { onResponse: (rawResponse, flatResponse) => {
+                    status = rawResponse.status;
+                    if (updatedOptions.onResponse) {
+                        updatedOptions.onResponse(rawResponse, flatResponse);
+                    }
+                } }));
+            if (options.throwOnAnyFailure && status === 207) {
                 throw result;
             }
             return result;
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3381,8 +3326,8 @@ class SearchClient$1 {
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3405,8 +3350,8 @@ class SearchClient$1 {
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3429,8 +3374,8 @@ class SearchClient$1 {
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3452,8 +3397,8 @@ class SearchClient$1 {
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3468,7 +3413,7 @@ class SearchClient$1 {
         const payload = JSON.stringify({
             apiVersion: this.apiVersion,
             nextLink,
-            nextPageParameters
+            nextPageParameters,
         });
         return encode(payload);
     }
@@ -3484,25 +3429,13 @@ class SearchClient$1 {
             }
             return {
                 nextLink: result.nextLink,
-                nextPageParameters: result.nextPageParameters
+                nextPageParameters: result.nextPageParameters,
             };
         }
         catch (e) {
             throw new Error(`Corrupted or invalid continuation token: ${decodedToken}`);
         }
     }
-    // eslint-disable-next-line @typescript-eslint/no-shadow
-    extractOperationOptions(obj) {
-        const { abortSignal, requestOptions, tracingOptions } = obj, restOptions = tslib.__rest(obj, ["abortSignal", "requestOptions", "tracingOptions"]);
-        return {
-            operationOptions: {
-                abortSignal,
-                requestOptions,
-                tracingOptions
-            },
-            restOptions
-        };
-    }
     convertSelect(select) {
         if (select) {
             return select.join(",");
@@ -3557,7 +3490,7 @@ class SearchIndexingBufferedSender {
         /**
          * Event emitter/publisher used in the Buffered Sender
          */
-        this.emitter = new EventEmitter();
+        this.emitter = new EventEmitter__default["default"]();
         this.client = client;
         this.documentKeyRetriever = documentKeyRetriever;
         // General Configuration properties
@@ -3589,14 +3522,14 @@ class SearchIndexingBufferedSender {
             this.batchObject.upload(documents);
             this.emitter.emit("batchAdded", {
                 action: "upload",
-                documents
+                documents,
             });
             return this.internalFlush(false, updatedOptions);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3616,14 +3549,14 @@ class SearchIndexingBufferedSender {
             this.batchObject.merge(documents);
             this.emitter.emit("batchAdded", {
                 action: "merge",
-                documents
+                documents,
             });
             return this.internalFlush(false, updatedOptions);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3643,14 +3576,14 @@ class SearchIndexingBufferedSender {
             this.batchObject.mergeOrUpload(documents);
             this.emitter.emit("batchAdded", {
                 action: "mergeOrUpload",
-                documents
+                documents,
             });
             return this.internalFlush(false, updatedOptions);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3670,14 +3603,14 @@ class SearchIndexingBufferedSender {
             this.batchObject.delete(documents);
             this.emitter.emit("batchAdded", {
                 action: "delete",
-                documents
+                documents,
             });
             return this.internalFlush(false, updatedOptions);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3699,8 +3632,8 @@ class SearchIndexingBufferedSender {
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -3771,7 +3704,7 @@ class SearchIndexingBufferedSender {
                 // Cut the payload size to half
                 const splitActionsArray = [
                     actionsToSend.slice(0, actionsToSend.length / 2),
-                    actionsToSend.slice(actionsToSend.length / 2, actionsToSend.length)
+                    actionsToSend.slice(actionsToSend.length / 2, actionsToSend.length),
                 ];
                 this.initialBatchActionCount = splitActionsArray[0].length; // So, we do not want 413 happening again and again
                 for (const actions of splitActionsArray) {
@@ -3786,7 +3719,7 @@ class SearchIndexingBufferedSender {
                 // Allow the final value to have some "jitter" (within 50% of the delay size) so
                 // that retries across multiple clients don't occur simultaneously.
                 const delayWithJitter = clampedExponentialDelay / 2 + getRandomIntegerInclusive(0, clampedExponentialDelay / 2);
-                await coreHttp.delay(delayWithJitter);
+                await delay(delayWithJitter);
                 await this.submitDocuments(actionsToSend, options, retryAttempt + 1);
             }
             else {
@@ -3918,7 +3851,7 @@ const DataChangeDetectionPolicy = {
         uberParent: "DataChangeDetectionPolicy",
         polymorphicDiscriminator: {
             serializedName: "@odata\\.type",
-            clientName: "odatatype"
+            clientName: "@odata\\.type"
         },
         modelProperties: {
             odatatype: {
@@ -3938,7 +3871,7 @@ const DataDeletionDetectionPolicy = {
         uberParent: "DataDeletionDetectionPolicy",
         polymorphicDiscriminator: {
             serializedName: "@odata\\.type",
-            clientName: "odatatype"
+            clientName: "@odata\\.type"
         },
         modelProperties: {
             odatatype: {
@@ -4008,7 +3941,7 @@ const AzureActiveDirectoryApplicationCredentials = {
         }
     }
 };
-const SearchError$1 = {
+const SearchError = {
     type: {
         name: "Composite",
         className: "SearchError",
@@ -4741,7 +4674,7 @@ const SearchIndexerSkill = {
         uberParent: "SearchIndexerSkill",
         polymorphicDiscriminator: {
             serializedName: "@odata\\.type",
-            clientName: "odatatype"
+            clientName: "@odata\\.type"
         },
         modelProperties: {
             odatatype: {
@@ -4865,7 +4798,7 @@ const CognitiveServicesAccount = {
         uberParent: "CognitiveServicesAccount",
         polymorphicDiscriminator: {
             serializedName: "@odata\\.type",
-            clientName: "odatatype"
+            clientName: "@odata\\.type"
         },
         modelProperties: {
             odatatype: {
@@ -5495,7 +5428,7 @@ const LexicalAnalyzer = {
         uberParent: "LexicalAnalyzer",
         polymorphicDiscriminator: {
             serializedName: "@odata\\.type",
-            clientName: "odatatype"
+            clientName: "@odata\\.type"
         },
         modelProperties: {
             odatatype: {
@@ -5522,7 +5455,7 @@ const LexicalTokenizer = {
         uberParent: "LexicalTokenizer",
         polymorphicDiscriminator: {
             serializedName: "@odata\\.type",
-            clientName: "odatatype"
+            clientName: "@odata\\.type"
         },
         modelProperties: {
             odatatype: {
@@ -5549,7 +5482,7 @@ const TokenFilter = {
         uberParent: "TokenFilter",
         polymorphicDiscriminator: {
             serializedName: "@odata\\.type",
-            clientName: "odatatype"
+            clientName: "@odata\\.type"
         },
         modelProperties: {
             odatatype: {
@@ -5576,7 +5509,7 @@ const CharFilter = {
         uberParent: "CharFilter",
         polymorphicDiscriminator: {
             serializedName: "@odata\\.type",
-            clientName: "odatatype"
+            clientName: "@odata\\.type"
         },
         modelProperties: {
             odatatype: {
@@ -5603,7 +5536,7 @@ const Similarity = {
         uberParent: "Similarity",
         polymorphicDiscriminator: {
             serializedName: "@odata\\.type",
-            clientName: "odatatype"
+            clientName: "@odata\\.type"
         },
         modelProperties: {
             odatatype: {
@@ -8197,7 +8130,7 @@ let discriminators = {
     "Similarity.#Microsoft.Azure.Search.BM25Similarity": BM25Similarity
 };
 
-var Mappers$1 = /*#__PURE__*/Object.freeze({
+var Mappers = /*#__PURE__*/Object.freeze({
     __proto__: null,
     SearchIndexerDataSource: SearchIndexerDataSource,
     DataSourceCredentials: DataSourceCredentials,
@@ -8206,7 +8139,7 @@ var Mappers$1 = /*#__PURE__*/Object.freeze({
     DataDeletionDetectionPolicy: DataDeletionDetectionPolicy,
     SearchResourceEncryptionKey: SearchResourceEncryptionKey,
     AzureActiveDirectoryApplicationCredentials: AzureActiveDirectoryApplicationCredentials,
-    SearchError: SearchError$1,
+    SearchError: SearchError,
     ListDataSourcesResult: ListDataSourcesResult,
     SearchIndexer: SearchIndexer,
     IndexingSchedule: IndexingSchedule,
@@ -8340,7 +8273,7 @@ var Mappers$1 = /*#__PURE__*/Object.freeze({
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-const contentType$1 = {
+const contentType = {
     parameterPath: ["options", "contentType"],
     mapper: {
         defaultValue: "application/json",
@@ -8355,7 +8288,7 @@ const dataSource = {
     parameterPath: "dataSource",
     mapper: SearchIndexerDataSource
 };
-const accept$1 = {
+const accept = {
     parameterPath: "accept",
     mapper: {
         defaultValue: "application/json",
@@ -8366,7 +8299,7 @@ const accept$1 = {
         }
     }
 };
-const endpoint$1 = {
+const endpoint = {
     parameterPath: "endpoint",
     mapper: {
         serializedName: "endpoint",
@@ -8387,15 +8320,6 @@ const dataSourceName = {
         }
     }
 };
-const xMsClientRequestId$1 = {
-    parameterPath: ["options", "requestOptionsParam", "xMsClientRequestId"],
-    mapper: {
-        serializedName: "x-ms-client-request-id",
-        type: {
-            name: "Uuid"
-        }
-    }
-};
 const ifMatch = {
     parameterPath: ["options", "ifMatch"],
     mapper: {
@@ -8425,7 +8349,7 @@ const prefer = {
         }
     }
 };
-const apiVersion$1 = {
+const apiVersion = {
     parameterPath: "apiVersion",
     mapper: {
         serializedName: "api-version",
@@ -8435,7 +8359,7 @@ const apiVersion$1 = {
         }
     }
 };
-const select$1 = {
+const select = {
     parameterPath: ["options", "select"],
     mapper: {
         serializedName: "$select",
@@ -8490,7 +8414,7 @@ const index = {
     parameterPath: "index",
     mapper: SearchIndex
 };
-const indexName$1 = {
+const indexName = {
     parameterPath: "indexName",
     mapper: {
         serializedName: "indexName",
@@ -8522,7 +8446,7 @@ const request = {
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 /** Class representing a DataSources. */
-class DataSources {
+class DataSourcesImpl {
     /**
      * Initialize a new instance of the class DataSources class.
      * @param client Reference to the service client
@@ -8537,12 +8461,7 @@ class DataSources {
      * @param options The options parameters.
      */
     createOrUpdate(dataSourceName, dataSource, options) {
-        const operationArguments = {
-            dataSourceName,
-            dataSource,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, createOrUpdateOperationSpec);
+        return this.client.sendOperationRequest({ dataSourceName, dataSource, options }, createOrUpdateOperationSpec$4);
     }
     /**
      * Deletes a datasource.
@@ -8550,11 +8469,7 @@ class DataSources {
      * @param options The options parameters.
      */
     delete(dataSourceName, options) {
-        const operationArguments = {
-            dataSourceName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, deleteOperationSpec);
+        return this.client.sendOperationRequest({ dataSourceName, options }, deleteOperationSpec$4);
     }
     /**
      * Retrieves a datasource definition.
@@ -8562,21 +8477,14 @@ class DataSources {
      * @param options The options parameters.
      */
     get(dataSourceName, options) {
-        const operationArguments = {
-            dataSourceName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getOperationSpec$1);
+        return this.client.sendOperationRequest({ dataSourceName, options }, getOperationSpec$4);
     }
     /**
      * Lists all datasources available for a search service.
      * @param options The options parameters.
      */
     list(options) {
-        const operationArguments = {
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, listOperationSpec);
+        return this.client.sendOperationRequest({ options }, listOperationSpec$4);
     }
     /**
      * Creates a new datasource.
@@ -8584,16 +8492,12 @@ class DataSources {
      * @param options The options parameters.
      */
     create(dataSource, options) {
-        const operationArguments = {
-            dataSource,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, createOperationSpec);
+        return this.client.sendOperationRequest({ dataSource, options }, createOperationSpec$4);
     }
 }
 // Operation Specifications
-const serializer$1 = new coreHttp.Serializer(Mappers$1, /* isXml */ false);
-const createOrUpdateOperationSpec = {
+const serializer$5 = coreClient__namespace.createSerializer(Mappers, /* isXml */ false);
+const createOrUpdateOperationSpec$4 = {
     path: "/datasources('{dataSourceName}')",
     httpMethod: "PUT",
     responses: {
@@ -8604,44 +8508,42 @@ const createOrUpdateOperationSpec = {
             bodyMapper: SearchIndexerDataSource
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
     requestBody: dataSource,
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, dataSourceName],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, dataSourceName],
     headerParameters: [
-        contentType$1,
-        accept$1,
-        xMsClientRequestId$1,
+        contentType,
+        accept,
         ifMatch,
         ifNoneMatch,
         prefer
     ],
     mediaType: "json",
-    serializer: serializer$1
+    serializer: serializer$5
 };
-const deleteOperationSpec = {
+const deleteOperationSpec$4 = {
     path: "/datasources('{dataSourceName}')",
     httpMethod: "DELETE",
     responses: {
         204: {},
         404: {},
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, dataSourceName],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, dataSourceName],
     headerParameters: [
-        accept$1,
-        xMsClientRequestId$1,
+        accept,
         ifMatch,
         ifNoneMatch
     ],
-    serializer: serializer$1
+    serializer: serializer$5
 };
-const getOperationSpec$1 = {
+const getOperationSpec$4 = {
     path: "/datasources('{dataSourceName}')",
     httpMethod: "GET",
     responses: {
@@ -8649,15 +8551,15 @@ const getOperationSpec$1 = {
             bodyMapper: SearchIndexerDataSource
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, dataSourceName],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$1
-};
-const listOperationSpec = {
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, dataSourceName],
+    headerParameters: [accept],
+    serializer: serializer$5
+};
+const listOperationSpec$4 = {
     path: "/datasources",
     httpMethod: "GET",
     responses: {
@@ -8665,15 +8567,15 @@ const listOperationSpec = {
             bodyMapper: ListDataSourcesResult
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1, select$1],
-    urlParameters: [endpoint$1],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$1
+    queryParameters: [apiVersion, select],
+    urlParameters: [endpoint],
+    headerParameters: [accept],
+    serializer: serializer$5
 };
-const createOperationSpec = {
+const createOperationSpec$4 = {
     path: "/datasources",
     httpMethod: "POST",
     responses: {
@@ -8681,19 +8583,15 @@ const createOperationSpec = {
             bodyMapper: SearchIndexerDataSource
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
     requestBody: dataSource,
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1],
-    headerParameters: [
-        contentType$1,
-        accept$1,
-        xMsClientRequestId$1
-    ],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint],
+    headerParameters: [contentType, accept],
     mediaType: "json",
-    serializer: serializer$1
+    serializer: serializer$5
 };
 
 /*
@@ -8704,7 +8602,7 @@ const createOperationSpec = {
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 /** Class representing a Indexers. */
-class Indexers {
+class IndexersImpl {
     /**
      * Initialize a new instance of the class Indexers class.
      * @param client Reference to the service client
@@ -8718,11 +8616,7 @@ class Indexers {
      * @param options The options parameters.
      */
     reset(indexerName, options) {
-        const operationArguments = {
-            indexerName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, resetOperationSpec);
+        return this.client.sendOperationRequest({ indexerName, options }, resetOperationSpec);
     }
     /**
      * Runs an indexer on-demand.
@@ -8730,11 +8624,7 @@ class Indexers {
      * @param options The options parameters.
      */
     run(indexerName, options) {
-        const operationArguments = {
-            indexerName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, runOperationSpec);
+        return this.client.sendOperationRequest({ indexerName, options }, runOperationSpec);
     }
     /**
      * Creates a new indexer or updates an indexer if it already exists.
@@ -8743,12 +8633,7 @@ class Indexers {
      * @param options The options parameters.
      */
     createOrUpdate(indexerName, indexer, options) {
-        const operationArguments = {
-            indexerName,
-            indexer,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, createOrUpdateOperationSpec$1);
+        return this.client.sendOperationRequest({ indexerName, indexer, options }, createOrUpdateOperationSpec$3);
     }
     /**
      * Deletes an indexer.
@@ -8756,11 +8641,7 @@ class Indexers {
      * @param options The options parameters.
      */
     delete(indexerName, options) {
-        const operationArguments = {
-            indexerName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, deleteOperationSpec$1);
+        return this.client.sendOperationRequest({ indexerName, options }, deleteOperationSpec$3);
     }
     /**
      * Retrieves an indexer definition.
@@ -8768,21 +8649,14 @@ class Indexers {
      * @param options The options parameters.
      */
     get(indexerName, options) {
-        const operationArguments = {
-            indexerName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getOperationSpec$2);
+        return this.client.sendOperationRequest({ indexerName, options }, getOperationSpec$3);
     }
     /**
      * Lists all indexers available for a search service.
      * @param options The options parameters.
      */
     list(options) {
-        const operationArguments = {
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, listOperationSpec$1);
+        return this.client.sendOperationRequest({ options }, listOperationSpec$3);
     }
     /**
      * Creates a new indexer.
@@ -8790,11 +8664,7 @@ class Indexers {
      * @param options The options parameters.
      */
     create(indexer, options) {
-        const operationArguments = {
-            indexer,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, createOperationSpec$1);
+        return this.client.sendOperationRequest({ indexer, options }, createOperationSpec$3);
     }
     /**
      * Returns the current status and execution history of an indexer.
@@ -8802,28 +8672,24 @@ class Indexers {
      * @param options The options parameters.
      */
     getStatus(indexerName, options) {
-        const operationArguments = {
-            indexerName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getStatusOperationSpec);
+        return this.client.sendOperationRequest({ indexerName, options }, getStatusOperationSpec);
     }
 }
 // Operation Specifications
-const serializer$2 = new coreHttp.Serializer(Mappers$1, /* isXml */ false);
+const serializer$4 = coreClient__namespace.createSerializer(Mappers, /* isXml */ false);
 const resetOperationSpec = {
     path: "/indexers('{indexerName}')/search.reset",
     httpMethod: "POST",
     responses: {
         204: {},
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, indexerName],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$2
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, indexerName],
+    headerParameters: [accept],
+    serializer: serializer$4
 };
 const runOperationSpec = {
     path: "/indexers('{indexerName}')/search.run",
@@ -8831,15 +8697,15 @@ const runOperationSpec = {
     responses: {
         202: {},
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, indexerName],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$2
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, indexerName],
+    headerParameters: [accept],
+    serializer: serializer$4
 };
-const createOrUpdateOperationSpec$1 = {
+const createOrUpdateOperationSpec$3 = {
     path: "/indexers('{indexerName}')",
     httpMethod: "PUT",
     responses: {
@@ -8850,44 +8716,42 @@ const createOrUpdateOperationSpec$1 = {
             bodyMapper: SearchIndexer
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
     requestBody: indexer,
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, indexerName],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, indexerName],
     headerParameters: [
-        contentType$1,
-        accept$1,
-        xMsClientRequestId$1,
+        contentType,
+        accept,
         ifMatch,
         ifNoneMatch,
         prefer
     ],
     mediaType: "json",
-    serializer: serializer$2
+    serializer: serializer$4
 };
-const deleteOperationSpec$1 = {
+const deleteOperationSpec$3 = {
     path: "/indexers('{indexerName}')",
     httpMethod: "DELETE",
     responses: {
         204: {},
         404: {},
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, indexerName],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, indexerName],
     headerParameters: [
-        accept$1,
-        xMsClientRequestId$1,
+        accept,
         ifMatch,
         ifNoneMatch
     ],
-    serializer: serializer$2
+    serializer: serializer$4
 };
-const getOperationSpec$2 = {
+const getOperationSpec$3 = {
     path: "/indexers('{indexerName}')",
     httpMethod: "GET",
     responses: {
@@ -8895,15 +8759,15 @@ const getOperationSpec$2 = {
             bodyMapper: SearchIndexer
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, indexerName],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$2
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, indexerName],
+    headerParameters: [accept],
+    serializer: serializer$4
 };
-const listOperationSpec$1 = {
+const listOperationSpec$3 = {
     path: "/indexers",
     httpMethod: "GET",
     responses: {
@@ -8911,15 +8775,15 @@ const listOperationSpec$1 = {
             bodyMapper: ListIndexersResult
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1, select$1],
-    urlParameters: [endpoint$1],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$2
+    queryParameters: [apiVersion, select],
+    urlParameters: [endpoint],
+    headerParameters: [accept],
+    serializer: serializer$4
 };
-const createOperationSpec$1 = {
+const createOperationSpec$3 = {
     path: "/indexers",
     httpMethod: "POST",
     responses: {
@@ -8927,19 +8791,15 @@ const createOperationSpec$1 = {
             bodyMapper: SearchIndexer
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
     requestBody: indexer,
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1],
-    headerParameters: [
-        contentType$1,
-        accept$1,
-        xMsClientRequestId$1
-    ],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint],
+    headerParameters: [contentType, accept],
     mediaType: "json",
-    serializer: serializer$2
+    serializer: serializer$4
 };
 const getStatusOperationSpec = {
     path: "/indexers('{indexerName}')/search.status",
@@ -8949,13 +8809,13 @@ const getStatusOperationSpec = {
             bodyMapper: SearchIndexerStatus
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, indexerName],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$2
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, indexerName],
+    headerParameters: [accept],
+    serializer: serializer$4
 };
 
 /*
@@ -8966,7 +8826,7 @@ const getStatusOperationSpec = {
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 /** Class representing a Skillsets. */
-class Skillsets {
+class SkillsetsImpl {
     /**
      * Initialize a new instance of the class Skillsets class.
      * @param client Reference to the service client
@@ -8981,12 +8841,7 @@ class Skillsets {
      * @param options The options parameters.
      */
     createOrUpdate(skillsetName, skillset, options) {
-        const operationArguments = {
-            skillsetName,
-            skillset,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, createOrUpdateOperationSpec$2);
+        return this.client.sendOperationRequest({ skillsetName, skillset, options }, createOrUpdateOperationSpec$2);
     }
     /**
      * Deletes a skillset in a search service.
@@ -8994,11 +8849,7 @@ class Skillsets {
      * @param options The options parameters.
      */
     delete(skillsetName, options) {
-        const operationArguments = {
-            skillsetName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, deleteOperationSpec$2);
+        return this.client.sendOperationRequest({ skillsetName, options }, deleteOperationSpec$2);
     }
     /**
      * Retrieves a skillset in a search service.
@@ -9006,21 +8857,14 @@ class Skillsets {
      * @param options The options parameters.
      */
     get(skillsetName, options) {
-        const operationArguments = {
-            skillsetName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getOperationSpec$3);
+        return this.client.sendOperationRequest({ skillsetName, options }, getOperationSpec$2);
     }
     /**
      * List all skillsets in a search service.
      * @param options The options parameters.
      */
     list(options) {
-        const operationArguments = {
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, listOperationSpec$2);
+        return this.client.sendOperationRequest({ options }, listOperationSpec$2);
     }
     /**
      * Creates a new skillset in a search service.
@@ -9028,15 +8872,11 @@ class Skillsets {
      * @param options The options parameters.
      */
     create(skillset, options) {
-        const operationArguments = {
-            skillset,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, createOperationSpec$2);
+        return this.client.sendOperationRequest({ skillset, options }, createOperationSpec$2);
     }
 }
 // Operation Specifications
-const serializer$3 = new coreHttp.Serializer(Mappers$1, /* isXml */ false);
+const serializer$3 = coreClient__namespace.createSerializer(Mappers, /* isXml */ false);
 const createOrUpdateOperationSpec$2 = {
     path: "/skillsets('{skillsetName}')",
     httpMethod: "PUT",
@@ -9048,16 +8888,15 @@ const createOrUpdateOperationSpec$2 = {
             bodyMapper: SearchIndexerSkillset
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
     requestBody: skillset,
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, skillsetName],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, skillsetName],
     headerParameters: [
-        contentType$1,
-        accept$1,
-        xMsClientRequestId$1,
+        contentType,
+        accept,
         ifMatch,
         ifNoneMatch,
         prefer
@@ -9072,20 +8911,19 @@ const deleteOperationSpec$2 = {
         204: {},
         404: {},
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, skillsetName],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, skillsetName],
     headerParameters: [
-        accept$1,
-        xMsClientRequestId$1,
+        accept,
         ifMatch,
         ifNoneMatch
     ],
     serializer: serializer$3
 };
-const getOperationSpec$3 = {
+const getOperationSpec$2 = {
     path: "/skillsets('{skillsetName}')",
     httpMethod: "GET",
     responses: {
@@ -9093,12 +8931,12 @@ const getOperationSpec$3 = {
             bodyMapper: SearchIndexerSkillset
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, skillsetName],
-    headerParameters: [accept$1, xMsClientRequestId$1],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, skillsetName],
+    headerParameters: [accept],
     serializer: serializer$3
 };
 const listOperationSpec$2 = {
@@ -9109,12 +8947,12 @@ const listOperationSpec$2 = {
             bodyMapper: ListSkillsetsResult
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1, select$1],
-    urlParameters: [endpoint$1],
-    headerParameters: [accept$1, xMsClientRequestId$1],
+    queryParameters: [apiVersion, select],
+    urlParameters: [endpoint],
+    headerParameters: [accept],
     serializer: serializer$3
 };
 const createOperationSpec$2 = {
@@ -9125,17 +8963,13 @@ const createOperationSpec$2 = {
             bodyMapper: SearchIndexerSkillset
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
     requestBody: skillset,
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1],
-    headerParameters: [
-        contentType$1,
-        accept$1,
-        xMsClientRequestId$1
-    ],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint],
+    headerParameters: [contentType, accept],
     mediaType: "json",
     serializer: serializer$3
 };
@@ -9148,7 +8982,7 @@ const createOperationSpec$2 = {
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 /** Class representing a SynonymMaps. */
-class SynonymMaps {
+class SynonymMapsImpl {
     /**
      * Initialize a new instance of the class SynonymMaps class.
      * @param client Reference to the service client
@@ -9163,12 +8997,7 @@ class SynonymMaps {
      * @param options The options parameters.
      */
     createOrUpdate(synonymMapName, synonymMap, options) {
-        const operationArguments = {
-            synonymMapName,
-            synonymMap,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, createOrUpdateOperationSpec$3);
+        return this.client.sendOperationRequest({ synonymMapName, synonymMap, options }, createOrUpdateOperationSpec$1);
     }
     /**
      * Deletes a synonym map.
@@ -9176,11 +9005,7 @@ class SynonymMaps {
      * @param options The options parameters.
      */
     delete(synonymMapName, options) {
-        const operationArguments = {
-            synonymMapName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, deleteOperationSpec$3);
+        return this.client.sendOperationRequest({ synonymMapName, options }, deleteOperationSpec$1);
     }
     /**
      * Retrieves a synonym map definition.
@@ -9188,21 +9013,14 @@ class SynonymMaps {
      * @param options The options parameters.
      */
     get(synonymMapName, options) {
-        const operationArguments = {
-            synonymMapName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getOperationSpec$4);
+        return this.client.sendOperationRequest({ synonymMapName, options }, getOperationSpec$1);
     }
     /**
      * Lists all synonym maps available for a search service.
      * @param options The options parameters.
      */
     list(options) {
-        const operationArguments = {
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, listOperationSpec$3);
+        return this.client.sendOperationRequest({ options }, listOperationSpec$1);
     }
     /**
      * Creates a new synonym map.
@@ -9210,16 +9028,12 @@ class SynonymMaps {
      * @param options The options parameters.
      */
     create(synonymMap, options) {
-        const operationArguments = {
-            synonymMap,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, createOperationSpec$3);
+        return this.client.sendOperationRequest({ synonymMap, options }, createOperationSpec$1);
     }
 }
 // Operation Specifications
-const serializer$4 = new coreHttp.Serializer(Mappers$1, /* isXml */ false);
-const createOrUpdateOperationSpec$3 = {
+const serializer$2 = coreClient__namespace.createSerializer(Mappers, /* isXml */ false);
+const createOrUpdateOperationSpec$1 = {
     path: "/synonymmaps('{synonymMapName}')",
     httpMethod: "PUT",
     responses: {
@@ -9230,44 +9044,42 @@ const createOrUpdateOperationSpec$3 = {
             bodyMapper: SynonymMap
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
     requestBody: synonymMap,
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, synonymMapName],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, synonymMapName],
     headerParameters: [
-        contentType$1,
-        accept$1,
-        xMsClientRequestId$1,
+        contentType,
+        accept,
         ifMatch,
         ifNoneMatch,
         prefer
     ],
     mediaType: "json",
-    serializer: serializer$4
+    serializer: serializer$2
 };
-const deleteOperationSpec$3 = {
+const deleteOperationSpec$1 = {
     path: "/synonymmaps('{synonymMapName}')",
     httpMethod: "DELETE",
     responses: {
         204: {},
         404: {},
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, synonymMapName],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, synonymMapName],
     headerParameters: [
-        accept$1,
-        xMsClientRequestId$1,
+        accept,
         ifMatch,
         ifNoneMatch
     ],
-    serializer: serializer$4
+    serializer: serializer$2
 };
-const getOperationSpec$4 = {
+const getOperationSpec$1 = {
     path: "/synonymmaps('{synonymMapName}')",
     httpMethod: "GET",
     responses: {
@@ -9275,15 +9087,15 @@ const getOperationSpec$4 = {
             bodyMapper: SynonymMap
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, synonymMapName],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$4
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, synonymMapName],
+    headerParameters: [accept],
+    serializer: serializer$2
 };
-const listOperationSpec$3 = {
+const listOperationSpec$1 = {
     path: "/synonymmaps",
     httpMethod: "GET",
     responses: {
@@ -9291,15 +9103,15 @@ const listOperationSpec$3 = {
             bodyMapper: ListSynonymMapsResult
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1, select$1],
-    urlParameters: [endpoint$1],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$4
+    queryParameters: [apiVersion, select],
+    urlParameters: [endpoint],
+    headerParameters: [accept],
+    serializer: serializer$2
 };
-const createOperationSpec$3 = {
+const createOperationSpec$1 = {
     path: "/synonymmaps",
     httpMethod: "POST",
     responses: {
@@ -9307,19 +9119,15 @@ const createOperationSpec$3 = {
             bodyMapper: SynonymMap
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
     requestBody: synonymMap,
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1],
-    headerParameters: [
-        contentType$1,
-        accept$1,
-        xMsClientRequestId$1
-    ],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint],
+    headerParameters: [contentType, accept],
     mediaType: "json",
-    serializer: serializer$4
+    serializer: serializer$2
 };
 
 /*
@@ -9330,7 +9138,7 @@ const createOperationSpec$3 = {
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 /** Class representing a Indexes. */
-class Indexes {
+class IndexesImpl {
     /**
      * Initialize a new instance of the class Indexes class.
      * @param client Reference to the service client
@@ -9344,21 +9152,14 @@ class Indexes {
      * @param options The options parameters.
      */
     create(index, options) {
-        const operationArguments = {
-            index,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, createOperationSpec$4);
+        return this.client.sendOperationRequest({ index, options }, createOperationSpec);
     }
     /**
      * Lists all indexes available for a search service.
      * @param options The options parameters.
      */
     list(options) {
-        const operationArguments = {
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, listOperationSpec$4);
+        return this.client.sendOperationRequest({ options }, listOperationSpec);
     }
     /**
      * Creates a new search index or updates an index if it already exists.
@@ -9367,12 +9168,7 @@ class Indexes {
      * @param options The options parameters.
      */
     createOrUpdate(indexName, index, options) {
-        const operationArguments = {
-            indexName,
-            index,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, createOrUpdateOperationSpec$4);
+        return this.client.sendOperationRequest({ indexName, index, options }, createOrUpdateOperationSpec);
     }
     /**
      * Deletes a search index and all the documents it contains. This operation is permanent, with no
@@ -9382,11 +9178,7 @@ class Indexes {
      * @param options The options parameters.
      */
     delete(indexName, options) {
-        const operationArguments = {
-            indexName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, deleteOperationSpec$4);
+        return this.client.sendOperationRequest({ indexName, options }, deleteOperationSpec);
     }
     /**
      * Retrieves an index definition.
@@ -9394,11 +9186,7 @@ class Indexes {
      * @param options The options parameters.
      */
     get(indexName, options) {
-        const operationArguments = {
-            indexName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getOperationSpec$5);
+        return this.client.sendOperationRequest({ indexName, options }, getOperationSpec);
     }
     /**
      * Returns statistics for the given index, including a document count and storage usage.
@@ -9406,11 +9194,7 @@ class Indexes {
      * @param options The options parameters.
      */
     getStatistics(indexName, options) {
-        const operationArguments = {
-            indexName,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, getStatisticsOperationSpec);
+        return this.client.sendOperationRequest({ indexName, options }, getStatisticsOperationSpec);
     }
     /**
      * Shows how an analyzer breaks text into tokens.
@@ -9419,17 +9203,12 @@ class Indexes {
      * @param options The options parameters.
      */
     analyze(indexName, request, options) {
-        const operationArguments = {
-            indexName,
-            request,
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.client.sendOperationRequest(operationArguments, analyzeOperationSpec);
+        return this.client.sendOperationRequest({ indexName, request, options }, analyzeOperationSpec);
     }
 }
 // Operation Specifications
-const serializer$5 = new coreHttp.Serializer(Mappers$1, /* isXml */ false);
-const createOperationSpec$4 = {
+const serializer$1 = coreClient__namespace.createSerializer(Mappers, /* isXml */ false);
+const createOperationSpec = {
     path: "/indexes",
     httpMethod: "POST",
     responses: {
@@ -9437,21 +9216,17 @@ const createOperationSpec$4 = {
             bodyMapper: SearchIndex
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
     requestBody: index,
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1],
-    headerParameters: [
-        contentType$1,
-        accept$1,
-        xMsClientRequestId$1
-    ],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint],
+    headerParameters: [contentType, accept],
     mediaType: "json",
-    serializer: serializer$5
+    serializer: serializer$1
 };
-const listOperationSpec$4 = {
+const listOperationSpec = {
     path: "/indexes",
     httpMethod: "GET",
     responses: {
@@ -9459,15 +9234,15 @@ const listOperationSpec$4 = {
             bodyMapper: ListIndexesResult
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1, select$1],
-    urlParameters: [endpoint$1],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$5
+    queryParameters: [apiVersion, select],
+    urlParameters: [endpoint],
+    headerParameters: [accept],
+    serializer: serializer$1
 };
-const createOrUpdateOperationSpec$4 = {
+const createOrUpdateOperationSpec = {
     path: "/indexes('{indexName}')",
     httpMethod: "PUT",
     responses: {
@@ -9478,44 +9253,42 @@ const createOrUpdateOperationSpec$4 = {
             bodyMapper: SearchIndex
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
     requestBody: index,
-    queryParameters: [apiVersion$1, allowIndexDowntime],
-    urlParameters: [endpoint$1, indexName$1],
+    queryParameters: [apiVersion, allowIndexDowntime],
+    urlParameters: [endpoint, indexName],
     headerParameters: [
-        contentType$1,
-        accept$1,
-        xMsClientRequestId$1,
+        contentType,
+        accept,
         ifMatch,
         ifNoneMatch,
         prefer
     ],
     mediaType: "json",
-    serializer: serializer$5
+    serializer: serializer$1
 };
-const deleteOperationSpec$4 = {
+const deleteOperationSpec = {
     path: "/indexes('{indexName}')",
     httpMethod: "DELETE",
     responses: {
         204: {},
         404: {},
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, indexName$1],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, indexName],
     headerParameters: [
-        accept$1,
-        xMsClientRequestId$1,
+        accept,
         ifMatch,
         ifNoneMatch
     ],
-    serializer: serializer$5
+    serializer: serializer$1
 };
-const getOperationSpec$5 = {
+const getOperationSpec = {
     path: "/indexes('{indexName}')",
     httpMethod: "GET",
     responses: {
@@ -9523,13 +9296,13 @@ const getOperationSpec$5 = {
             bodyMapper: SearchIndex
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, indexName$1],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$5
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, indexName],
+    headerParameters: [accept],
+    serializer: serializer$1
 };
 const getStatisticsOperationSpec = {
     path: "/indexes('{indexName}')/search.stats",
@@ -9539,13 +9312,13 @@ const getStatisticsOperationSpec = {
             bodyMapper: GetIndexStatisticsResult
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, indexName$1],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$5
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, indexName],
+    headerParameters: [accept],
+    serializer: serializer$1
 };
 const analyzeOperationSpec = {
     path: "/indexes('{indexName}')/search.analyze",
@@ -9555,19 +9328,15 @@ const analyzeOperationSpec = {
             bodyMapper: AnalyzeResult
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
     requestBody: request,
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1, indexName$1],
-    headerParameters: [
-        contentType$1,
-        accept$1,
-        xMsClientRequestId$1
-    ],
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint, indexName],
+    headerParameters: [contentType, accept],
     mediaType: "json",
-    serializer: serializer$5
+    serializer: serializer$1
 };
 
 /*
@@ -9577,10 +9346,8 @@ const analyzeOperationSpec = {
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-const packageName$1 = "@azure/search-documents";
-const packageVersion$1 = "11.3.1";
 /** @internal */
-class SearchServiceClientContext extends coreHttp.ServiceClient {
+class SearchServiceClientContext extends coreClient__namespace.ServiceClient {
     /**
      * Initializes a new instance of the SearchServiceClientContext class.
      * @param endpoint The endpoint URL of the search service.
@@ -9598,13 +9365,11 @@ class SearchServiceClientContext extends coreHttp.ServiceClient {
         if (!options) {
             options = {};
         }
-        if (!options.userAgent) {
-            const defaultUserAgent = coreHttp.getDefaultUserAgentValue();
-            options.userAgent = `${packageName$1}/${packageVersion$1} ${defaultUserAgent}`;
-        }
-        super(undefined, options);
-        this.requestContentType = "application/json; charset=utf-8";
-        this.baseUri = options.endpoint || "{endpoint}";
+        const defaults = {
+            requestContentType: "application/json; charset=utf-8"
+        };
+        const optionsWithDefaults = Object.assign(Object.assign(Object.assign({}, defaults), options), { baseUri: options.endpoint || "{endpoint}" });
+        super(optionsWithDefaults);
         // Parameter assignments
         this.endpoint = endpoint;
         this.apiVersion = apiVersion;
@@ -9628,25 +9393,22 @@ class SearchServiceClient extends SearchServiceClientContext {
      */
     constructor(endpoint, apiVersion, options) {
         super(endpoint, apiVersion, options);
-        this.dataSources = new DataSources(this);
-        this.indexers = new Indexers(this);
-        this.skillsets = new Skillsets(this);
-        this.synonymMaps = new SynonymMaps(this);
-        this.indexes = new Indexes(this);
+        this.dataSources = new DataSourcesImpl(this);
+        this.indexers = new IndexersImpl(this);
+        this.skillsets = new SkillsetsImpl(this);
+        this.synonymMaps = new SynonymMapsImpl(this);
+        this.indexes = new IndexesImpl(this);
     }
     /**
      * Gets service level statistics for a search service.
      * @param options The options parameters.
      */
     getServiceStatistics(options) {
-        const operationArguments = {
-            options: coreHttp.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, getServiceStatisticsOperationSpec);
+        return this.sendOperationRequest({ options }, getServiceStatisticsOperationSpec);
     }
 }
 // Operation Specifications
-const serializer$6 = new coreHttp.Serializer(Mappers$1, /* isXml */ false);
+const serializer = coreClient__namespace.createSerializer(Mappers, /* isXml */ false);
 const getServiceStatisticsOperationSpec = {
     path: "/servicestats",
     httpMethod: "GET",
@@ -9655,13 +9417,13 @@ const getServiceStatisticsOperationSpec = {
             bodyMapper: ServiceStatistics
         },
         default: {
-            bodyMapper: SearchError$1
+            bodyMapper: SearchError
         }
     },
-    queryParameters: [apiVersion$1],
-    urlParameters: [endpoint$1],
-    headerParameters: [accept$1, xMsClientRequestId$1],
-    serializer: serializer$6
+    queryParameters: [apiVersion],
+    urlParameters: [endpoint],
+    headerParameters: [accept],
+    serializer
 };
 
 // Copyright (c) Microsoft Corporation.
@@ -9688,67 +9450,56 @@ class SearchIndexClient {
      * @param options - Used to configure the Search Index client.
      */
     constructor(endpoint, credential, options = {}) {
+        var _a, _b;
         /**
          * The API version to use when communicating with the service.
          */
-        this.apiVersion = "2020-06-30";
+        this.apiVersion = defaultServiceVersion;
         this.endpoint = endpoint;
         this.credential = credential;
         this.options = options;
         const libInfo = `azsdk-js-search-documents/${SDK_VERSION}`;
-        if (!options.userAgentOptions) {
-            options.userAgentOptions = {};
-        }
-        if (options.userAgentOptions.userAgentPrefix) {
-            options.userAgentOptions.userAgentPrefix = `${options.userAgentOptions.userAgentPrefix} ${libInfo}`;
+        const userAgentOptions = Object.assign(Object.assign({}, this.options.userAgentOptions), { userAgentPrefix: ((_a = this.options.userAgentOptions) === null || _a === void 0 ? void 0 : _a.userAgentPrefix)
+                ? `${this.options.userAgentOptions.userAgentPrefix} ${libInfo}`
+                : libInfo });
+        const loggingOptions = {
+            logger: logger.info,
+            additionalAllowedHeaderNames: [
+                "elapsed-time",
+                "Location",
+                "OData-MaxVersion",
+                "OData-Version",
+                "Prefer",
+                "throttle-reason",
+            ],
+        };
+        const internalClientPipelineOptions = Object.assign(Object.assign({}, this.options), { userAgentOptions,
+            loggingOptions });
+        this.apiVersion = (_b = options.apiVersion) !== null && _b !== void 0 ? _b : defaultServiceVersion;
+        this.client = new SearchServiceClient(this.endpoint, this.apiVersion, internalClientPipelineOptions);
+        if (coreAuth.isTokenCredential(credential)) {
+            const scope = this.options.audience
+                ? `${this.options.audience}/.default`
+                : `${exports.KnownSearchAudience.AzurePublicCloud}/.default`;
+            this.client.pipeline.addPolicy(coreRestPipeline.bearerTokenAuthenticationPolicy({ credential, scopes: scope }));
         }
         else {
-            options.userAgentOptions.userAgentPrefix = libInfo;
-        }
-        const internalPipelineOptions = Object.assign(Object.assign({}, options), {
-            loggingOptions: {
-                logger: logger.info,
-                allowedHeaderNames: [
-                    "elapsed-time",
-                    "Location",
-                    "OData-MaxVersion",
-                    "OData-Version",
-                    "Prefer",
-                    "throttle-reason"
-                ]
-            }
-        });
-        const scope = options.audience
-            ? `${options.audience}/.default`
-            : `${exports.KnownSearchAudience.AzurePublicCloud}/.default`;
-        const requestPolicyFactory = coreAuth.isTokenCredential(credential)
-            ? coreHttp.bearerTokenAuthenticationPolicy(credential, scope)
-            : createSearchApiKeyCredentialPolicy(credential);
-        const pipeline = coreHttp.createPipelineFromOptions(internalPipelineOptions, requestPolicyFactory);
-        if (Array.isArray(pipeline.requestPolicyFactories)) {
-            pipeline.requestPolicyFactories.unshift(odataMetadataPolicy("minimal"));
-        }
-        let apiVersion = this.apiVersion;
-        if (options.apiVersion) {
-            if (!["2020-06-30-Preview", "2020-06-30"].includes(options.apiVersion)) {
-                throw new Error(`Invalid Api Version: ${options.apiVersion}`);
-            }
-            apiVersion = options.apiVersion;
+            this.client.pipeline.addPolicy(createSearchApiKeyCredentialPolicy(credential));
         }
-        this.client = new SearchServiceClient(this.endpoint, apiVersion, pipeline);
+        this.client.pipeline.addPolicy(createOdataMetadataPolicy("minimal"));
     }
     listIndexesPage(options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listIndexesPage_1() {
             const { span, updatedOptions } = createSpan("SearchIndexClient-listIndexesPage", options);
             try {
-                const result = yield tslib.__await(this.client.indexes.list(coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)));
+                const result = yield tslib.__await(this.client.indexes.list(updatedOptions));
                 const mapped = result.indexes.map(generatedIndexToPublicIndex);
                 yield yield tslib.__await(mapped);
             }
             catch (e) {
                 span.setStatus({
-                    code: coreTracing.SpanStatusCode.ERROR,
-                    message: e.message
+                    status: "error",
+                    error: e.message,
                 });
                 throw e;
             }
@@ -9759,17 +9510,24 @@ class SearchIndexClient {
     }
     listIndexesAll(options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listIndexesAll_1() {
-            var e_1, _a;
+            var _a, e_1, _b, _c;
             try {
-                for (var _b = tslib.__asyncValues(this.listIndexesPage(options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
-                    const page = _c.value;
-                    yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
+                for (var _d = true, _e = tslib.__asyncValues(this.listIndexesPage(options)), _f; _f = yield tslib.__await(_e.next()), _a = _f.done, !_a;) {
+                    _c = _f.value;
+                    _d = false;
+                    try {
+                        const page = _c;
+                        yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
+                    }
+                    finally {
+                        _d = true;
+                    }
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) yield tslib.__await(_a.call(_b));
+                    if (!_d && !_a && (_b = _e.return)) yield tslib.__await(_b.call(_e));
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -9790,21 +9548,21 @@ class SearchIndexClient {
             },
             byPage: () => {
                 return this.listIndexesPage(options);
-            }
+            },
         };
     }
     listIndexesNamesPage(options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listIndexesNamesPage_1() {
             const { span, updatedOptions } = createSpan("SearchIndexClient-listIndexesNamesPage", options);
             try {
-                const result = yield tslib.__await(this.client.indexes.list(Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { select: "name" })));
+                const result = yield tslib.__await(this.client.indexes.list(Object.assign(Object.assign({}, updatedOptions), { select: "name" })));
                 const mapped = result.indexes.map((idx) => idx.name);
                 yield yield tslib.__await(mapped);
             }
             catch (e) {
                 span.setStatus({
-                    code: coreTracing.SpanStatusCode.ERROR,
-                    message: e.message
+                    status: "error",
+                    error: e.message,
                 });
                 throw e;
             }
@@ -9815,17 +9573,24 @@ class SearchIndexClient {
     }
     listIndexesNamesAll(options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listIndexesNamesAll_1() {
-            var e_2, _a;
+            var _a, e_2, _b, _c;
             try {
-                for (var _b = tslib.__asyncValues(this.listIndexesNamesPage(options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
-                    const page = _c.value;
-                    yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
+                for (var _d = true, _e = tslib.__asyncValues(this.listIndexesNamesPage(options)), _f; _f = yield tslib.__await(_e.next()), _a = _f.done, !_a;) {
+                    _c = _f.value;
+                    _d = false;
+                    try {
+                        const page = _c;
+                        yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
+                    }
+                    finally {
+                        _d = true;
+                    }
                 }
             }
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) yield tslib.__await(_a.call(_b));
+                    if (!_d && !_a && (_b = _e.return)) yield tslib.__await(_b.call(_e));
                 }
                 finally { if (e_2) throw e_2.error; }
             }
@@ -9846,7 +9611,7 @@ class SearchIndexClient {
             },
             byPage: () => {
                 return this.listIndexesNamesPage(options);
-            }
+            },
         };
     }
     /**
@@ -9856,13 +9621,13 @@ class SearchIndexClient {
     async listSynonymMaps(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexClient-listSynonymMaps", options);
         try {
-            const result = await this.client.synonymMaps.list(coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.synonymMaps.list(updatedOptions);
             return result.synonymMaps.map(generatedSynonymMapToPublicSynonymMap);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -9877,13 +9642,13 @@ class SearchIndexClient {
     async listSynonymMapsNames(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexClient-listSynonymMapsNames", options);
         try {
-            const result = await this.client.synonymMaps.list(Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { select: "name" }));
+            const result = await this.client.synonymMaps.list(Object.assign(Object.assign({}, updatedOptions), { select: "name" }));
             return result.synonymMaps.map((sm) => sm.name);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -9899,13 +9664,13 @@ class SearchIndexClient {
     async getIndex(indexName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexClient-getIndex", options);
         try {
-            const result = await this.client.indexes.get(indexName, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.indexes.get(indexName, updatedOptions);
             return generatedIndexToPublicIndex(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -9921,13 +9686,13 @@ class SearchIndexClient {
     async getSynonymMap(synonymMapName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexClient-getSynonymMaps", options);
         try {
-            const result = await this.client.synonymMaps.get(synonymMapName, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.synonymMaps.get(synonymMapName, updatedOptions);
             return generatedSynonymMapToPublicSynonymMap(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -9943,13 +9708,13 @@ class SearchIndexClient {
     async createIndex(index, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexClient-createIndex", options);
         try {
-            const result = await this.client.indexes.create(publicIndexToGeneratedIndex(index), coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.indexes.create(publicIndexToGeneratedIndex(index), updatedOptions);
             return generatedIndexToPublicIndex(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -9965,13 +9730,13 @@ class SearchIndexClient {
     async createSynonymMap(synonymMap, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexClient-createSynonymMaps", options);
         try {
-            const result = await this.client.synonymMaps.create(publicSynonymMapToGeneratedSynonymMap(synonymMap), coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.synonymMaps.create(publicSynonymMapToGeneratedSynonymMap(synonymMap), updatedOptions);
             return generatedSynonymMapToPublicSynonymMap(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -9988,13 +9753,13 @@ class SearchIndexClient {
         const { span, updatedOptions } = createSpan("SearchIndexClient-createOrUpdateIndex", options);
         try {
             const etag = options.onlyIfUnchanged ? index.etag : undefined;
-            const result = await this.client.indexes.createOrUpdate(index.name, publicIndexToGeneratedIndex(index), Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
+            const result = await this.client.indexes.createOrUpdate(index.name, publicIndexToGeneratedIndex(index), Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
             return generatedIndexToPublicIndex(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10011,13 +9776,13 @@ class SearchIndexClient {
         const { span, updatedOptions } = createSpan("SearchIndexClient-createOrUpdateSynonymMap", options);
         try {
             const etag = options.onlyIfUnchanged ? synonymMap.etag : undefined;
-            const result = await this.client.synonymMaps.createOrUpdate(synonymMap.name, publicSynonymMapToGeneratedSynonymMap(synonymMap), Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
+            const result = await this.client.synonymMaps.createOrUpdate(synonymMap.name, publicSynonymMapToGeneratedSynonymMap(synonymMap), Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
             return generatedSynonymMapToPublicSynonymMap(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10035,12 +9800,12 @@ class SearchIndexClient {
         try {
             const indexName = typeof index === "string" ? index : index.name;
             const etag = typeof index === "string" ? undefined : options.onlyIfUnchanged ? index.etag : undefined;
-            await this.client.indexes.delete(indexName, Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
+            await this.client.indexes.delete(indexName, Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10062,12 +9827,12 @@ class SearchIndexClient {
                 : options.onlyIfUnchanged
                     ? synonymMap.etag
                     : undefined;
-            await this.client.synonymMaps.delete(synonymMapName, Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
+            await this.client.synonymMaps.delete(synonymMapName, Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10084,13 +9849,13 @@ class SearchIndexClient {
     async getIndexStatistics(indexName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexClient-getIndexStatistics", options);
         try {
-            const result = await this.client.indexes.getStatistics(indexName, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.indexes.getStatistics(indexName, updatedOptions);
             return result;
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10105,16 +9870,21 @@ class SearchIndexClient {
      * @param options - Additional arguments
      */
     async analyzeText(indexName, options) {
-        const { operationOptions, restOptions } = extractOperationOptions(options);
+        const { abortSignal, requestOptions, tracingOptions } = options, restOptions = tslib.__rest(options, ["abortSignal", "requestOptions", "tracingOptions"]);
+        const operationOptions = {
+            abortSignal,
+            requestOptions,
+            tracingOptions,
+        };
         const { span, updatedOptions } = createSpan("SearchIndexClient-analyzeText", operationOptions);
         try {
-            const result = await this.client.indexes.analyze(indexName, Object.assign(Object.assign({}, restOptions), { analyzer: restOptions.analyzerName, tokenizer: restOptions.tokenizerName }), coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.indexes.analyze(indexName, Object.assign(Object.assign({}, restOptions), { analyzer: restOptions.analyzerName, tokenizer: restOptions.tokenizerName }), updatedOptions);
             return result;
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10129,13 +9899,13 @@ class SearchIndexClient {
     async getServiceStatistics(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexClient-getServiceStatistics", options);
         try {
-            const result = await this.client.getServiceStatistics(coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.getServiceStatistics(updatedOptions);
             return result;
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10147,9 +9917,13 @@ class SearchIndexClient {
      * Retrieves the SearchClient corresponding to this SearchIndexClient
      * @param indexName - Name of the index
      * @param options - SearchClient Options
+     * @typeParam TModel - An optional type that represents the documents stored in
+     * the search index. For the best typing experience, all non-key fields should
+     * be marked optional and nullable, and the key property should have the
+     * non-nullable type `string`.
      */
     getSearchClient(indexName, options) {
-        return new SearchClient$1(this.endpoint, indexName, this.credential, options || this.options);
+        return new SearchClient(this.endpoint, indexName, this.credential, options || this.options);
     }
 }
 
@@ -10177,52 +9951,41 @@ class SearchIndexerClient {
      * @param options - Used to configure the Search client.
      */
     constructor(endpoint, credential, options = {}) {
+        var _a, _b;
         /**
          * The API version to use when communicating with the service.
          */
-        this.apiVersion = "2020-06-30";
+        this.apiVersion = defaultServiceVersion;
         this.endpoint = endpoint;
         const libInfo = `azsdk-js-search-documents/${SDK_VERSION}`;
-        if (!options.userAgentOptions) {
-            options.userAgentOptions = {};
-        }
-        if (options.userAgentOptions.userAgentPrefix) {
-            options.userAgentOptions.userAgentPrefix = `${options.userAgentOptions.userAgentPrefix} ${libInfo}`;
+        const userAgentOptions = Object.assign(Object.assign({}, options.userAgentOptions), { userAgentPrefix: ((_a = options.userAgentOptions) === null || _a === void 0 ? void 0 : _a.userAgentPrefix)
+                ? `${options.userAgentOptions.userAgentPrefix} ${libInfo}`
+                : libInfo });
+        const loggingOptions = {
+            logger: logger.info,
+            additionalAllowedHeaderNames: [
+                "elapsed-time",
+                "Location",
+                "OData-MaxVersion",
+                "OData-Version",
+                "Prefer",
+                "throttle-reason",
+            ],
+        };
+        const internalClientPipelineOptions = Object.assign(Object.assign({}, options), { userAgentOptions,
+            loggingOptions });
+        this.apiVersion = (_b = options.apiVersion) !== null && _b !== void 0 ? _b : defaultServiceVersion;
+        this.client = new SearchServiceClient(this.endpoint, this.apiVersion, internalClientPipelineOptions);
+        if (coreAuth.isTokenCredential(credential)) {
+            const scope = options.audience
+                ? `${options.audience}/.default`
+                : `${exports.KnownSearchAudience.AzurePublicCloud}/.default`;
+            this.client.pipeline.addPolicy(coreRestPipeline.bearerTokenAuthenticationPolicy({ credential, scopes: scope }));
         }
         else {
-            options.userAgentOptions.userAgentPrefix = libInfo;
-        }
-        const internalPipelineOptions = Object.assign(Object.assign({}, options), {
-            loggingOptions: {
-                logger: logger.info,
-                allowedHeaderNames: [
-                    "elapsed-time",
-                    "Location",
-                    "OData-MaxVersion",
-                    "OData-Version",
-                    "Prefer",
-                    "throttle-reason"
-                ]
-            }
-        });
-        const scope = options.audience
-            ? `${options.audience}/.default`
-            : `${exports.KnownSearchAudience.AzurePublicCloud}/.default`;
-        const requestPolicyFactory = coreAuth.isTokenCredential(credential)
-            ? coreHttp.bearerTokenAuthenticationPolicy(credential, scope)
-            : createSearchApiKeyCredentialPolicy(credential);
-        const pipeline = coreHttp.createPipelineFromOptions(internalPipelineOptions, requestPolicyFactory);
-        if (Array.isArray(pipeline.requestPolicyFactories)) {
-            pipeline.requestPolicyFactories.unshift(odataMetadataPolicy("minimal"));
-        }
-        let apiVersion = this.apiVersion;
-        if (options.apiVersion) {
-            if (!["2020-06-30-Preview", "2020-06-30"].includes(options.apiVersion)) {
-                throw new Error(`Invalid Api Version: ${options.apiVersion}`);
-            }
-            apiVersion = options.apiVersion;
+            this.client.pipeline.addPolicy(createSearchApiKeyCredentialPolicy(credential));
         }
-        this.client = new SearchServiceClient(this.endpoint, apiVersion, pipeline);
+        this.client.pipeline.addPolicy(createOdataMetadataPolicy("minimal"));
     }
     /**
      * Retrieves a list of existing indexers in the service.
@@ -10231,13 +9994,13 @@ class SearchIndexerClient {
     async listIndexers(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listIndexers", options);
         try {
-            const result = await this.client.indexers.list(coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.indexers.list(updatedOptions);
             return result.indexers.map(generatedSearchIndexerToPublicSearchIndexer);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10252,13 +10015,13 @@ class SearchIndexerClient {
     async listIndexersNames(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listIndexersNames", options);
         try {
-            const result = await this.client.indexers.list(Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { select: "name" }));
+            const result = await this.client.indexers.list(Object.assign(Object.assign({}, updatedOptions), { select: "name" }));
             return result.indexers.map((idx) => idx.name);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10273,13 +10036,13 @@ class SearchIndexerClient {
     async listDataSourceConnections(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listDataSourceConnections", options);
         try {
-            const result = await this.client.dataSources.list(coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.dataSources.list(updatedOptions);
             return result.dataSources.map(generatedDataSourceToPublicDataSource);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10294,13 +10057,13 @@ class SearchIndexerClient {
     async listDataSourceConnectionsNames(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listDataSourceConnectionsNames", options);
         try {
-            const result = await this.client.dataSources.list(Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { select: "name" }));
+            const result = await this.client.dataSources.list(Object.assign(Object.assign({}, updatedOptions), { select: "name" }));
             return result.dataSources.map((ds) => ds.name);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10315,13 +10078,13 @@ class SearchIndexerClient {
     async listSkillsets(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listSkillsets", options);
         try {
-            const result = await this.client.skillsets.list(coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.skillsets.list(updatedOptions);
             return result.skillsets.map(generatedSkillsetToPublicSkillset);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10336,13 +10099,13 @@ class SearchIndexerClient {
     async listSkillsetsNames(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listSkillsetsNames", options);
         try {
-            const result = await this.client.skillsets.list(Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { select: "name" }));
+            const result = await this.client.skillsets.list(Object.assign(Object.assign({}, updatedOptions), { select: "name" }));
             return result.skillsets.map((sks) => sks.name);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10358,13 +10121,13 @@ class SearchIndexerClient {
     async getIndexer(indexerName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-getIndexer", options);
         try {
-            const result = await this.client.indexers.get(indexerName, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.indexers.get(indexerName, updatedOptions);
             return generatedSearchIndexerToPublicSearchIndexer(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10380,13 +10143,13 @@ class SearchIndexerClient {
     async getDataSourceConnection(dataSourceConnectionName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-getDataSourceConnection", options);
         try {
-            const result = await this.client.dataSources.get(dataSourceConnectionName, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.dataSources.get(dataSourceConnectionName, updatedOptions);
             return generatedDataSourceToPublicDataSource(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10402,13 +10165,13 @@ class SearchIndexerClient {
     async getSkillset(skillsetName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-getSkillset", options);
         try {
-            const result = await this.client.skillsets.get(skillsetName, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.skillsets.get(skillsetName, updatedOptions);
             return generatedSkillsetToPublicSkillset(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10424,13 +10187,13 @@ class SearchIndexerClient {
     async createIndexer(indexer, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createIndexer", options);
         try {
-            const result = await this.client.indexers.create(publicSearchIndexerToGeneratedSearchIndexer(indexer), coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.indexers.create(publicSearchIndexerToGeneratedSearchIndexer(indexer), updatedOptions);
             return generatedSearchIndexerToPublicSearchIndexer(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10446,13 +10209,13 @@ class SearchIndexerClient {
     async createDataSourceConnection(dataSourceConnection, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createDataSourceConnection", options);
         try {
-            const result = await this.client.dataSources.create(publicDataSourceToGeneratedDataSource(dataSourceConnection), coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.dataSources.create(publicDataSourceToGeneratedDataSource(dataSourceConnection), updatedOptions);
             return generatedDataSourceToPublicDataSource(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10468,13 +10231,13 @@ class SearchIndexerClient {
     async createSkillset(skillset, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createSkillset", options);
         try {
-            const result = await this.client.skillsets.create(publicSkillsetToGeneratedSkillset(skillset), coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.skillsets.create(publicSkillsetToGeneratedSkillset(skillset), updatedOptions);
             return generatedSkillsetToPublicSkillset(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10491,13 +10254,13 @@ class SearchIndexerClient {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createOrUpdateIndexer", options);
         try {
             const etag = options.onlyIfUnchanged ? indexer.etag : undefined;
-            const result = await this.client.indexers.createOrUpdate(indexer.name, publicSearchIndexerToGeneratedSearchIndexer(indexer), Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
+            const result = await this.client.indexers.createOrUpdate(indexer.name, publicSearchIndexerToGeneratedSearchIndexer(indexer), Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
             return generatedSearchIndexerToPublicSearchIndexer(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10514,13 +10277,13 @@ class SearchIndexerClient {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createOrUpdateDataSourceConnection", options);
         try {
             const etag = options.onlyIfUnchanged ? dataSourceConnection.etag : undefined;
-            const result = await this.client.dataSources.createOrUpdate(dataSourceConnection.name, publicDataSourceToGeneratedDataSource(dataSourceConnection), Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
+            const result = await this.client.dataSources.createOrUpdate(dataSourceConnection.name, publicDataSourceToGeneratedDataSource(dataSourceConnection), Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
             return generatedDataSourceToPublicDataSource(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10537,13 +10300,13 @@ class SearchIndexerClient {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createOrUpdateSkillset", options);
         try {
             const etag = options.onlyIfUnchanged ? skillset.etag : undefined;
-            const result = await this.client.skillsets.createOrUpdate(skillset.name, publicSkillsetToGeneratedSkillset(skillset), Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
+            const result = await this.client.skillsets.createOrUpdate(skillset.name, publicSkillsetToGeneratedSkillset(skillset), Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
             return generatedSkillsetToPublicSkillset(result);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10565,12 +10328,12 @@ class SearchIndexerClient {
                 : options.onlyIfUnchanged
                     ? indexer.etag
                     : undefined;
-            await this.client.indexers.delete(indexerName, Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
+            await this.client.indexers.delete(indexerName, Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10592,12 +10355,12 @@ class SearchIndexerClient {
                 : options.onlyIfUnchanged
                     ? dataSourceConnection.etag
                     : undefined;
-            await this.client.dataSources.delete(dataSourceConnectionName, Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
+            await this.client.dataSources.delete(dataSourceConnectionName, Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10619,12 +10382,12 @@ class SearchIndexerClient {
                 : options.onlyIfUnchanged
                     ? skillset.etag
                     : undefined;
-            await this.client.skillsets.delete(skillsetName, Object.assign(Object.assign({}, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
+            await this.client.skillsets.delete(skillsetName, Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10640,13 +10403,13 @@ class SearchIndexerClient {
     async getIndexerStatus(indexerName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-getIndexerStatus", options);
         try {
-            const result = await this.client.indexers.getStatus(indexerName, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            const result = await this.client.indexers.getStatus(indexerName, updatedOptions);
             return result;
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10662,12 +10425,12 @@ class SearchIndexerClient {
     async resetIndexer(indexerName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-resetIndexer", options);
         try {
-            await this.client.indexers.reset(indexerName, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            await this.client.indexers.reset(indexerName, updatedOptions);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10683,12 +10446,12 @@ class SearchIndexerClient {
     async runIndexer(indexerName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-runIndexer", options);
         try {
-            await this.client.indexers.run(indexerName, coreHttp.operationOptionsToRequestOptionsBase(updatedOptions));
+            await this.client.indexers.run(indexerName, updatedOptions);
         }
         catch (e) {
             span.setStatus({
-                code: coreTracing.SpanStatusCode.ERROR,
-                message: e.message
+                status: "error",
+                error: e.message,
             });
             throw e;
         }
@@ -10746,7 +10509,7 @@ function odata(strings, ...values) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const readFileAsync = util.promisify(fs.readFile);
+const readFileAsync = util.promisify(fs__namespace.readFile);
 /**
  * Helper method to create a SynonymMap object. This is a NodeJS only method.
  *
@@ -10755,25 +10518,27 @@ const readFileAsync = util.promisify(fs.readFile);
  * @returns SynonymMap object
  */
 async function createSynonymMapFromFile(name, filePath) {
-    const synonyms = (await readFileAsync(filePath, "utf-8")).trim().split(/\s*\r?\n\s*/);
+    const synonyms = (await readFileAsync(filePath, "utf-8"))
+        .replace(/\r/g, "")
+        .split("\n")
+        .map((line) => line.trim())
+        .filter(Boolean);
     return {
         name,
-        synonyms
+        synonyms,
     };
 }
 
 Object.defineProperty(exports, 'AzureKeyCredential', {
     enumerable: true,
-    get: function () {
-        return coreAuth.AzureKeyCredential;
-    }
+    get: function () { return coreAuth.AzureKeyCredential; }
 });
 exports.DEFAULT_BATCH_SIZE = DEFAULT_BATCH_SIZE;
 exports.DEFAULT_FLUSH_WINDOW = DEFAULT_FLUSH_WINDOW;
 exports.DEFAULT_RETRY_COUNT = DEFAULT_RETRY_COUNT;
 exports.GeographyPoint = GeographyPoint;
 exports.IndexDocumentsBatch = IndexDocumentsBatch;
-exports.SearchClient = SearchClient$1;
+exports.SearchClient = SearchClient;
 exports.SearchIndexClient = SearchIndexClient;
 exports.SearchIndexerClient = SearchIndexerClient;
 exports.SearchIndexingBufferedSender = SearchIndexingBufferedSender;