@azure/digital-twins-core 1.1.1-alpha.20221107.1 → 2.0.0-alpha.20230117.2

package/dist/index.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var coreHttp = require('@azure/core-http');
+var uuid = require('uuid');
+var coreClient = require('@azure/core-client');
 var coreTracing = require('@azure/core-tracing');
 var logger$1 = require('@azure/logger');
 
@@ -25,7 +26,25 @@ function _interopNamespace(e) {
     return Object.freeze(n);
 }
 
-var coreHttp__namespace = /*#__PURE__*/_interopNamespace(coreHttp);
+var coreClient__namespace = /*#__PURE__*/_interopNamespace(coreClient);
+
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+const pageMap = new WeakMap();
+function setContinuationToken(page, continuationToken) {
+    var _a;
+    if (typeof page !== "object" || page === null || !continuationToken) {
+        return;
+    }
+    const pageInfo = (_a = pageMap.get(page)) !== null && _a !== void 0 ? _a : {};
+    pageInfo.continuationToken = continuationToken;
+    pageMap.set(page, pageInfo);
+}
 
 /*
  * Copyright (c) Microsoft Corporation.
@@ -67,6 +86,7 @@ const DigitalTwinsModelData = {
                 }
             },
             decommissioned: {
+                defaultValue: false,
                 serializedName: "decommissioned",
                 type: {
                     name: "Boolean"
@@ -75,7 +95,8 @@ const DigitalTwinsModelData = {
             model: {
                 serializedName: "model",
                 type: {
-                    name: "any"
+                    name: "Dictionary",
+                    value: { type: { name: "any" } }
                 }
             }
         }
@@ -120,7 +141,12 @@ const ErrorModel = {
                 readOnly: true,
                 type: {
                     name: "Sequence",
-                    element: { type: { name: "Composite", className: "ErrorModel" } }
+                    element: {
+                        type: {
+                            name: "Composite",
+                            className: "ErrorModel"
+                        }
+                    }
                 }
             },
             innererror: {
@@ -164,7 +190,10 @@ const PagedDigitalTwinsModelDataCollection = {
                 type: {
                     name: "Sequence",
                     element: {
-                        type: { name: "Composite", className: "DigitalTwinsModelData" }
+                        type: {
+                            name: "Composite",
+                            className: "DigitalTwinsModelData"
+                        }
                     }
                 }
             },
@@ -206,7 +235,12 @@ const QueryResult = {
                 serializedName: "value",
                 type: {
                     name: "Sequence",
-                    element: { type: { name: "any" } }
+                    element: {
+                        type: {
+                            name: "Dictionary",
+                            value: { type: { name: "any" } }
+                        }
+                    }
                 }
             },
             continuationToken: {
@@ -227,7 +261,12 @@ const RelationshipCollection = {
                 serializedName: "value",
                 type: {
                     name: "Sequence",
-                    element: { type: { name: "any" } }
+                    element: {
+                        type: {
+                            name: "Dictionary",
+                            value: { type: { name: "any" } }
+                        }
+                    }
                 }
             },
             nextLink: {
@@ -249,7 +288,10 @@ const IncomingRelationshipCollection = {
                 type: {
                     name: "Sequence",
                     element: {
-                        type: { name: "Composite", className: "IncomingRelationship" }
+                        type: {
+                            name: "Composite",
+                            className: "IncomingRelationship"
+                        }
                     }
                 }
             },
@@ -303,7 +345,12 @@ const EventRouteCollection = {
                 serializedName: "value",
                 type: {
                     name: "Sequence",
-                    element: { type: { name: "Composite", className: "EventRoute" } }
+                    element: {
+                        type: {
+                            name: "Composite",
+                            className: "EventRoute"
+                        }
+                    }
                 }
             },
             nextLink: {
@@ -524,43 +571,41 @@ const models = {
         serializedName: "models",
         type: {
             name: "Sequence",
-            element: { type: { name: "any" } }
+            element: {
+                type: {
+                    name: "Dictionary",
+                    value: { type: { name: "any" } }
+                }
+            }
         }
     }
 };
-const $host = {
-    parameterPath: "$host",
-    mapper: {
-        serializedName: "$host",
-        required: true,
-        type: {
-            name: "String"
-        }
-    },
-    skipEncoding: true
-};
-const traceparent = {
-    parameterPath: ["options", "traceparent"],
+const accept = {
+    parameterPath: "accept",
     mapper: {
-        serializedName: "traceparent",
+        defaultValue: "application/json",
+        isConstant: true,
+        serializedName: "Accept",
         type: {
             name: "String"
         }
     }
 };
-const tracestate = {
-    parameterPath: ["options", "tracestate"],
+const $host = {
+    parameterPath: "$host",
     mapper: {
-        serializedName: "tracestate",
+        serializedName: "$host",
+        required: true,
         type: {
             name: "String"
         }
-    }
+    },
+    skipEncoding: true
 };
 const apiVersion = {
     parameterPath: "apiVersion",
     mapper: {
-        defaultValue: "2022-05-31",
+        defaultValue: "2020-10-31",
         isConstant: true,
         serializedName: "api-version",
         type: {
@@ -574,22 +619,27 @@ const dependenciesFor = {
         serializedName: "dependenciesFor",
         type: {
             name: "Sequence",
-            element: { type: { name: "String" } }
+            element: {
+                type: {
+                    name: "String"
+                }
+            }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "Multi"
 };
 const includeModelDefinition = {
     parameterPath: ["options", "includeModelDefinition"],
     mapper: {
+        defaultValue: false,
         serializedName: "includeModelDefinition",
         type: {
             name: "Boolean"
         }
     }
 };
-const maxItemsPerPage = {
-    parameterPath: ["options", "maxItemsPerPage"],
+const resultsPerPage = {
+    parameterPath: ["options", "resultsPerPage"],
     mapper: {
         serializedName: "max-items-per-page",
         type: {
@@ -625,7 +675,12 @@ const updateModel = {
         required: true,
         type: {
             name: "Sequence",
-            element: { type: { name: "any" } }
+            element: {
+                type: {
+                    name: "Dictionary",
+                    value: { type: { name: "any" } }
+                }
+            }
         }
     }
 };
@@ -650,7 +705,8 @@ const twin = {
         serializedName: "twin",
         required: true,
         type: {
-            name: "any"
+            name: "Dictionary",
+            value: { type: { name: "any" } }
         }
     }
 };
@@ -679,7 +735,12 @@ const patchDocument = {
         required: true,
         type: {
             name: "Sequence",
-            element: { type: { name: "any" } }
+            element: {
+                type: {
+                    name: "Dictionary",
+                    value: { type: { name: "any" } }
+                }
+            }
         }
     }
 };
@@ -699,7 +760,8 @@ const relationship = {
         serializedName: "relationship",
         required: true,
         type: {
-            name: "any"
+            name: "Dictionary",
+            value: { type: { name: "any" } }
         }
     }
 };
@@ -718,7 +780,8 @@ const telemetry = {
         serializedName: "telemetry",
         required: true,
         type: {
-            name: "any"
+            name: "Dictionary",
+            value: { type: { name: "any" } }
         }
     }
 };
@@ -763,10 +826,9 @@ const eventRoute = {
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-/**
- * Class representing a DigitalTwinModels.
- */
-class DigitalTwinModels {
+/// <reference lib="esnext.asynciterable" />
+/** Class containing DigitalTwinModels operations. */
+class DigitalTwinModelsImpl {
     /**
      * Initialize a new instance of the class DigitalTwinModels class.
      * @param client Reference to the service client
@@ -774,6 +836,72 @@ class DigitalTwinModels {
     constructor(client) {
         this.client = client;
     }
+    /**
+     * Retrieves model metadata and, optionally, model definitions.
+     * Status codes:
+     * * 200 OK
+     * * 400 Bad Request
+     *   * InvalidArgument - The model id is invalid.
+     *   * LimitExceeded - The maximum number of model ids allowed in 'dependenciesFor' has been reached.
+     * * 404 Not Found
+     *   * ModelNotFound - The model was not found.
+     * @param options The options parameters.
+     */
+    list(options) {
+        const iter = this.listPagingAll(options);
+        return {
+            next() {
+                return iter.next();
+            },
+            [Symbol.asyncIterator]() {
+                return this;
+            },
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listPagingPage(options, settings);
+            }
+        };
+    }
+    listPagingPage(options, settings) {
+        return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._list(options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
+            while (continuationToken) {
+                result = yield tslib.__await(this._listNext(continuationToken, options));
+                continuationToken = result.nextLink;
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
+        });
+    }
+    listPagingAll(options) {
+        return tslib.__asyncGenerator(this, arguments, function* listPagingAll_1() {
+            var e_1, _a;
+            try {
+                for (var _b = tslib.__asyncValues(this.listPagingPage(options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
+                    const page = _c.value;
+                    yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
+                }
+            }
+            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));
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        });
+    }
     /**
      * Uploads one or more models. When any error occurs, no models are uploaded.
      * Status codes:
@@ -788,8 +916,7 @@ class DigitalTwinModels {
      * @param options The options parameters.
      */
     add(options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ options: operationOptions }, addOperationSpec$2);
+        return this.client.sendOperationRequest({ options }, addOperationSpec$2);
     }
     /**
      * Retrieves model metadata and, optionally, model definitions.
@@ -802,9 +929,8 @@ class DigitalTwinModels {
      *   * ModelNotFound - The model was not found.
      * @param options The options parameters.
      */
-    list(options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ options: operationOptions }, listOperationSpec$1);
+    _list(options) {
+        return this.client.sendOperationRequest({ options }, listOperationSpec$1);
     }
     /**
      * Retrieves model metadata and optionally the model definition.
@@ -819,8 +945,7 @@ class DigitalTwinModels {
      * @param options The options parameters.
      */
     getById(id, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, options: operationOptions }, getByIdOperationSpec$2);
+        return this.client.sendOperationRequest({ id, options }, getByIdOperationSpec$2);
     }
     /**
      * Updates the metadata for a model.
@@ -840,8 +965,7 @@ class DigitalTwinModels {
      * @param options The options parameters.
      */
     update(id, updateModel, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, updateModel, options: operationOptions }, updateOperationSpec$1);
+        return this.client.sendOperationRequest({ id, updateModel, options }, updateOperationSpec$1);
     }
     /**
      * Deletes a model. A model can only be deleted if no other models reference it.
@@ -858,21 +982,19 @@ class DigitalTwinModels {
      * @param options The options parameters.
      */
     delete(id, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, options: operationOptions }, deleteOperationSpec$2);
+        return this.client.sendOperationRequest({ id, options }, deleteOperationSpec$2);
     }
     /**
      * ListNext
      * @param nextLink The nextLink from the previous successful call to the List method.
      * @param options The options parameters.
      */
-    listNext(nextLink, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ nextLink, options: operationOptions }, listNextOperationSpec$1);
+    _listNext(nextLink, options) {
+        return this.client.sendOperationRequest({ nextLink, options }, listNextOperationSpec$1);
     }
 }
 // Operation Specifications
-const serializer$3 = new coreHttp__namespace.Serializer(Mappers, /* isXml */ false);
+const serializer$3 = coreClient__namespace.createSerializer(Mappers, /* isXml */ false);
 const addOperationSpec$2 = {
     path: "/models",
     httpMethod: "POST",
@@ -894,11 +1016,7 @@ const addOperationSpec$2 = {
     requestBody: models,
     queryParameters: [apiVersion],
     urlParameters: [$host],
-    headerParameters: [
-        contentType,
-        traceparent,
-        tracestate
-    ],
+    headerParameters: [contentType, accept],
     mediaType: "json",
     serializer: serializer$3
 };
@@ -919,11 +1037,7 @@ const listOperationSpec$1 = {
         includeModelDefinition
     ],
     urlParameters: [$host],
-    headerParameters: [
-        traceparent,
-        tracestate,
-        maxItemsPerPage
-    ],
+    headerParameters: [accept, resultsPerPage],
     serializer: serializer$3
 };
 const getByIdOperationSpec$2 = {
@@ -939,7 +1053,7 @@ const getByIdOperationSpec$2 = {
     },
     queryParameters: [apiVersion, includeModelDefinition],
     urlParameters: [$host, id],
-    headerParameters: [traceparent, tracestate],
+    headerParameters: [accept],
     serializer: serializer$3
 };
 const updateOperationSpec$1 = {
@@ -954,11 +1068,7 @@ const updateOperationSpec$1 = {
     requestBody: updateModel,
     queryParameters: [apiVersion],
     urlParameters: [$host, id],
-    headerParameters: [
-        traceparent,
-        tracestate,
-        contentType1
-    ],
+    headerParameters: [accept, contentType1],
     mediaType: "json",
     serializer: serializer$3
 };
@@ -973,7 +1083,7 @@ const deleteOperationSpec$2 = {
     },
     queryParameters: [apiVersion],
     urlParameters: [$host, id],
-    headerParameters: [traceparent, tracestate],
+    headerParameters: [accept],
     serializer: serializer$3
 };
 const listNextOperationSpec$1 = {
@@ -987,17 +1097,8 @@ const listNextOperationSpec$1 = {
             bodyMapper: ErrorResponse
         }
     },
-    queryParameters: [
-        apiVersion,
-        dependenciesFor,
-        includeModelDefinition
-    ],
     urlParameters: [$host, nextLink],
-    headerParameters: [
-        traceparent,
-        tracestate,
-        maxItemsPerPage
-    ],
+    headerParameters: [accept, resultsPerPage],
     serializer: serializer$3
 };
 
@@ -1008,10 +1109,8 @@ const listNextOperationSpec$1 = {
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-/**
- * Class representing a Query.
- */
-class Query {
+/** Class containing Query operations. */
+class QueryImpl {
     /**
      * Initialize a new instance of the class Query class.
      * @param client Reference to the service client
@@ -1026,18 +1125,19 @@ class Query {
      * * 400 Bad Request
      *   * BadRequest - The continuation token is invalid.
      *   * SqlQueryError - The query contains some errors.
-     * * 429 Too Many Requests
+     *   * TimeoutError - The query execution timed out after 60 seconds. Try simplifying the query or
+     * adding conditions to reduce the result size.
+     *  * 429 Too Many Requests
      *   * QuotaReachedError - The maximum query rate limit has been reached.
      * @param querySpecification The query specification to execute.
      * @param options The options parameters.
      */
     queryTwins(querySpecification, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ querySpecification, options: operationOptions }, queryTwinsOperationSpec);
+        return this.client.sendOperationRequest({ querySpecification, options }, queryTwinsOperationSpec);
     }
 }
 // Operation Specifications
-const serializer$2 = new coreHttp__namespace.Serializer(Mappers, /* isXml */ false);
+const serializer$2 = coreClient__namespace.createSerializer(Mappers, /* isXml */ false);
 const queryTwinsOperationSpec = {
     path: "/query",
     httpMethod: "POST",
@@ -1055,9 +1155,8 @@ const queryTwinsOperationSpec = {
     urlParameters: [$host],
     headerParameters: [
         contentType,
-        traceparent,
-        tracestate,
-        maxItemsPerPage
+        accept,
+        resultsPerPage
     ],
     mediaType: "json",
     serializer: serializer$2
@@ -1070,10 +1169,9 @@ const queryTwinsOperationSpec = {
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-/**
- * Class representing a DigitalTwins.
- */
-class DigitalTwins {
+/// <reference lib="esnext.asynciterable" />
+/** Class containing DigitalTwins operations. */
+class DigitalTwinsImpl {
     /**
      * Initialize a new instance of the class DigitalTwins class.
      * @param client Reference to the service client
@@ -1081,6 +1179,138 @@ class DigitalTwins {
     constructor(client) {
         this.client = client;
     }
+    /**
+     * Retrieves the relationships from a digital twin.
+     * Status codes:
+     * * 200 OK
+     * * 400 Bad Request
+     *   * InvalidArgument - The digital twin id is invalid.
+     * * 404 Not Found
+     *   * DigitalTwinNotFound - The digital twin was not found.
+     * @param id The id of the digital twin. The id is unique within the service and case sensitive.
+     * @param options The options parameters.
+     */
+    listRelationships(id, options) {
+        const iter = this.listRelationshipsPagingAll(id, options);
+        return {
+            next() {
+                return iter.next();
+            },
+            [Symbol.asyncIterator]() {
+                return this;
+            },
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listRelationshipsPagingPage(id, options, settings);
+            }
+        };
+    }
+    listRelationshipsPagingPage(id, options, settings) {
+        return tslib.__asyncGenerator(this, arguments, function* listRelationshipsPagingPage_1() {
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._listRelationships(id, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
+            while (continuationToken) {
+                result = yield tslib.__await(this._listRelationshipsNext(id, continuationToken, options));
+                continuationToken = result.nextLink;
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
+        });
+    }
+    listRelationshipsPagingAll(id, options) {
+        return tslib.__asyncGenerator(this, arguments, function* listRelationshipsPagingAll_1() {
+            var e_1, _a;
+            try {
+                for (var _b = tslib.__asyncValues(this.listRelationshipsPagingPage(id, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
+                    const page = _c.value;
+                    yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
+                }
+            }
+            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));
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        });
+    }
+    /**
+     * Retrieves all incoming relationship for a digital twin.
+     * Status codes:
+     * * 200 OK
+     * * 400 Bad Request
+     *   * InvalidArgument - The digital twin id is invalid.
+     * * 404 Not Found
+     *   * DigitalTwinNotFound - The digital twin was not found.
+     * @param id The id of the digital twin. The id is unique within the service and case sensitive.
+     * @param options The options parameters.
+     */
+    listIncomingRelationships(id, options) {
+        const iter = this.listIncomingRelationshipsPagingAll(id, options);
+        return {
+            next() {
+                return iter.next();
+            },
+            [Symbol.asyncIterator]() {
+                return this;
+            },
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listIncomingRelationshipsPagingPage(id, options, settings);
+            }
+        };
+    }
+    listIncomingRelationshipsPagingPage(id, options, settings) {
+        return tslib.__asyncGenerator(this, arguments, function* listIncomingRelationshipsPagingPage_1() {
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._listIncomingRelationships(id, options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
+            while (continuationToken) {
+                result = yield tslib.__await(this._listIncomingRelationshipsNext(id, continuationToken, options));
+                continuationToken = result.nextLink;
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
+        });
+    }
+    listIncomingRelationshipsPagingAll(id, options) {
+        return tslib.__asyncGenerator(this, arguments, function* listIncomingRelationshipsPagingAll_1() {
+            var e_2, _a;
+            try {
+                for (var _b = tslib.__asyncValues(this.listIncomingRelationshipsPagingPage(id, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
+                    const page = _c.value;
+                    yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
+                }
+            }
+            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));
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+        });
+    }
     /**
      * Retrieves a digital twin.
      * Status codes:
@@ -1093,8 +1323,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     getById(id, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, options: operationOptions }, getByIdOperationSpec$1);
+        return this.client.sendOperationRequest({ id, options }, getByIdOperationSpec$1);
     }
     /**
      * Adds or replaces a digital twin.
@@ -1112,8 +1341,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     add(id, twin, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, twin, options: operationOptions }, addOperationSpec$1);
+        return this.client.sendOperationRequest({ id, twin, options }, addOperationSpec$1);
     }
     /**
      * Deletes a digital twin. All relationships referencing the digital twin must already be deleted.
@@ -1130,8 +1358,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     delete(id, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, options: operationOptions }, deleteOperationSpec$1);
+        return this.client.sendOperationRequest({ id, options }, deleteOperationSpec$1);
     }
     /**
      * Updates a digital twin.
@@ -1151,8 +1378,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     update(id, patchDocument, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, patchDocument, options: operationOptions }, updateOperationSpec);
+        return this.client.sendOperationRequest({ id, patchDocument, options }, updateOperationSpec);
     }
     /**
      * Retrieves a relationship between two digital twins.
@@ -1169,8 +1395,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     getRelationshipById(id, relationshipId, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, relationshipId, options: operationOptions }, getRelationshipByIdOperationSpec);
+        return this.client.sendOperationRequest({ id, relationshipId, options }, getRelationshipByIdOperationSpec);
     }
     /**
      * Adds a relationship between two digital twins.
@@ -1193,8 +1418,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     addRelationship(id, relationshipId, relationship, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, relationshipId, relationship, options: operationOptions }, addRelationshipOperationSpec);
+        return this.client.sendOperationRequest({ id, relationshipId, relationship, options }, addRelationshipOperationSpec);
     }
     /**
      * Deletes a relationship between two digital twins.
@@ -1213,8 +1437,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     deleteRelationship(id, relationshipId, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, relationshipId, options: operationOptions }, deleteRelationshipOperationSpec);
+        return this.client.sendOperationRequest({ id, relationshipId, options }, deleteRelationshipOperationSpec);
     }
     /**
      * Updates the properties on a relationship between two digital twins.
@@ -1239,8 +1462,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     updateRelationship(id, relationshipId, patchDocument, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, relationshipId, patchDocument, options: operationOptions }, updateRelationshipOperationSpec);
+        return this.client.sendOperationRequest({ id, relationshipId, patchDocument, options }, updateRelationshipOperationSpec);
     }
     /**
      * Retrieves the relationships from a digital twin.
@@ -1253,9 +1475,8 @@ class DigitalTwins {
      * @param id The id of the digital twin. The id is unique within the service and case sensitive.
      * @param options The options parameters.
      */
-    listRelationships(id, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, options: operationOptions }, listRelationshipsOperationSpec);
+    _listRelationships(id, options) {
+        return this.client.sendOperationRequest({ id, options }, listRelationshipsOperationSpec);
     }
     /**
      * Retrieves all incoming relationship for a digital twin.
@@ -1268,9 +1489,8 @@ class DigitalTwins {
      * @param id The id of the digital twin. The id is unique within the service and case sensitive.
      * @param options The options parameters.
      */
-    listIncomingRelationships(id, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, options: operationOptions }, listIncomingRelationshipsOperationSpec);
+    _listIncomingRelationships(id, options) {
+        return this.client.sendOperationRequest({ id, options }, listIncomingRelationshipsOperationSpec);
     }
     /**
      * Sends telemetry on behalf of a digital twin.
@@ -1288,8 +1508,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     sendTelemetry(id, messageId, telemetry, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, messageId, telemetry, options: operationOptions }, sendTelemetryOperationSpec);
+        return this.client.sendOperationRequest({ id, messageId, telemetry, options }, sendTelemetryOperationSpec);
     }
     /**
      * Sends telemetry on behalf of a component in a digital twin.
@@ -1309,8 +1528,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     sendComponentTelemetry(id, componentPath, messageId, telemetry, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, componentPath, messageId, telemetry, options: operationOptions }, sendComponentTelemetryOperationSpec);
+        return this.client.sendOperationRequest({ id, componentPath, messageId, telemetry, options }, sendComponentTelemetryOperationSpec);
     }
     /**
      * Retrieves a component from a digital twin.
@@ -1326,8 +1544,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     getComponent(id, componentPath, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, componentPath, options: operationOptions }, getComponentOperationSpec);
+        return this.client.sendOperationRequest({ id, componentPath, options }, getComponentOperationSpec);
     }
     /**
      * Updates a component on a digital twin.
@@ -1348,8 +1565,7 @@ class DigitalTwins {
      * @param options The options parameters.
      */
     updateComponent(id, componentPath, patchDocument, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, componentPath, patchDocument, options: operationOptions }, updateComponentOperationSpec);
+        return this.client.sendOperationRequest({ id, componentPath, patchDocument, options }, updateComponentOperationSpec);
     }
     /**
      * ListRelationshipsNext
@@ -1357,9 +1573,8 @@ class DigitalTwins {
      * @param nextLink The nextLink from the previous successful call to the ListRelationships method.
      * @param options The options parameters.
      */
-    listRelationshipsNext(id, nextLink, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, nextLink, options: operationOptions }, listRelationshipsNextOperationSpec);
+    _listRelationshipsNext(id, nextLink, options) {
+        return this.client.sendOperationRequest({ id, nextLink, options }, listRelationshipsNextOperationSpec);
     }
     /**
      * ListIncomingRelationshipsNext
@@ -1368,19 +1583,20 @@ class DigitalTwins {
      *                 method.
      * @param options The options parameters.
      */
-    listIncomingRelationshipsNext(id, nextLink, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, nextLink, options: operationOptions }, listIncomingRelationshipsNextOperationSpec);
+    _listIncomingRelationshipsNext(id, nextLink, options) {
+        return this.client.sendOperationRequest({ id, nextLink, options }, listIncomingRelationshipsNextOperationSpec);
     }
 }
 // Operation Specifications
-const serializer$1 = new coreHttp__namespace.Serializer(Mappers, /* isXml */ false);
+const serializer$1 = coreClient__namespace.createSerializer(Mappers, /* isXml */ false);
 const getByIdOperationSpec$1 = {
     path: "/digitaltwins/{id}",
     httpMethod: "GET",
     responses: {
         200: {
-            bodyMapper: { type: { name: "any" } },
+            bodyMapper: {
+                type: { name: "Dictionary", value: { type: { name: "any" } } }
+            },
             headersMapper: DigitalTwinsGetByIdHeaders
         },
         default: {
@@ -1389,7 +1605,7 @@ const getByIdOperationSpec$1 = {
     },
     queryParameters: [apiVersion],
     urlParameters: [$host, id],
-    headerParameters: [traceparent, tracestate],
+    headerParameters: [accept],
     serializer: serializer$1
 };
 const addOperationSpec$1 = {
@@ -1397,7 +1613,9 @@ const addOperationSpec$1 = {
     httpMethod: "PUT",
     responses: {
         200: {
-            bodyMapper: { type: { name: "any" } },
+            bodyMapper: {
+                type: { name: "Dictionary", value: { type: { name: "any" } } }
+            },
             headersMapper: DigitalTwinsAddHeaders
         },
         202: {},
@@ -1410,8 +1628,7 @@ const addOperationSpec$1 = {
     urlParameters: [$host, id],
     headerParameters: [
         contentType,
-        traceparent,
-        tracestate,
+        accept,
         ifNoneMatch
     ],
     mediaType: "json",
@@ -1428,11 +1645,7 @@ const deleteOperationSpec$1 = {
     },
     queryParameters: [apiVersion],
     urlParameters: [$host, id],
-    headerParameters: [
-        traceparent,
-        tracestate,
-        ifMatch
-    ],
+    headerParameters: [accept, ifMatch],
     serializer: serializer$1
 };
 const updateOperationSpec = {
@@ -1451,8 +1664,7 @@ const updateOperationSpec = {
     queryParameters: [apiVersion],
     urlParameters: [$host, id],
     headerParameters: [
-        traceparent,
-        tracestate,
+        accept,
         contentType1,
         ifMatch
     ],
@@ -1464,7 +1676,9 @@ const getRelationshipByIdOperationSpec = {
     httpMethod: "GET",
     responses: {
         200: {
-            bodyMapper: { type: { name: "any" } },
+            bodyMapper: {
+                type: { name: "Dictionary", value: { type: { name: "any" } } }
+            },
             headersMapper: DigitalTwinsGetRelationshipByIdHeaders
         },
         default: {
@@ -1473,7 +1687,7 @@ const getRelationshipByIdOperationSpec = {
     },
     queryParameters: [apiVersion],
     urlParameters: [$host, id, relationshipId],
-    headerParameters: [traceparent, tracestate],
+    headerParameters: [accept],
     serializer: serializer$1
 };
 const addRelationshipOperationSpec = {
@@ -1481,7 +1695,9 @@ const addRelationshipOperationSpec = {
     httpMethod: "PUT",
     responses: {
         200: {
-            bodyMapper: { type: { name: "any" } },
+            bodyMapper: {
+                type: { name: "Dictionary", value: { type: { name: "any" } } }
+            },
             headersMapper: DigitalTwinsAddRelationshipHeaders
         },
         default: {
@@ -1493,8 +1709,7 @@ const addRelationshipOperationSpec = {
     urlParameters: [$host, id, relationshipId],
     headerParameters: [
         contentType,
-        traceparent,
-        tracestate,
+        accept,
         ifNoneMatch
     ],
     mediaType: "json",
@@ -1511,11 +1726,7 @@ const deleteRelationshipOperationSpec = {
     },
     queryParameters: [apiVersion],
     urlParameters: [$host, id, relationshipId],
-    headerParameters: [
-        traceparent,
-        tracestate,
-        ifMatch
-    ],
+    headerParameters: [accept, ifMatch],
     serializer: serializer$1
 };
 const updateRelationshipOperationSpec = {
@@ -1533,8 +1744,7 @@ const updateRelationshipOperationSpec = {
     queryParameters: [apiVersion],
     urlParameters: [$host, id, relationshipId],
     headerParameters: [
-        traceparent,
-        tracestate,
+        accept,
         contentType1,
         ifMatch
     ],
@@ -1554,7 +1764,7 @@ const listRelationshipsOperationSpec = {
     },
     queryParameters: [apiVersion, relationshipName],
     urlParameters: [$host, id],
-    headerParameters: [traceparent, tracestate],
+    headerParameters: [accept],
     serializer: serializer$1
 };
 const listIncomingRelationshipsOperationSpec = {
@@ -1570,7 +1780,7 @@ const listIncomingRelationshipsOperationSpec = {
     },
     queryParameters: [apiVersion],
     urlParameters: [$host, id],
-    headerParameters: [traceparent, tracestate],
+    headerParameters: [accept],
     serializer: serializer$1
 };
 const sendTelemetryOperationSpec = {
@@ -1587,8 +1797,7 @@ const sendTelemetryOperationSpec = {
     urlParameters: [$host, id],
     headerParameters: [
         contentType,
-        traceparent,
-        tracestate,
+        accept,
         messageId,
         telemetrySourceTime
     ],
@@ -1609,8 +1818,7 @@ const sendComponentTelemetryOperationSpec = {
     urlParameters: [$host, id, componentPath],
     headerParameters: [
         contentType,
-        traceparent,
-        tracestate,
+        accept,
         messageId,
         telemetrySourceTime
     ],
@@ -1622,7 +1830,9 @@ const getComponentOperationSpec = {
     httpMethod: "GET",
     responses: {
         200: {
-            bodyMapper: { type: { name: "any" } },
+            bodyMapper: {
+                type: { name: "Dictionary", value: { type: { name: "any" } } }
+            },
             headersMapper: DigitalTwinsGetComponentHeaders
         },
         default: {
@@ -1631,7 +1841,7 @@ const getComponentOperationSpec = {
     },
     queryParameters: [apiVersion],
     urlParameters: [$host, id, componentPath],
-    headerParameters: [traceparent, tracestate],
+    headerParameters: [accept],
     serializer: serializer$1
 };
 const updateComponentOperationSpec = {
@@ -1650,8 +1860,7 @@ const updateComponentOperationSpec = {
     queryParameters: [apiVersion],
     urlParameters: [$host, id, componentPath],
     headerParameters: [
-        traceparent,
-        tracestate,
+        accept,
         contentType1,
         ifMatch
     ],
@@ -1669,9 +1878,8 @@ const listRelationshipsNextOperationSpec = {
             bodyMapper: ErrorResponse
         }
     },
-    queryParameters: [apiVersion, relationshipName],
     urlParameters: [$host, id, nextLink],
-    headerParameters: [traceparent, tracestate],
+    headerParameters: [accept],
     serializer: serializer$1
 };
 const listIncomingRelationshipsNextOperationSpec = {
@@ -1685,9 +1893,8 @@ const listIncomingRelationshipsNextOperationSpec = {
             bodyMapper: ErrorResponse
         }
     },
-    queryParameters: [apiVersion],
     urlParameters: [$host, id, nextLink],
-    headerParameters: [traceparent, tracestate],
+    headerParameters: [accept],
     serializer: serializer$1
 };
 
@@ -1698,10 +1905,9 @@ const listIncomingRelationshipsNextOperationSpec = {
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-/**
- * Class representing a EventRoutes.
- */
-class EventRoutes {
+/// <reference lib="esnext.asynciterable" />
+/** Class containing EventRoutes operations. */
+class EventRoutesImpl {
     /**
      * Initialize a new instance of the class EventRoutes class.
      * @param client Reference to the service client
@@ -1716,8 +1922,68 @@ class EventRoutes {
      * @param options The options parameters.
      */
     list(options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ options: operationOptions }, listOperationSpec);
+        const iter = this.listPagingAll(options);
+        return {
+            next() {
+                return iter.next();
+            },
+            [Symbol.asyncIterator]() {
+                return this;
+            },
+            byPage: (settings) => {
+                if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
+                    throw new Error("maxPageSize is not supported by this operation.");
+                }
+                return this.listPagingPage(options, settings);
+            }
+        };
+    }
+    listPagingPage(options, settings) {
+        return tslib.__asyncGenerator(this, arguments, function* listPagingPage_1() {
+            let result;
+            let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
+            if (!continuationToken) {
+                result = yield tslib.__await(this._list(options));
+                let page = result.value || [];
+                continuationToken = result.nextLink;
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
+            while (continuationToken) {
+                result = yield tslib.__await(this._listNext(continuationToken, options));
+                continuationToken = result.nextLink;
+                let page = result.value || [];
+                setContinuationToken(page, continuationToken);
+                yield yield tslib.__await(page);
+            }
+        });
+    }
+    listPagingAll(options) {
+        return tslib.__asyncGenerator(this, arguments, function* listPagingAll_1() {
+            var e_1, _a;
+            try {
+                for (var _b = tslib.__asyncValues(this.listPagingPage(options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
+                    const page = _c.value;
+                    yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
+                }
+            }
+            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));
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        });
+    }
+    /**
+     * Retrieves all event routes.
+     * Status codes:
+     * * 200 OK
+     * @param options The options parameters.
+     */
+    _list(options) {
+        return this.client.sendOperationRequest({ options }, listOperationSpec);
     }
     /**
      * Retrieves an event route.
@@ -1729,8 +1995,7 @@ class EventRoutes {
      * @param options The options parameters.
      */
     getById(id, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, options: operationOptions }, getByIdOperationSpec);
+        return this.client.sendOperationRequest({ id, options }, getByIdOperationSpec);
     }
     /**
      * Adds or replaces an event route.
@@ -1745,8 +2010,7 @@ class EventRoutes {
      * @param options The options parameters.
      */
     add(id, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, options: operationOptions }, addOperationSpec);
+        return this.client.sendOperationRequest({ id, options }, addOperationSpec);
     }
     /**
      * Deletes an event route.
@@ -1758,21 +2022,19 @@ class EventRoutes {
      * @param options The options parameters.
      */
     delete(id, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ id, options: operationOptions }, deleteOperationSpec);
+        return this.client.sendOperationRequest({ id, options }, deleteOperationSpec);
     }
     /**
      * ListNext
      * @param nextLink The nextLink from the previous successful call to the List method.
      * @param options The options parameters.
      */
-    listNext(nextLink, options) {
-        const operationOptions = coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {});
-        return this.client.sendOperationRequest({ nextLink, options: operationOptions }, listNextOperationSpec);
+    _listNext(nextLink, options) {
+        return this.client.sendOperationRequest({ nextLink, options }, listNextOperationSpec);
     }
 }
 // Operation Specifications
-const serializer = new coreHttp__namespace.Serializer(Mappers, /* isXml */ false);
+const serializer = coreClient__namespace.createSerializer(Mappers, /* isXml */ false);
 const listOperationSpec = {
     path: "/eventroutes",
     httpMethod: "GET",
@@ -1786,11 +2048,7 @@ const listOperationSpec = {
     },
     queryParameters: [apiVersion],
     urlParameters: [$host],
-    headerParameters: [
-        traceparent,
-        tracestate,
-        maxItemsPerPage
-    ],
+    headerParameters: [accept, resultsPerPage],
     serializer
 };
 const getByIdOperationSpec = {
@@ -1806,7 +2064,7 @@ const getByIdOperationSpec = {
     },
     queryParameters: [apiVersion],
     urlParameters: [$host, id],
-    headerParameters: [traceparent, tracestate],
+    headerParameters: [accept],
     serializer
 };
 const addOperationSpec = {
@@ -1821,11 +2079,7 @@ const addOperationSpec = {
     requestBody: eventRoute,
     queryParameters: [apiVersion],
     urlParameters: [$host, id],
-    headerParameters: [
-        contentType,
-        traceparent,
-        tracestate
-    ],
+    headerParameters: [contentType, accept],
     mediaType: "json",
     serializer
 };
@@ -1840,7 +2094,7 @@ const deleteOperationSpec = {
     },
     queryParameters: [apiVersion],
     urlParameters: [$host, id],
-    headerParameters: [traceparent, tracestate],
+    headerParameters: [accept],
     serializer
 };
 const listNextOperationSpec = {
@@ -1854,13 +2108,8 @@ const listNextOperationSpec = {
             bodyMapper: ErrorResponse
         }
     },
-    queryParameters: [apiVersion],
     urlParameters: [$host, nextLink],
-    headerParameters: [
-        traceparent,
-        tracestate,
-        maxItemsPerPage
-    ],
+    headerParameters: [accept, resultsPerPage],
     serializer
 };
 
@@ -1871,57 +2120,67 @@ const listNextOperationSpec = {
  * 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/digital-twins-core";
-const packageVersion = "1.1.1";
-class AzureDigitalTwinsAPIContext extends coreHttp__namespace.ServiceClient {
+class AzureDigitalTwinsAPI extends coreClient__namespace.ServiceClient {
     /**
-     * Initializes a new instance of the AzureDigitalTwinsAPIContext class.
+     * Initializes a new instance of the AzureDigitalTwinsAPI class.
      * @param options The parameter options
      */
     constructor(options) {
+        var _a, _b;
         // Initializing default values for options
         if (!options) {
             options = {};
         }
-        if (!options.userAgent) {
-            const defaultUserAgent = coreHttp__namespace.getDefaultUserAgentValue();
-            options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
-        }
-        super(undefined, options);
-        this.requestContentType = "application/json; charset=utf-8";
-        this.baseUri =
-            options.endpoint || "https://digitaltwins-name.digitaltwins.azure.net";
+        const defaults = {
+            requestContentType: "application/json; charset=utf-8"
+        };
+        const packageDetails = `azsdk-js-digital-twins-core/2.0.0`;
+        const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+            ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
+            : `${packageDetails}`;
+        const optionsWithDefaults = Object.assign(Object.assign(Object.assign({}, defaults), options), { userAgentOptions: {
+                userAgentPrefix
+            }, endpoint: (_b = (_a = options.endpoint) !== null && _a !== void 0 ? _a : options.baseUri) !== null && _b !== void 0 ? _b : "https://digitaltwins-hostname" });
+        super(optionsWithDefaults);
         // Assigning values to Constant parameters
-        this.$host =
-            options.$host || "https://digitaltwins-name.digitaltwins.azure.net";
-        this.apiVersion = options.apiVersion || "2022-05-31";
-    }
-}
-
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-class AzureDigitalTwinsAPI extends AzureDigitalTwinsAPIContext {
-    /**
-     * Initializes a new instance of the AzureDigitalTwinsAPI class.
-     * @param options The parameter options
-     */
-    constructor(options) {
-        super(options);
-        this.digitalTwinModels = new DigitalTwinModels(this);
-        this.query = new Query(this);
-        this.digitalTwins = new DigitalTwins(this);
-        this.eventRoutes = new EventRoutes(this);
+        this.$host = options.$host || "https://digitaltwins-hostname";
+        this.apiVersion = options.apiVersion || "2020-10-31";
+        this.digitalTwinModels = new DigitalTwinModelsImpl(this);
+        this.query = new QueryImpl(this);
+        this.digitalTwins = new DigitalTwinsImpl(this);
+        this.eventRoutes = new EventRoutesImpl(this);
+        this.addCustomApiVersionPolicy(options.apiVersion);
+    }
+    /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+    addCustomApiVersionPolicy(apiVersion) {
+        if (!apiVersion) {
+            return;
+        }
+        const apiVersionPolicy = {
+            name: "CustomApiVersionPolicy",
+            async sendRequest(request, next) {
+                const param = request.url.split("?");
+                if (param.length > 1) {
+                    const newParams = param[1].split("&").map((item) => {
+                        if (item.indexOf("api-version") > -1) {
+                            return "api-version=" + apiVersion;
+                        }
+                        else {
+                            return item;
+                        }
+                    });
+                    request.url = param[0] + "?" + newParams.join("&");
+                }
+                return next(request);
+            }
+        };
+        this.pipeline.addPolicy(apiVersionPolicy);
     }
 }
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-const SDK_VERSION$1 = "1.1.1";
+const SDK_VERSION = "2.0.0";
 
 // Copyright (c) Microsoft Corporation.
 /**
@@ -1931,7 +2190,7 @@ const SDK_VERSION$1 = "1.1.1";
 const tracingClient = coreTracing.createTracingClient({
     namespace: "Microsoft.DigitalTwins",
     packageName: "@azure/digital-twins-core",
-    packageVersion: SDK_VERSION$1,
+    packageVersion: SDK_VERSION,
 });
 
 // Copyright (c) Microsoft Corporation.
@@ -1941,7 +2200,6 @@ const tracingClient = coreTracing.createTracingClient({
 const logger = logger$1.createClientLogger("azure-digitaltwins-core");
 
 // Copyright (c) Microsoft Corporation.
-const SDK_VERSION = "1.1.0";
 const DEFAULT_DIGITALTWINS_SCOPE = "https://digitaltwins.azure.net/.default";
 /**
  * Client for Azure IoT DigitalTwins API.
@@ -1964,33 +2222,18 @@ class DigitalTwinsClient {
      * @param options - Used to configure the service client.
      */
     constructor(endpointUrl, credential, options = {}) {
-        const authPolicy = coreHttp.bearerTokenAuthenticationPolicy(credential, DEFAULT_DIGITALTWINS_SCOPE);
-        const libInfo = `azsdk-js-digital-twins-core/${SDK_VERSION}`;
-        const { apiVersion } = options, pipelineOptions = tslib.__rest(options, ["apiVersion"]);
-        if (!pipelineOptions.userAgentOptions) {
-            pipelineOptions.userAgentOptions = {};
-        }
-        if (pipelineOptions.userAgentOptions.userAgentPrefix) {
-            pipelineOptions.userAgentOptions.userAgentPrefix = `${pipelineOptions.userAgentOptions.userAgentPrefix} ${libInfo}`;
-        }
-        else {
-            pipelineOptions.userAgentOptions.userAgentPrefix = libInfo;
-        }
-        const internalPipelineOptions = Object.assign(Object.assign({}, pipelineOptions), {
-            loggingOptions: {
+        const internalPipelineOptions = Object.assign(Object.assign({}, options), { loggingOptions: {
                 logger: logger.info,
-                allowedHeaderNames: ["x-ms-request-id"],
-            },
-        });
-        const pipeline = coreHttp.createPipelineFromOptions(internalPipelineOptions, authPolicy);
-        this.client = new AzureDigitalTwinsAPI(Object.assign({ endpoint: endpointUrl, apiVersion }, pipeline));
+                additionalAllowedHeaderNames: ["x-ms-request-id"],
+            } });
+        this.client = new AzureDigitalTwinsAPI(Object.assign({ endpoint: endpointUrl, credential, credentialScopes: DEFAULT_DIGITALTWINS_SCOPE }, internalPipelineOptions));
     }
     /**
      * Get a digital twin
      *
      * @param digitalTwinId - The Id of the digital twin.
      * @param options - The operation options
-     * @returns The application/json digital twin and the http response.
+     * @returns The application/json digital twin.
      */
     getDigitalTwin(digitalTwinId, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.getDigitalTwin", options, async (updatedOptions) => {
@@ -2004,7 +2247,7 @@ class DigitalTwinsClient {
      * @param digitalTwinJson - The application/json digital twin to create.
      * @param options - Extended operation options including
      *  ifNoneMatch: Only perform the operation if the entity does not already exist.
-     * @returns The created application/json digital twin and the http response.
+     * @returns The created application/json digital twin.
      */
     upsertDigitalTwin(digitalTwinId, digitalTwinJson, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.upsertDigitalTwin", options, async (updatedOptions) => {
@@ -2021,11 +2264,9 @@ class DigitalTwinsClient {
      * remove.
      * @param options - Extended operation options including
      *   ifMatch: Only perform the operation if the entity's etag matches one of the etags provided or * is provided.
-     * @returns The http response.
+  
      */
-    updateDigitalTwin(digitalTwinId, 
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types -- changing the type any would be a breaking change
-    jsonPatch, options = {}) {
+    updateDigitalTwin(digitalTwinId, jsonPatch, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.updateDigitalTwin", options, async (updatedOptions) => {
             return this.client.digitalTwins.update(digitalTwinId, jsonPatch, updatedOptions);
         });
@@ -2036,7 +2277,7 @@ class DigitalTwinsClient {
      * @param digitalTwinId - The Id of the digital twin to delete.
      * @param options - Extended operation options including
      *   ifMatch: Only perform the operation if the entity's etag matches one of the etags provided or * is provided.
-     * @returns The http response.
+  
      */
     deleteDigitalTwin(digitalTwinId, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.deleteDigitalTwin", options, async (updatedOptions) => {
@@ -2049,7 +2290,7 @@ class DigitalTwinsClient {
      * @param digitalTwinId - The Id of the digital twin.
      * @param componentName - The component being retrieved.
      * @param options - The operation options
-     * @returns Json string representation of the component corresponding to the provided componentName and the HTTP response.
+     * @returns Json string representation of the component corresponding to the provided componentName.
      */
     getComponent(digitalTwinId, componentName, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.getComponent", options, async (updatedOptions) => {
@@ -2065,7 +2306,7 @@ class DigitalTwinsClient {
      * @param enableUpdate - If true then update of an existing digital twin is enabled.
      * @param options - Extended operation options including
      *   ifMatch: Only perform the operation if the entity's etag matches one of the etags provided or * is provided.
-     * @returns The http response.
+  
      */
     updateComponent(digitalTwinId, componentName, jsonPatch, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.updateComponent", options, async (updatedOptions) => {
@@ -2078,7 +2319,7 @@ class DigitalTwinsClient {
      * @param digitalTwinId - The Id of the source digital twin.
      * @param relationshipId - The Id of the relationship to retrieve.
      * @param options - The operation options
-     * @returns The pageable list of application/json relationships belonging to the specified digital twin and the http response.
+     * @returns The pageable list of application/json relationships belonging to the specified digital twin.
      */
     getRelationship(digitalTwinId, relationshipId, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.getRelationship", options, async (updatedOptions) => {
@@ -2094,9 +2335,7 @@ class DigitalTwinsClient {
      * @param options - Extended operation options including
      *  ifNoneMatch: Only perform the operation if the entity does not already exist.
      */
-    upsertRelationship(digitalTwinId, relationshipId, 
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types -- changing the type any would be a breaking change
-    relationship, options = {}) {
+    upsertRelationship(digitalTwinId, relationshipId, relationship, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.upsertRelationship", options, async (updatedOptions) => {
             return this.client.digitalTwins.addRelationship(digitalTwinId, relationshipId, relationship, updatedOptions);
         });
@@ -2122,141 +2361,28 @@ class DigitalTwinsClient {
      * @param relationshipId - The Id of the relationship to delete.
      * @param options - The operation options
      *   ifMatch: Only perform the operation if the entity's etag matches one of the etags provided or * is
-     * @returns The http response.
+  
      */
     deleteRelationship(digitalTwinId, relationshipId, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.deleteRelationship", options, async (updatedOptions) => {
             return this.client.digitalTwins.deleteRelationship(digitalTwinId, relationshipId, updatedOptions);
         });
     }
-    /**
-     * Deals with the pagination of {@link listRelationships}.
-     *
-     * @param digitalTwinId - The Id of the digital twin.
-     * @param options - Common options for the iterative endpoints.
-     * @param continuationState - An object that indicates the position of the paginated request.
-     *
-     */
-    listRelationshipsPage(digitalTwinId, options, continuationState) {
-        return tslib.__asyncGenerator(this, arguments, function* listRelationshipsPage_1() {
-            if (continuationState.continuationToken == null) {
-                const optionsComplete = Object.assign({}, options);
-                const listRelationshipResponse = yield tslib.__await(this.client.digitalTwins.listRelationships(digitalTwinId, optionsComplete));
-                continuationState.continuationToken = listRelationshipResponse.nextLink;
-                yield yield tslib.__await(listRelationshipResponse);
-            }
-            while (continuationState.continuationToken) {
-                const listRelationshipResponse = yield tslib.__await(this.client.digitalTwins.listRelationshipsNext("", continuationState.continuationToken, options));
-                continuationState.continuationToken = listRelationshipResponse.nextLink;
-                yield yield tslib.__await(listRelationshipResponse);
-            }
-        });
-    }
-    /**
-     * Deals with the iteration of all the available results of {@link listRelationships}.
-     * @param options - Common options for the iterative endpoints.
-     */
-    listRelationshipsAll(digitalTwinId, options) {
-        return tslib.__asyncGenerator(this, arguments, function* listRelationshipsAll_1() {
-            var e_1, _a;
-            try {
-                for (var _b = tslib.__asyncValues(this.listRelationshipsPage(digitalTwinId, options, {})), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
-                    const page = _c.value;
-                    const value = page.value || [];
-                    for (const item of value) {
-                        yield yield tslib.__await(item);
-                    }
-                }
-            }
-            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));
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-        });
-    }
     /**
      * Retrieve relationships for a digital twin.
      *
      * @param digitalTwinId - The Id of the digital twin.
      */
-    listRelationships(digitalTwinId, options = {}) {
-        const iter = this.listRelationshipsAll(digitalTwinId, options);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: (settings = {}) => this.listRelationshipsPage(digitalTwinId, options, settings),
-        };
-    }
-    /**
-     * Deals with the pagination of {@link listIncomingRelationships}.
-     *
-     * @param digitalTwinId - The Id of the digital twin.
-     * @param options - Common options for the iterative endpoints.
-     * @param continuationState - An object that indicates the position of the paginated request.
-     *
-     */
-    listIncomingRelationshipsPage(digitalTwinId, options, continuationState) {
-        return tslib.__asyncGenerator(this, arguments, function* listIncomingRelationshipsPage_1() {
-            if (continuationState.continuationToken == null) {
-                const optionsComplete = Object.assign({}, options);
-                const listIncomingRelationshipsResponse = yield tslib.__await(this.client.digitalTwins.listIncomingRelationships(digitalTwinId, optionsComplete));
-                continuationState.continuationToken = listIncomingRelationshipsResponse.nextLink;
-                yield yield tslib.__await(listIncomingRelationshipsResponse);
-            }
-            while (continuationState.continuationToken) {
-                const listIncomingRelationshipsResponse = yield tslib.__await(this.client.digitalTwins.listIncomingRelationshipsNext("", continuationState.continuationToken, options));
-                continuationState.continuationToken = listIncomingRelationshipsResponse.nextLink;
-                yield yield tslib.__await(listIncomingRelationshipsResponse);
-            }
-        });
-    }
-    /**
-     * Deals with the iteration of all the available results of {@link listIncomingRelationships}.
-     * @param digitalTwinId - The Id of the digital twin.
-     * @param options - Common options for the iterative endpoints.
-     */
-    listIncomingRelationshipsAll(digitalTwinId, options) {
-        return tslib.__asyncGenerator(this, arguments, function* listIncomingRelationshipsAll_1() {
-            var e_2, _a;
-            try {
-                for (var _b = tslib.__asyncValues(this.listIncomingRelationshipsPage(digitalTwinId, options, {})), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
-                    const page = _c.value;
-                    const value = page.value || [];
-                    yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(value)));
-                }
-            }
-            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));
-                }
-                finally { if (e_2) throw e_2.error; }
-            }
-        });
+    listRelationships(digitalTwinId, options) {
+        return this.client.digitalTwins.listRelationships(digitalTwinId, options);
     }
     /**
      * Retrieve all incoming relationships for a digital twin.
      *
      * @param digitalTwinId - The Id of the digital twin.
      */
-    listIncomingRelationships(digitalTwinId, options = {}) {
-        const iter = this.listIncomingRelationshipsAll(digitalTwinId, options);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: (settings = {}) => this.listIncomingRelationshipsPage(digitalTwinId, options, settings),
-        };
+    listIncomingRelationships(digitalTwinId, options) {
+        return this.client.digitalTwins.listIncomingRelationships(digitalTwinId, options);
     }
     /**
      * Publish telemetry from a digital twin, which is then consumed by one or many destination endpoints (subscribers) defined under.
@@ -2265,18 +2391,11 @@ class DigitalTwinsClient {
      * @param payload - The application/json telemetry payload to be sent.
      * @param messageId - The message Id.
      * @param options - The operation options
-     * @returns The http response.
-     */
-    publishTelemetry(digitalTwinId, 
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types -- changing the type any would be a breaking change
-    payload, messageId, options = {}) {
-        const digitalTwinsSendTelemetryOptionalParams = options;
-        digitalTwinsSendTelemetryOptionalParams.telemetrySourceTime = new Date().toISOString();
-        if (!messageId) {
-            messageId = coreHttp.generateUuid();
-        }
-        return tracingClient.withSpan("DigitalTwinsClient.publishTelemetry", digitalTwinsSendTelemetryOptionalParams, async (updatedOptions) => {
-            return this.client.digitalTwins.sendTelemetry(digitalTwinId, messageId, payload, updatedOptions);
+  
+     */
+    publishTelemetry(digitalTwinId, payload, messageId, options = {}) {
+        return tracingClient.withSpan("DigitalTwinsClient.publishTelemetry", options, async (updatedOptions) => {
+            return this.client.digitalTwins.sendTelemetry(digitalTwinId, messageId || uuid.v4(), payload, Object.assign(Object.assign({}, updatedOptions), { telemetrySourceTime: new Date().toISOString() }));
         });
     }
     /**
@@ -2287,119 +2406,45 @@ class DigitalTwinsClient {
      * @param payload - The application/json telemetry payload to be sent.
      * @param messageId - The message Id.
      * @param options - The operation options
-     * @returns The http response.
+  
      */
     publishComponentTelemetry(digitalTwinId, componentName, payload, messageId, options = {}) {
-        const digitalTwinsSendComponentTelemetryOptionalParams = options;
-        digitalTwinsSendComponentTelemetryOptionalParams.telemetrySourceTime = new Date().toISOString();
-        if (!messageId) {
-            messageId = coreHttp.generateUuid();
-        }
-        return tracingClient.withSpan("DigitalTwinsClient.publishComponentTelemetry", digitalTwinsSendComponentTelemetryOptionalParams, async (updatedOptions) => {
-            return this.client.digitalTwins.sendComponentTelemetry(digitalTwinId, componentName, payload, messageId, updatedOptions);
+        return tracingClient.withSpan("DigitalTwinsClient.publishComponentTelemetry", options, async (updatedOptions) => {
+            return this.client.digitalTwins.sendComponentTelemetry(digitalTwinId, componentName, messageId || uuid.v4(), payload, Object.assign(Object.assign({}, updatedOptions), { telemetrySourceTime: new Date().toISOString() }));
         });
     }
     /**
      * Get a model, including the model metadata and the model definition.
      *
      * @param modelId - The Id of the model.
-     * @param options - Extended operation options including
-     *  includeModelDefinition: When true the model definition will be returned as part of the result. Default value: false.
-     * @returns The application/json model and the http response.
+     * @param options - Options for this operation
+     * @returns The application/json model.
      */
-    getModel(modelId, includeModelDefinition = false, options = {}) {
-        const digitalTwinModelsGetByIdOptionalParams = options;
-        digitalTwinModelsGetByIdOptionalParams.includeModelDefinition = includeModelDefinition;
-        return tracingClient.withSpan("DigitalTwinsClient.getModel", digitalTwinModelsGetByIdOptionalParams, async (updatedOptions) => {
+    getModel(modelId, options = {}) {
+        var _a;
+        return tracingClient.withSpan("DigitalTwinsClient.getModel", Object.assign(Object.assign({}, options), { includeModelDefinition: (_a = options === null || options === void 0 ? void 0 : options.includeModelDefinition) !== null && _a !== void 0 ? _a : false }), async (updatedOptions) => {
             return this.client.digitalTwinModels.getById(modelId, updatedOptions);
         });
     }
-    /**
-     * Deals with the pagination of {@link list}.
-     *
-     * @param options - Common options for the iterative endpoints.
-     * @param continuationState - An object that indicates the position of the paginated request.
-     *
-     */
-    getModelsPage(options, continuationState) {
-        return tslib.__asyncGenerator(this, arguments, function* getModelsPage_1() {
-            if (continuationState.continuationToken == null) {
-                const optionsComplete = options;
-                optionsComplete.maxItemsPerPage = continuationState.maxPageSize;
-                const listResponse = yield tslib.__await(this.client.digitalTwinModels.list(optionsComplete));
-                continuationState.continuationToken = listResponse.nextLink;
-                yield yield tslib.__await(listResponse);
-            }
-            while (continuationState.continuationToken) {
-                const listResponse = yield tslib.__await(this.client.digitalTwinModels.listNext(continuationState.continuationToken, options));
-                continuationState.continuationToken = listResponse.nextLink;
-                yield yield tslib.__await(listResponse);
-            }
-        });
-    }
-    /**
-     * Deals with the iteration of all the available results of {@link list}.
-     * @param options - Common options for the iterative endpoints.
-     */
-    getModelsAll(options) {
-        return tslib.__asyncGenerator(this, arguments, function* getModelsAll_1() {
-            var e_3, _a;
-            const f = {};
-            try {
-                for (var _b = tslib.__asyncValues(this.getModelsPage(options, f)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
-                    const page = _c.value;
-                    const value = page.value || [];
-                    for (const item of value) {
-                        yield yield tslib.__await(item);
-                    }
-                }
-            }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) yield tslib.__await(_a.call(_b));
-                }
-                finally { if (e_3) throw e_3.error; }
-            }
-        });
-    }
     /**
      * Get the list of models
      *
-     * @param dependeciesFor - The model Ids to have dependencies retrieved. If omitted, all models are retrieved.
-     * @param includeModelDefinition - Whether to include the model definition in the result. If false, only the model metadata will be returned.
-     * @param resultsPerPage - The maximum number of items to retrieve per request. The server may choose to return less than the requested max.
-     * @returns A pageable set of application/json models and the http response.
-     */
-    listModels(dependeciesFor, includeModelDefinition = false, resultsPerPage, options = {}) {
-        let digitalTwinModelsListOptionalParams = options;
-        digitalTwinModelsListOptionalParams = {
-            maxItemsPerPage: resultsPerPage,
-            dependenciesFor: dependeciesFor,
-            includeModelDefinition: includeModelDefinition,
-        };
-        const iter = this.getModelsAll(digitalTwinModelsListOptionalParams);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: (settings = {}) => this.getModelsPage(digitalTwinModelsListOptionalParams, settings),
-        };
+     * @param options - Options for listing models.
+     * @returns A pageable set of application/json models.
+     */
+    listModels(options = {}) {
+        var _a;
+        return this.client.digitalTwinModels.list(Object.assign(Object.assign({}, options), { includeModelDefinition: (_a = options === null || options === void 0 ? void 0 : options.includeModelDefinition) !== null && _a !== void 0 ? _a : false }));
     }
     /**
      * Create one or many
      *
-     * @param models - The set of models to create. Each string corresponds to exactly one model.
+     * @param dtdlModels - The set of models to create. Each string corresponds to exactly one model.
      * @param options - The operation options
-     * @returns The created application/json models and the http response.
+     * @returns The created application/json models.
      */
     createModels(dtdlModels, options = {}) {
-        const digitalTwinModelsAddOptionalParams = options;
-        digitalTwinModelsAddOptionalParams.models = dtdlModels;
-        return tracingClient.withSpan("DigitalTwinsClient.createModels", digitalTwinModelsAddOptionalParams, async (updatedOptions) => {
+        return tracingClient.withSpan("DigitalTwinsClient.createModels", Object.assign(Object.assign({}, options), { models: dtdlModels }), async (updatedOptions) => {
             return this.client.digitalTwinModels.add(updatedOptions);
         });
     }
@@ -2412,7 +2457,7 @@ class DigitalTwinsClient {
      * @param modelId - The Id of the model to decommission.
      * property can be replaced.
      * @param options - The operation options
-     * @returns The http response.
+  
      *
      */
     decomissionModel(modelId, options = {}) {
@@ -2426,7 +2471,7 @@ class DigitalTwinsClient {
      *
      * @param modelId - The Id of the model to delete.
      * @param options - The operation options
-     * @returns The http response.
+  
      */
     deleteModel(modelId, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.deleteModel", options, async (updatedOptions) => {
@@ -2438,84 +2483,21 @@ class DigitalTwinsClient {
      *
      * @param modelId - The Id of the event route.
      * @param options - The operation options
-     * @returns The application/json event route and the http response.
+     * @returns The application/json event route.
      */
     getEventRoute(eventRouteId, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.getEventRoute", options, async (updatedOptions) => {
             return this.client.eventRoutes.getById(eventRouteId, updatedOptions);
         });
     }
-    /**
-     * Deals with the pagination of {@link list}.
-     *
-     * @param options - Common options for the iterative endpoints.
-     * @param continuationState - An object that indicates the position of the paginated request.
-     *
-     */
-    getEventRoutesPage(options, continuationState) {
-        return tslib.__asyncGenerator(this, arguments, function* getEventRoutesPage_1() {
-            if (continuationState.continuationToken == null) {
-                const optionsComplete = options;
-                optionsComplete.maxItemsPerPage = continuationState.maxPageSize;
-                const listResponse = yield tslib.__await(this.client.eventRoutes.list(optionsComplete));
-                continuationState.continuationToken = listResponse.nextLink;
-                yield yield tslib.__await(listResponse);
-            }
-            while (continuationState.continuationToken) {
-                const listResponse = yield tslib.__await(this.client.eventRoutes.listNext(continuationState.continuationToken, options));
-                continuationState.continuationToken = listResponse.nextLink;
-                yield yield tslib.__await(listResponse);
-            }
-        });
-    }
-    /**
-     * Deals with the iteration of all the available results of {@link list}.
-     * @param options - Common options for the iterative endpoints.
-     */
-    getEventRoutesAll(options) {
-        return tslib.__asyncGenerator(this, arguments, function* getEventRoutesAll_1() {
-            var e_4, _a;
-            const f = {};
-            try {
-                for (var _b = tslib.__asyncValues(this.getEventRoutesPage(options, f)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
-                    const page = _c.value;
-                    const value = page.value || [];
-                    for (const item of value) {
-                        yield yield tslib.__await(item);
-                    }
-                }
-            }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) yield tslib.__await(_a.call(_b));
-                }
-                finally { if (e_4) throw e_4.error; }
-            }
-        });
-    }
     /**
      * List the event routes in a digital twins instance.
      *
-     * @param resultsPerPage - The maximum number of items to retrieve per request. The server may choose to return less than
-     * the requested max.
-     * @returns The application/json event route and the http response.
-     */
-    listEventRoutes(resultsPerPage, options = {}) {
-        let eventRoutesListOptionalParams = options;
-        eventRoutesListOptionalParams = {
-            maxItemsPerPage: resultsPerPage,
-        };
-        const iter = this.getEventRoutesAll(eventRoutesListOptionalParams);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: (settings = {}) => this.getEventRoutesPage(eventRoutesListOptionalParams, settings),
-        };
+     * @param options - Options for listEventRoutes.
+     * @returns The application/json event route.
+     */
+    listEventRoutes(options) {
+        return this.client.eventRoutes.list(options);
     }
     /**
      * Create or update an event route.
@@ -2524,16 +2506,13 @@ class DigitalTwinsClient {
      * @param endpointId - The id of the endpoint this event route is bound to.
      * @param filter - An expression which describes the events which are routed to the endpoint.
      * @param options - The operation options
-     * @returns The http response.
+  
      */
     upsertEventRoute(eventRouteId, endpointId, filter, options = {}) {
-        const eventRoutesAddOptionalParams = options;
-        const eventRoute = {
-            endpointName: endpointId,
-            filter: filter,
-        };
-        eventRoutesAddOptionalParams.eventRoute = eventRoute;
-        return tracingClient.withSpan("DigitalTwinsClient.upsertEventRoute", eventRoutesAddOptionalParams, async (updatedOptions) => {
+        return tracingClient.withSpan("DigitalTwinsClient.upsertEventRoute", Object.assign({ eventRoute: {
+                endpointName: endpointId,
+                filter,
+            } }, options), async (updatedOptions) => {
             return this.client.eventRoutes.add(eventRouteId, updatedOptions);
         });
     }
@@ -2542,7 +2521,7 @@ class DigitalTwinsClient {
      *
      * @param eventRouteId - The Id of the eventRoute to delete.
      * @param options - The operation options
-     * @returns The http response.
+  
      */
     deleteEventRoute(eventRouteId, options = {}) {
         return tracingClient.withSpan("DigitalTwinsClient.deleteEventRoute", options, async (updatedOptions) => {
@@ -2559,22 +2538,15 @@ class DigitalTwinsClient {
      */
     queryTwinsPage(query, options, continuationState) {
         return tslib.__asyncGenerator(this, arguments, function* queryTwinsPage_1() {
-            if (continuationState.continuationToken == null) {
-                const querySpecification = {
-                    query: query,
-                    continuationToken: continuationState.continuationToken,
-                };
-                const queryResult = yield tslib.__await(this.client.query.queryTwins(querySpecification, options));
-                continuationState.continuationToken = queryResult.continuationToken;
+            let { continuationToken } = continuationState !== null && continuationState !== void 0 ? continuationState : {};
+            if (!continuationToken) {
+                const queryResult = yield tslib.__await(this.client.query.queryTwins({ query }, options));
+                continuationToken = queryResult.continuationToken;
                 yield yield tslib.__await(queryResult);
             }
-            while (continuationState.continuationToken) {
-                const querySpecification = {
-                    query: query,
-                    continuationToken: continuationState.continuationToken,
-                };
-                const queryResult = yield tslib.__await(this.client.query.queryTwins(querySpecification, options));
-                continuationState.continuationToken = queryResult.continuationToken;
+            while (continuationToken) {
+                const queryResult = yield tslib.__await(this.client.query.queryTwins({ query, continuationToken }, options));
+                continuationToken = queryResult.continuationToken;
                 yield yield tslib.__await(queryResult);
             }
         });
@@ -2586,24 +2558,21 @@ class DigitalTwinsClient {
      */
     queryTwinsAll(query, options) {
         return tslib.__asyncGenerator(this, arguments, function* queryTwinsAll_1() {
-            var e_5, _a;
-            const f = {};
+            var e_1, _a;
             try {
-                for (var _b = tslib.__asyncValues(this.queryTwinsPage(query, options, f)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
+                for (var _b = tslib.__asyncValues(this.queryTwinsPage(query, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
                     const page = _c.value;
                     if (page.value) {
-                        for (const item of page.value) {
-                            yield yield tslib.__await(item);
-                        }
+                        yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page.value)));
                     }
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            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));
                 }
-                finally { if (e_5) throw e_5.error; }
+                finally { if (e_1) throw e_1.error; }
             }
         });
     }
@@ -2611,15 +2580,11 @@ class DigitalTwinsClient {
      * Query for digital twins.
      *
      * @param query - The query string, in SQL-like syntax.
-     * @param resultsPerPage - The maximum number of items to retrieve per request. The server may choose to return less than the requested max.
+     * @param options - Options for the query operation.
      * @returns The pageable list of query results.
      */
-    queryTwins(query, resultsPerPage, options = {}) {
-        let queryQueryTwinsOptionalParams = options;
-        queryQueryTwinsOptionalParams = {
-            maxItemsPerPage: resultsPerPage,
-        };
-        const iter = this.queryTwinsAll(query, queryQueryTwinsOptionalParams);
+    queryTwins(query, options = {}) {
+        const iter = this.queryTwinsAll(query, options);
         return {
             next() {
                 return iter.next();
@@ -2627,7 +2592,7 @@ class DigitalTwinsClient {
             [Symbol.asyncIterator]() {
                 return this;
             },
-            byPage: (settings = {}) => this.queryTwinsPage(query, queryQueryTwinsOptionalParams, settings),
+            byPage: (settings = {}) => this.queryTwinsPage(query, options, settings),
         };
     }
 }