@mergeapi/merge-node-client 3.0.0 → 4.0.0-alpha.0

package/api/resources/ticketing/resources/collections/client/Client.js

@@ -67,7 +67,6 @@ class CollectionsClient {
      *         createdAfter: new Date("2024-01-15T09:30:00.000Z"),
      *         createdBefore: new Date("2024-01-15T09:30:00.000Z"),
      *         cursor: "cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
-     *         expand: "parent_collection",
      *         includeDeletedData: true,
      *         includeRemoteData: true,
      *         includeShellData: true,
@@ -81,68 +80,87 @@ class CollectionsClient {
      *         showEnumOrigins: "collection_type"
      *     })
      */
-    list(request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__list(request, requestOptions));
-    }
-    __list() {
+    list() {
         return __awaiter(this, arguments, void 0, function* (request = {}, requestOptions) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-            const { collectionType, createdAfter, createdBefore, cursor, expand, includeDeletedData, includeRemoteData, includeShellData, modifiedAfter, modifiedBefore, name, pageSize, parentCollectionId, remoteFields, remoteId, showEnumOrigins, } = request;
-            const _queryParams = {
-                collection_type: collectionType != null
-                    ? serializers.ticketing.CollectionsListRequestCollectionType.jsonOrThrow(collectionType, {
-                        unrecognizedObjectKeys: "strip",
-                    })
-                    : undefined,
-                created_after: createdAfter === null || createdAfter === void 0 ? void 0 : createdAfter.toISOString(),
-                created_before: createdBefore === null || createdBefore === void 0 ? void 0 : createdBefore.toISOString(),
-                cursor,
-                expand: expand != null ? expand : undefined,
-                include_deleted_data: includeDeletedData,
-                include_remote_data: includeRemoteData,
-                include_shell_data: includeShellData,
-                modified_after: modifiedAfter === null || modifiedAfter === void 0 ? void 0 : modifiedAfter.toISOString(),
-                modified_before: modifiedBefore === null || modifiedBefore === void 0 ? void 0 : modifiedBefore.toISOString(),
-                name,
-                page_size: pageSize,
-                parent_collection_id: parentCollectionId,
-                remote_fields: remoteFields != null ? remoteFields : undefined,
-                remote_id: remoteId,
-                show_enum_origins: showEnumOrigins != null ? showEnumOrigins : undefined,
-            };
-            const _authRequest = yield this._options.authProvider.getAuthRequest();
-            const _headers = (0, headers_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_1.mergeOnlyDefinedHeaders)({ "X-Account-Token": (_b = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.accountToken) !== null && _b !== void 0 ? _b : (_c = this._options) === null || _c === void 0 ? void 0 : _c.accountToken }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
-            const _response = yield ((_d = this._options.fetcher) !== null && _d !== void 0 ? _d : core.fetcher)({
-                url: core.url.join((_f = (_e = (yield core.Supplier.get(this._options.baseUrl))) !== null && _e !== void 0 ? _e : (yield core.Supplier.get(this._options.environment))) !== null && _f !== void 0 ? _f : environments.MergeEnvironment.Production, "ticketing/v1/collections"),
-                method: "GET",
-                headers: _headers,
-                queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: ((_j = (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.timeoutInSeconds) !== null && _j !== void 0 ? _j : 60) * 1000,
-                maxRetries: (_k = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _k !== void 0 ? _k : (_l = this._options) === null || _l === void 0 ? void 0 : _l.maxRetries,
-                abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
-                fetchFn: (_m = this._options) === null || _m === void 0 ? void 0 : _m.fetch,
-                logging: this._options.logging,
-            });
-            if (_response.ok) {
-                return {
-                    data: serializers.ticketing.PaginatedCollectionList.parseOrThrow(_response.body, {
-                        unrecognizedObjectKeys: "passthrough",
-                        allowUnrecognizedUnionMembers: true,
-                        allowUnrecognizedEnumValues: true,
-                        skipValidation: true,
-                        breadcrumbsPrefix: ["response"],
-                    }),
-                    rawResponse: _response.rawResponse,
+            const list = core.HttpResponsePromise.interceptFunction((request) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+                const { collectionType, createdAfter, createdBefore, cursor, expand, includeDeletedData, includeRemoteData, includeShellData, modifiedAfter, modifiedBefore, name, pageSize, parentCollectionId, remoteFields, remoteId, showEnumOrigins, } = request;
+                const _queryParams = {
+                    collection_type: collectionType != null
+                        ? serializers.ticketing.CollectionsListRequestCollectionType.jsonOrThrow(collectionType, {
+                            unrecognizedObjectKeys: "strip",
+                        })
+                        : undefined,
+                    created_after: createdAfter === null || createdAfter === void 0 ? void 0 : createdAfter.toISOString(),
+                    created_before: createdBefore === null || createdBefore === void 0 ? void 0 : createdBefore.toISOString(),
+                    cursor,
+                    expand: Array.isArray(expand)
+                        ? expand.map((item) => serializers.ticketing.CollectionsListRequestExpandItem.jsonOrThrow(item, {
+                            unrecognizedObjectKeys: "strip",
+                        }))
+                        : expand != null
+                            ? serializers.ticketing.CollectionsListRequestExpandItem.jsonOrThrow(expand, {
+                                unrecognizedObjectKeys: "strip",
+                            })
+                            : undefined,
+                    include_deleted_data: includeDeletedData,
+                    include_remote_data: includeRemoteData,
+                    include_shell_data: includeShellData,
+                    modified_after: modifiedAfter === null || modifiedAfter === void 0 ? void 0 : modifiedAfter.toISOString(),
+                    modified_before: modifiedBefore === null || modifiedBefore === void 0 ? void 0 : modifiedBefore.toISOString(),
+                    name,
+                    page_size: pageSize,
+                    parent_collection_id: parentCollectionId,
+                    remote_fields: remoteFields != null ? remoteFields : undefined,
+                    remote_id: remoteId,
+                    show_enum_origins: showEnumOrigins != null ? showEnumOrigins : undefined,
                 };
-            }
-            if (_response.error.reason === "status-code") {
-                throw new errors.MergeError({
-                    statusCode: _response.error.statusCode,
-                    body: _response.error.body,
-                    rawResponse: _response.rawResponse,
+                const _authRequest = yield this._options.authProvider.getAuthRequest();
+                const _headers = (0, headers_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_1.mergeOnlyDefinedHeaders)({
+                    "X-Account-Token": (_b = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.accountToken) !== null && _b !== void 0 ? _b : (_c = this._options) === null || _c === void 0 ? void 0 : _c.accountToken,
+                }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+                const _response = yield ((_d = this._options.fetcher) !== null && _d !== void 0 ? _d : core.fetcher)({
+                    url: core.url.join((_f = (_e = (yield core.Supplier.get(this._options.baseUrl))) !== null && _e !== void 0 ? _e : (yield core.Supplier.get(this._options.environment))) !== null && _f !== void 0 ? _f : environments.MergeEnvironment.Production, "ticketing/v1/collections"),
+                    method: "GET",
+                    headers: _headers,
+                    queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
+                    timeoutMs: ((_j = (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.timeoutInSeconds) !== null && _j !== void 0 ? _j : 60) * 1000,
+                    maxRetries: (_k = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _k !== void 0 ? _k : (_l = this._options) === null || _l === void 0 ? void 0 : _l.maxRetries,
+                    abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                    fetchFn: (_m = this._options) === null || _m === void 0 ? void 0 : _m.fetch,
+                    logging: this._options.logging,
                 });
-            }
-            return (0, handleNonStatusCodeError_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/ticketing/v1/collections");
+                if (_response.ok) {
+                    return {
+                        data: serializers.ticketing.PaginatedCollectionList.parseOrThrow(_response.body, {
+                            unrecognizedObjectKeys: "passthrough",
+                            allowUnrecognizedUnionMembers: true,
+                            allowUnrecognizedEnumValues: true,
+                            skipValidation: true,
+                            breadcrumbsPrefix: ["response"],
+                        }),
+                        rawResponse: _response.rawResponse,
+                    };
+                }
+                if (_response.error.reason === "status-code") {
+                    throw new errors.MergeError({
+                        statusCode: _response.error.statusCode,
+                        body: _response.error.body,
+                        rawResponse: _response.rawResponse,
+                    });
+                }
+                return (0, handleNonStatusCodeError_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/ticketing/v1/collections");
+            }));
+            const dataWithRawResponse = yield list(request).withRawResponse();
+            return new core.Page({
+                response: dataWithRawResponse.data,
+                rawResponse: dataWithRawResponse.rawResponse,
+                hasNextPage: (response) => (response === null || response === void 0 ? void 0 : response.next) != null && !(typeof (response === null || response === void 0 ? void 0 : response.next) === "string" && (response === null || response === void 0 ? void 0 : response.next) === ""),
+                getItems: (response) => { var _a; return (_a = response === null || response === void 0 ? void 0 : response.results) !== null && _a !== void 0 ? _a : []; },
+                loadPage: (response) => {
+                    return list(core.setObjectProperty(request, "cursor", response === null || response === void 0 ? void 0 : response.next));
+                },
+            });
         });
     }
     /**
@@ -155,65 +173,79 @@ class CollectionsClient {
      * @example
      *     await client.ticketing.collections.viewersList("collection_id", {
      *         cursor: "cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
-     *         expand: "team",
      *         includeDeletedData: true,
      *         includeRemoteData: true,
      *         includeShellData: true,
      *         pageSize: 1
      *     })
      */
-    viewersList(collection_id, request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__viewersList(collection_id, request, requestOptions));
-    }
-    __viewersList(collection_id_1) {
+    viewersList(collection_id_1) {
         return __awaiter(this, arguments, void 0, function* (collection_id, request = {}, requestOptions) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-            const { cursor, expand, includeDeletedData, includeRemoteData, includeShellData, pageSize } = request;
-            const _queryParams = {
-                cursor,
-                expand: expand != null
-                    ? serializers.ticketing.CollectionsViewersListRequestExpand.jsonOrThrow(expand, {
-                        unrecognizedObjectKeys: "strip",
-                    })
-                    : undefined,
-                include_deleted_data: includeDeletedData,
-                include_remote_data: includeRemoteData,
-                include_shell_data: includeShellData,
-                page_size: pageSize,
-            };
-            const _authRequest = yield this._options.authProvider.getAuthRequest();
-            const _headers = (0, headers_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_1.mergeOnlyDefinedHeaders)({ "X-Account-Token": (_b = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.accountToken) !== null && _b !== void 0 ? _b : (_c = this._options) === null || _c === void 0 ? void 0 : _c.accountToken }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
-            const _response = yield ((_d = this._options.fetcher) !== null && _d !== void 0 ? _d : core.fetcher)({
-                url: core.url.join((_f = (_e = (yield core.Supplier.get(this._options.baseUrl))) !== null && _e !== void 0 ? _e : (yield core.Supplier.get(this._options.environment))) !== null && _f !== void 0 ? _f : environments.MergeEnvironment.Production, `ticketing/v1/collections/${core.url.encodePathParam(collection_id)}/viewers`),
-                method: "GET",
-                headers: _headers,
-                queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
-                timeoutMs: ((_j = (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.timeoutInSeconds) !== null && _j !== void 0 ? _j : 60) * 1000,
-                maxRetries: (_k = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _k !== void 0 ? _k : (_l = this._options) === null || _l === void 0 ? void 0 : _l.maxRetries,
-                abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
-                fetchFn: (_m = this._options) === null || _m === void 0 ? void 0 : _m.fetch,
-                logging: this._options.logging,
-            });
-            if (_response.ok) {
-                return {
-                    data: serializers.ticketing.PaginatedViewerList.parseOrThrow(_response.body, {
-                        unrecognizedObjectKeys: "passthrough",
-                        allowUnrecognizedUnionMembers: true,
-                        allowUnrecognizedEnumValues: true,
-                        skipValidation: true,
-                        breadcrumbsPrefix: ["response"],
-                    }),
-                    rawResponse: _response.rawResponse,
+            const list = core.HttpResponsePromise.interceptFunction((request) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+                const { cursor, expand, includeDeletedData, includeRemoteData, includeShellData, pageSize } = request;
+                const _queryParams = {
+                    cursor,
+                    expand: Array.isArray(expand)
+                        ? expand.map((item) => serializers.ticketing.CollectionsViewersListRequestExpandItem.jsonOrThrow(item, {
+                            unrecognizedObjectKeys: "strip",
+                        }))
+                        : expand != null
+                            ? serializers.ticketing.CollectionsViewersListRequestExpandItem.jsonOrThrow(expand, {
+                                unrecognizedObjectKeys: "strip",
+                            })
+                            : undefined,
+                    include_deleted_data: includeDeletedData,
+                    include_remote_data: includeRemoteData,
+                    include_shell_data: includeShellData,
+                    page_size: pageSize,
                 };
-            }
-            if (_response.error.reason === "status-code") {
-                throw new errors.MergeError({
-                    statusCode: _response.error.statusCode,
-                    body: _response.error.body,
-                    rawResponse: _response.rawResponse,
+                const _authRequest = yield this._options.authProvider.getAuthRequest();
+                const _headers = (0, headers_1.mergeHeaders)(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_1.mergeOnlyDefinedHeaders)({
+                    "X-Account-Token": (_b = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.accountToken) !== null && _b !== void 0 ? _b : (_c = this._options) === null || _c === void 0 ? void 0 : _c.accountToken,
+                }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+                const _response = yield ((_d = this._options.fetcher) !== null && _d !== void 0 ? _d : core.fetcher)({
+                    url: core.url.join((_f = (_e = (yield core.Supplier.get(this._options.baseUrl))) !== null && _e !== void 0 ? _e : (yield core.Supplier.get(this._options.environment))) !== null && _f !== void 0 ? _f : environments.MergeEnvironment.Production, `ticketing/v1/collections/${core.url.encodePathParam(collection_id)}/viewers`),
+                    method: "GET",
+                    headers: _headers,
+                    queryParameters: Object.assign(Object.assign({}, _queryParams), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams),
+                    timeoutMs: ((_j = (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.timeoutInSeconds) !== null && _j !== void 0 ? _j : 60) * 1000,
+                    maxRetries: (_k = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _k !== void 0 ? _k : (_l = this._options) === null || _l === void 0 ? void 0 : _l.maxRetries,
+                    abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                    fetchFn: (_m = this._options) === null || _m === void 0 ? void 0 : _m.fetch,
+                    logging: this._options.logging,
                 });
-            }
-            return (0, handleNonStatusCodeError_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/ticketing/v1/collections/{collection_id}/viewers");
+                if (_response.ok) {
+                    return {
+                        data: serializers.ticketing.PaginatedViewerList.parseOrThrow(_response.body, {
+                            unrecognizedObjectKeys: "passthrough",
+                            allowUnrecognizedUnionMembers: true,
+                            allowUnrecognizedEnumValues: true,
+                            skipValidation: true,
+                            breadcrumbsPrefix: ["response"],
+                        }),
+                        rawResponse: _response.rawResponse,
+                    };
+                }
+                if (_response.error.reason === "status-code") {
+                    throw new errors.MergeError({
+                        statusCode: _response.error.statusCode,
+                        body: _response.error.body,
+                        rawResponse: _response.rawResponse,
+                    });
+                }
+                return (0, handleNonStatusCodeError_1.handleNonStatusCodeError)(_response.error, _response.rawResponse, "GET", "/ticketing/v1/collections/{collection_id}/viewers");
+            }));
+            const dataWithRawResponse = yield list(request).withRawResponse();
+            return new core.Page({
+                response: dataWithRawResponse.data,
+                rawResponse: dataWithRawResponse.rawResponse,
+                hasNextPage: (response) => (response === null || response === void 0 ? void 0 : response.next) != null && !(typeof (response === null || response === void 0 ? void 0 : response.next) === "string" && (response === null || response === void 0 ? void 0 : response.next) === ""),
+                getItems: (response) => { var _a; return (_a = response === null || response === void 0 ? void 0 : response.results) !== null && _a !== void 0 ? _a : []; },
+                loadPage: (response) => {
+                    return list(core.setObjectProperty(request, "cursor", response === null || response === void 0 ? void 0 : response.next));
+                },
+            });
         });
     }
     /**
@@ -225,7 +257,6 @@ class CollectionsClient {
      *
      * @example
      *     await client.ticketing.collections.retrieve("id", {
-     *         expand: "parent_collection",
      *         includeRemoteData: true,
      *         includeShellData: true,
      *         remoteFields: "collection_type",
@@ -240,7 +271,15 @@ class CollectionsClient {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             const { expand, includeRemoteData, includeShellData, remoteFields, showEnumOrigins } = request;
             const _queryParams = {
-                expand: expand != null ? expand : undefined,
+                expand: Array.isArray(expand)
+                    ? expand.map((item) => serializers.ticketing.CollectionsRetrieveRequestExpandItem.jsonOrThrow(item, {
+                        unrecognizedObjectKeys: "strip",
+                    }))
+                    : expand != null
+                        ? serializers.ticketing.CollectionsRetrieveRequestExpandItem.jsonOrThrow(expand, {
+                            unrecognizedObjectKeys: "strip",
+                        })
+                        : undefined,
                 include_remote_data: includeRemoteData,
                 include_shell_data: includeShellData,
                 remote_fields: remoteFields != null ? remoteFields : undefined,

package/api/resources/ticketing/resources/collections/client/requests/CollectionsListRequest.d.ts

@@ -6,7 +6,6 @@ import type * as Merge from "../../../../../../index";
  *         createdAfter: new Date("2024-01-15T09:30:00.000Z"),
  *         createdBefore: new Date("2024-01-15T09:30:00.000Z"),
  *         cursor: "cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
- *         expand: "parent_collection",
  *         includeDeletedData: true,
  *         includeRemoteData: true,
  *         includeShellData: true,
@@ -30,7 +29,7 @@ export interface CollectionsListRequest {
     /** The pagination cursor value. */
     cursor?: string;
     /** Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces. */
-    expand?: "parent_collection";
+    expand?: Merge.ticketing.CollectionsListRequestExpandItem | Merge.ticketing.CollectionsListRequestExpandItem[];
     /** Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/). */
     includeDeletedData?: boolean;
     /** Whether to include the original data Merge fetched from the third-party to produce these models. */

package/api/resources/ticketing/resources/collections/client/requests/CollectionsRetrieveRequest.d.ts

@@ -1,7 +1,7 @@
+import type * as Merge from "../../../../../../index";
 /**
  * @example
  *     {
- *         expand: "parent_collection",
  *         includeRemoteData: true,
  *         includeShellData: true,
  *         remoteFields: "collection_type",
@@ -10,7 +10,7 @@
  */
 export interface CollectionsRetrieveRequest {
     /** Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces. */
-    expand?: "parent_collection";
+    expand?: Merge.ticketing.CollectionsRetrieveRequestExpandItem | Merge.ticketing.CollectionsRetrieveRequestExpandItem[];
     /** Whether to include the original data Merge fetched from the third-party to produce these models. */
     includeRemoteData?: boolean;
     /** Whether to include shell records. Shell records are empty records (they may contain some metadata but all other fields are null). */

package/api/resources/ticketing/resources/collections/client/requests/CollectionsViewersListRequest.d.ts

@@ -3,7 +3,6 @@ import type * as Merge from "../../../../../../index";
  * @example
  *     {
  *         cursor: "cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
- *         expand: "team",
  *         includeDeletedData: true,
  *         includeRemoteData: true,
  *         includeShellData: true,
@@ -14,13 +13,13 @@ export interface CollectionsViewersListRequest {
     /** The pagination cursor value. */
     cursor?: string;
     /** Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces. */
-    expand?: Merge.ticketing.CollectionsViewersListRequestExpand;
+    expand?: Merge.ticketing.CollectionsViewersListRequestExpandItem | Merge.ticketing.CollectionsViewersListRequestExpandItem[];
     /** Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/). */
     includeDeletedData?: boolean;
     /** Whether to include the original data Merge fetched from the third-party to produce these models. */
     includeRemoteData?: boolean;
     /** Whether to include shell records. Shell records are empty records (they may contain some metadata but all other fields are null). */
     includeShellData?: boolean;
-    /** Number of results to return per page. */
+    /** Number of results to return per page. The maximum limit is 100. */
     pageSize?: number;
 }

package/api/resources/ticketing/resources/collections/types/CollectionsListRequestExpandItem.d.ts

@@ -0,0 +1,5 @@
+export declare const CollectionsListRequestExpandItem: {
+    readonly ParentCollection: "parent_collection";
+    readonly Permissions: "permissions";
+};
+export type CollectionsListRequestExpandItem = (typeof CollectionsListRequestExpandItem)[keyof typeof CollectionsListRequestExpandItem];

package/api/resources/ticketing/resources/collections/types/CollectionsListRequestExpandItem.js

@@ -0,0 +1,8 @@
+"use strict";
+// This file was auto-generated by Fern from our API Definition.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CollectionsListRequestExpandItem = void 0;
+exports.CollectionsListRequestExpandItem = {
+    ParentCollection: "parent_collection",
+    Permissions: "permissions",
+};

package/api/resources/ticketing/resources/collections/types/CollectionsRetrieveRequestExpandItem.d.ts

@@ -0,0 +1,5 @@
+export declare const CollectionsRetrieveRequestExpandItem: {
+    readonly ParentCollection: "parent_collection";
+    readonly Permissions: "permissions";
+};
+export type CollectionsRetrieveRequestExpandItem = (typeof CollectionsRetrieveRequestExpandItem)[keyof typeof CollectionsRetrieveRequestExpandItem];

package/api/resources/ticketing/resources/collections/types/CollectionsRetrieveRequestExpandItem.js

@@ -0,0 +1,8 @@
+"use strict";
+// This file was auto-generated by Fern from our API Definition.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CollectionsRetrieveRequestExpandItem = void 0;
+exports.CollectionsRetrieveRequestExpandItem = {
+    ParentCollection: "parent_collection",
+    Permissions: "permissions",
+};

package/api/resources/ticketing/resources/collections/types/CollectionsViewersListRequestExpandItem.d.ts

@@ -0,0 +1,5 @@
+export declare const CollectionsViewersListRequestExpandItem: {
+    readonly Team: "team";
+    readonly User: "user";
+};
+export type CollectionsViewersListRequestExpandItem = (typeof CollectionsViewersListRequestExpandItem)[keyof typeof CollectionsViewersListRequestExpandItem];

package/api/resources/ticketing/resources/collections/types/CollectionsViewersListRequestExpandItem.js

@@ -0,0 +1,8 @@
+"use strict";
+// This file was auto-generated by Fern from our API Definition.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CollectionsViewersListRequestExpandItem = void 0;
+exports.CollectionsViewersListRequestExpandItem = {
+    Team: "team",
+    User: "user",
+};

package/api/resources/ticketing/resources/collections/types/index.d.ts

@@ -1,2 +1,4 @@
 export * from "./CollectionsListRequestCollectionType";
-export * from "./CollectionsViewersListRequestExpand";
+export * from "./CollectionsListRequestExpandItem";
+export * from "./CollectionsRetrieveRequestExpandItem";
+export * from "./CollectionsViewersListRequestExpandItem";

package/api/resources/ticketing/resources/collections/types/index.js

@@ -15,4 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./CollectionsListRequestCollectionType"), exports);
-__exportStar(require("./CollectionsViewersListRequestExpand"), exports);
+__exportStar(require("./CollectionsListRequestExpandItem"), exports);
+__exportStar(require("./CollectionsRetrieveRequestExpandItem"), exports);
+__exportStar(require("./CollectionsViewersListRequestExpandItem"), exports);

package/api/resources/ticketing/resources/comments/client/Client.d.ts

@@ -21,7 +21,6 @@ export declare class CommentsClient {
      *         createdAfter: new Date("2024-01-15T09:30:00.000Z"),
      *         createdBefore: new Date("2024-01-15T09:30:00.000Z"),
      *         cursor: "cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
-     *         expand: "contact",
      *         includeDeletedData: true,
      *         includeRemoteData: true,
      *         includeShellData: true,
@@ -33,8 +32,7 @@ export declare class CommentsClient {
      *         ticketId: "ticket_id"
      *     })
      */
-    list(request?: Merge.ticketing.CommentsListRequest, requestOptions?: CommentsClient.RequestOptions): core.HttpResponsePromise<Merge.ticketing.PaginatedCommentList>;
-    private __list;
+    list(request?: Merge.ticketing.CommentsListRequest, requestOptions?: CommentsClient.RequestOptions): Promise<core.Page<Merge.ticketing.Comment, Merge.ticketing.PaginatedCommentList>>;
     /**
      * Creates a `Comment` object with the given values.
      *
@@ -59,7 +57,6 @@ export declare class CommentsClient {
      *
      * @example
      *     await client.ticketing.comments.retrieve("id", {
-     *         expand: "contact",
      *         includeRemoteData: true,
      *         includeShellData: true
      *     })