confluence.js 1.5.0 → 1.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "confluence.js",
-  "version": "1.5.0",
+  "version": "1.5.3",
   "description": "confluence.js is a powerful Node.JS/Browser module that allows you to interact with the Confluence API very easily",
   "author": "Vladislav Tupikin <mrrefactoring@yandex.ru>",
   "license": "MIT",
@@ -45,28 +45,28 @@
     "@swc-node/register": "^1.5.1",
     "@types/express": "^4.17.13",
     "@types/oauth": "^0.9.1",
-    "@types/sinon": "^10.0.11",
-    "@typescript-eslint/eslint-plugin": "^5.25.0",
-    "@typescript-eslint/parser": "^5.25.0",
-    "ava": "^4.2.0",
-    "dotenv": "^16.0.1",
-    "eslint": "^8.16.0",
+    "@types/sinon": "^10.0.13",
+    "@typescript-eslint/eslint-plugin": "^5.36.2",
+    "@typescript-eslint/parser": "^5.36.2",
+    "ava": "^4.3.3",
+    "dotenv": "^16.0.2",
+    "eslint": "^8.23.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-import-resolver-typescript": "^2.7.1",
+    "eslint-import-resolver-typescript": "^3.5.1",
     "eslint-plugin-import": "^2.26.0",
-    "prettier": "^2.6.2",
-    "prettier-plugin-jsdoc": "^0.3.38",
+    "prettier": "^2.7.1",
+    "prettier-plugin-jsdoc": "^0.4.2",
     "sinon": "^14.0.0",
-    "typedoc": "^0.22.15",
-    "typedoc-plugin-extras": "^2.2.3",
-    "typescript": "^4.6.4"
+    "typedoc": "^0.23.14",
+    "typedoc-plugin-extras": "^2.3.0",
+    "typescript": "^4.8.2"
   },
   "dependencies": {
     "atlassian-jwt": "^2.0.2",
     "axios": "^0.27.2",
     "form-data": "^4.0.0",
-    "oauth": "^0.9.15",
+    "oauth": "^0.10.0",
     "tslib": "^2.4.0"
   }
 }

package/src/api/audit.ts

@@ -12,7 +12,8 @@ export class Audit {
    * like space exports, group membership changes, app installations, etc. For more information, see [Audit
    * log](https://confluence.atlassian.com/confcloud/audit-log-802164269.html) in the Confluence administrator's guide.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async getAuditRecords<T = Models.AuditRecordArray>(
     parameters: Parameters.GetAuditRecords | undefined,
@@ -23,7 +24,8 @@ export class Audit {
    * like space exports, group membership changes, app installations, etc. For more information, see [Audit
    * log](https://confluence.atlassian.com/confcloud/audit-log-802164269.html) in the Confluence administrator's guide.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async getAuditRecords<T = Models.AuditRecordArray>(
     parameters?: Parameters.GetAuditRecords,
@@ -51,7 +53,8 @@ export class Audit {
   /**
    * Creates a record in the audit log.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async createAuditRecord<T = Models.AuditRecord>(
     parameters: Parameters.CreateAuditRecord | undefined,
@@ -60,7 +63,8 @@ export class Audit {
   /**
    * Creates a record in the audit log.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async createAuditRecord<T = Models.AuditRecord>(
     parameters?: Parameters.CreateAuditRecord,
@@ -93,7 +97,8 @@ export class Audit {
   /**
    * Exports audit records as a CSV file or ZIP file.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async exportAuditRecords<T = unknown>(
     parameters: Parameters.ExportAuditRecords | undefined,
@@ -102,7 +107,8 @@ export class Audit {
   /**
    * Exports audit records as a CSV file or ZIP file.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async exportAuditRecords<T = unknown>(parameters?: Parameters.ExportAuditRecords, callback?: never): Promise<T>;
   async exportAuditRecords<T = unknown>(
@@ -127,14 +133,16 @@ export class Audit {
    * Returns the retention period for records in the audit log. The retention period is how long an audit record is kept
    * for, from creation date until it is deleted.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async getRetentionPeriod<T = Models.RetentionPeriod>(callback: Callback<T>): Promise<void>;
   /**
    * Returns the retention period for records in the audit log. The retention period is how long an audit record is kept
    * for, from creation date until it is deleted.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async getRetentionPeriod<T = Models.RetentionPeriod>(callback?: never): Promise<T>;
   async getRetentionPeriod<T = Models.RetentionPeriod>(callback?: Callback<T>): Promise<void | T> {
@@ -149,7 +157,8 @@ export class Audit {
   /**
    * Sets the retention period for records in the audit log. The retention period can be set to a maximum of 20 years.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async setRetentionPeriod<T = Models.RetentionPeriod>(
     parameters: Parameters.SetRetentionPeriod | undefined,
@@ -158,7 +167,8 @@ export class Audit {
   /**
    * Sets the retention period for records in the audit log. The retention period can be set to a maximum of 20 years.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async setRetentionPeriod<T = Models.RetentionPeriod>(
     parameters?: Parameters.SetRetentionPeriod,
@@ -188,7 +198,8 @@ export class Audit {
    * more information, see [Audit log](https://confluence.atlassian.com/confcloud/audit-log-802164269.html) in the
    * Confluence administrator's guide.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async getAuditRecordsForTimePeriod<T = Models.AuditRecordArray>(
     parameters: Parameters.GetAuditRecordsForTimePeriod | undefined,
@@ -202,7 +213,8 @@ export class Audit {
    * more information, see [Audit log](https://confluence.atlassian.com/confcloud/audit-log-802164269.html) in the
    * Confluence administrator's guide.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
+   * permission.
    */
   async getAuditRecordsForTimePeriod<T = Models.AuditRecordArray>(
     parameters?: Parameters.GetAuditRecordsForTimePeriod,

package/src/api/content.ts

@@ -113,10 +113,7 @@ export class Content {
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Archive' permission for each of the pages
    * in the corresponding space it belongs to.
    */
-  async archivePages<T = Models.LongTask>(
-    parameters: Parameters.ArchivePages,
-    callback: Callback<T>
-  ): Promise<void>;
+  async archivePages<T = Models.LongTask>(parameters: Parameters.ArchivePages, callback: Callback<T>): Promise<void>;
   /**
    * Archives a list of pages. The pages to be archived are specified as a list of content IDs. This API accepts the
    * archival request and returns a task ID. The archival process happens asynchronously. Use the /longtask/<taskId>
@@ -129,7 +126,10 @@ export class Content {
    * in the corresponding space it belongs to.
    */
   async archivePages<T = Models.LongTask>(parameters: Parameters.ArchivePages, callback?: never): Promise<T>;
-  async archivePages<T = Models.LongTask>(parameters: Parameters.ArchivePages, callback?: Callback<T>): Promise<void | T> {
+  async archivePages<T = Models.LongTask>(
+    parameters: Parameters.ArchivePages,
+    callback?: Callback<T>,
+  ): Promise<void | T> {
     const config: RequestConfig = {
       url: '/api/content/archive',
       method: 'POST',
@@ -143,7 +143,8 @@ export class Content {
 
   /**
    * Publishes a legacy draft of a page created from a blueprint. Legacy drafts will eventually be removed in favor of
-   * shared drafts. For now, this method works the same as [Publish shared draft](#api-content-blueprint-instance-draftId-put).
+   * shared drafts. For now, this method works the same as [Publish shared
+   * draft](#api-content-blueprint-instance-draftId-put).
    *
    * By default, the following objects are expanded: `body.storage`, `history`, `space`, `version`, `ancestors`.
    *
@@ -156,7 +157,8 @@ export class Content {
   ): Promise<void>;
   /**
    * Publishes a legacy draft of a page created from a blueprint. Legacy drafts will eventually be removed in favor of
-   * shared drafts. For now, this method works the same as [Publish shared draft](#api-content-blueprint-instance-draftId-put).
+   * shared drafts. For now, this method works the same as [Publish shared
+   * draft](#api-content-blueprint-instance-draftId-put).
    *
    * By default, the following objects are expanded: `body.storage`, `history`, `space`, `version`, `ancestors`.
    *
@@ -240,9 +242,9 @@ export class Content {
    * When additional results are available, returns `next` and `prev` URLs to retrieve them in subsequent calls. The
    * URLs each contain a cursor that points to the appropriate set of results. Use `limit` to specify the number of
    * results returned in each call. Example subsequent call (taken from example response):
-   * ```
-   * https://your-domain.atlassian.net/wiki/rest/api/content/search?cql=type=page&limit=25&cursor=raNDoMsTRiNg
-   * ```
+   *
+   *     https://your-domain.atlassian.net/wiki/rest/api/content/search?cql=type=page&limit=25&cursor=raNDoMsTRiNg
+   *
    * The response to this will have a `prev` URL similar to the `next` in the example response.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site
@@ -259,9 +261,9 @@ export class Content {
    * When additional results are available, returns `next` and `prev` URLs to retrieve them in subsequent calls. The
    * URLs each contain a cursor that points to the appropriate set of results. Use `limit` to specify the number of
    * results returned in each call. Example subsequent call (taken from example response):
-   * ```
-   * https://your-domain.atlassian.net/wiki/rest/api/content/search?cql=type=page&limit=25&cursor=raNDoMsTRiNg
-   * ```
+   *
+   *     https://your-domain.atlassian.net/wiki/rest/api/content/search?cql=type=page&limit=25&cursor=raNDoMsTRiNg
+   *
    * The response to this will have a `prev` URL similar to the `next` in the example response.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site
@@ -369,11 +371,13 @@ export class Content {
   }
 
   /**
-   * Moves a piece of content to the space's trash or purges it from the trash, depending on the content's type and status:
+   * Moves a piece of content to the space's trash or purges it from the trash, depending on the content's type and
+   * status:
    *
    * - If the content's type is `page` or `blogpost` and its status is `current`, it will be trashed.
    * - If the content's type is `page` or `blogpost` and its status is `trashed`, the content will be purged from the
-   *   trash and deleted permanently. Note, you must also set the `status` query parameter to `trashed` in your request.
+   *   trash and deleted permanently. Note, you must also set the `status` query parameter to `trashed` in your
+   *   request.
    * - If the content's type is `comment` or `attachment`, it will be deleted permanently without being trashed.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Delete' permission for the space that the
@@ -381,11 +385,13 @@ export class Content {
    */
   async deleteContent<T = void>(parameters: Parameters.DeleteContent, callback: Callback<T>): Promise<void>;
   /**
-   * Moves a piece of content to the space's trash or purges it from the trash, depending on the content's type and status:
+   * Moves a piece of content to the space's trash or purges it from the trash, depending on the content's type and
+   * status:
    *
    * - If the content's type is `page` or `blogpost` and its status is `current`, it will be trashed.
    * - If the content's type is `page` or `blogpost` and its status is `trashed`, the content will be purged from the
-   *   trash and deleted permanently. Note, you must also set the `status` query parameter to `trashed` in your request.
+   *   trash and deleted permanently. Note, you must also set the `status` query parameter to `trashed` in your
+   *   request.
    * - If the content's type is `comment` or `attachment`, it will be deleted permanently without being trashed.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Delete' permission for the space that the

package/src/api/contentAttachments.ts

@@ -28,7 +28,10 @@ export class ContentAttachments {
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to view the content. If the
    * content is a blog post, 'View' permission for the space is required.
    */
-  async getAttachments<T = Models.ContentArray<Models.Attachment>>(parameters: Parameters.GetAttachments, callback?: never): Promise<T>;
+  async getAttachments<T = Models.ContentArray<Models.Attachment>>(
+    parameters: Parameters.GetAttachments,
+    callback?: never
+  ): Promise<T>;
   async getAttachments<T = Models.ContentArray<Models.Attachment>>(
     parameters: Parameters.GetAttachments,
     callback?: Callback<T>,
@@ -50,7 +53,8 @@ export class ContentAttachments {
 
   /**
    * Adds an attachment to a piece of content. This method only adds a new attachment. If you want to update an existing
-   * attachment, use [Create or update attachments](https://developer.atlassian.com/cloud/confluence/rest/api-group-content---attachments/#api-wiki-rest-api-content-id-child-attachment-put).
+   * attachment, use [Create or update
+   * attachments](https://developer.atlassian.com/cloud/confluence/rest/api-group-content---attachments/#api-wiki-rest-api-content-id-child-attachment-put).
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to update the content.
    */
@@ -60,7 +64,8 @@ export class ContentAttachments {
   ): Promise<void>;
   /**
    * Adds an attachment to a piece of content. This method only adds a new attachment. If you want to update an existing
-   * attachment, use [Create or update attachments](https://developer.atlassian.com/cloud/confluence/rest/api-group-content---attachments/#api-wiki-rest-api-content-id-child-attachment-put).
+   * attachment, use [Create or update
+   * attachments](https://developer.atlassian.com/cloud/confluence/rest/api-group-content---attachments/#api-wiki-rest-api-content-id-child-attachment-put).
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to update the content.
    */
@@ -194,10 +199,12 @@ export class ContentAttachments {
   }
 
   /**
-   * Updates the binary data of an attachment, given the attachment ID, and optionally the comment and the minor edit field.
+   * Updates the binary data of an attachment, given the attachment ID, and optionally the comment and the minor edit
+   * field.
    *
-   * This method is essentially the same as [Create or update attachments](https://developer.atlassian.com/cloud/confluence/rest/api-group-content---attachments/#api-wiki-rest-api-content-id-child-attachment-put), except
-   * that it matches the attachment ID rather than the name.
+   * This method is essentially the same as [Create or update
+   * attachments](https://developer.atlassian.com/cloud/confluence/rest/api-group-content---attachments/#api-wiki-rest-api-content-id-child-attachment-put),
+   * except that it matches the attachment ID rather than the name.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to update the content.
    */
@@ -206,10 +213,12 @@ export class ContentAttachments {
     callback: Callback<T>
   ): Promise<void>;
   /**
-   * Updates the binary data of an attachment, given the attachment ID, and optionally the comment and the minor edit field.
+   * Updates the binary data of an attachment, given the attachment ID, and optionally the comment and the minor edit
+   * field.
    *
-   * This method is essentially the same as [Create or update attachments](https://developer.atlassian.com/cloud/confluence/rest/api-group-content---attachments/#api-wiki-rest-api-content-id-child-attachment-put), except
-   * that it matches the attachment ID rather than the name.
+   * This method is essentially the same as [Create or update
+   * attachments](https://developer.atlassian.com/cloud/confluence/rest/api-group-content---attachments/#api-wiki-rest-api-content-id-child-attachment-put),
+   * except that it matches the attachment ID rather than the name.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to update the content.
    */
@@ -250,10 +259,7 @@ export class ContentAttachments {
   }
 
   /** Redirects the client to a URL that serves an attachment's binary data. */
-  async downloadAttachment<T = Buffer>(
-    parameters: Parameters.DownloadAttachment,
-    callback: Callback<T>
-  ): Promise<void>;
+  async downloadAttachment<T = Buffer>(parameters: Parameters.DownloadAttachment, callback: Callback<T>): Promise<void>;
   /** Redirects the client to a URL that serves an attachment's binary data. */
   async downloadAttachment<T = Buffer>(parameters: Parameters.DownloadAttachment, callback?: never): Promise<T>;
   async downloadAttachment<T = Buffer>(

package/src/api/contentBody.ts

@@ -54,10 +54,12 @@ export class ContentBody {
         spaceKeyContext: parameters.spaceKeyContext,
         contentIdContext: parameters.contentIdContext,
         embeddedContentRender: parameters.embeddedContentRender,
+        expand: parameters.expand,
       },
       data: {
         value: parameters.value,
         representation: parameters.representation,
+        ...parameters.additionalProperties,
       },
     };
 

package/src/api/contentMacroBody.ts

@@ -20,7 +20,8 @@ export class ContentMacroBody {
    * macro ID is found. This check will eventually become redundant, as macro IDs are generated for pages and
    * transparently propagate out to all instances.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to view the content that the macro is in.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to view the content that the
+   * macro is in.
    */
   async getMacroBodyByMacroId<T = Models.MacroInstance>(
     parameters: Parameters.GetMacroBodyByMacroId,
@@ -39,7 +40,8 @@ export class ContentMacroBody {
    * macro ID is found. This check will eventually become redundant, as macro IDs are generated for pages and
    * transparently propagate out to all instances.
    *
-   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to view the content that the macro is in.
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to view the content that the
+   * macro is in.
    */
   async getMacroBodyByMacroId<T = Models.MacroInstance>(
     parameters: Parameters.GetMacroBodyByMacroId,

package/src/api/contentRestrictions.ts

@@ -262,7 +262,8 @@ export class ContentRestrictions {
   }
 
   /**
-   * Adds a group to a content restriction. That is, grant read or update permission to the group for a piece of content.
+   * Adds a group to a content restriction. That is, grant read or update permission to the group for a piece of
+   * content.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to edit the content.
    */
@@ -271,7 +272,8 @@ export class ContentRestrictions {
     callback: Callback<T>
   ): Promise<void>;
   /**
-   * Adds a group to a content restriction. That is, grant read or update permission to the group for a piece of content.
+   * Adds a group to a content restriction. That is, grant read or update permission to the group for a piece of
+   * content.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to edit the content.
    */
@@ -292,13 +294,15 @@ export class ContentRestrictions {
   }
 
   /**
-   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of content.
+   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of
+   * content.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to edit the content.
    */
   async removeGroupByName<T = unknown>(parameters: Parameters.RemoveGroupByName, callback: Callback<T>): Promise<void>;
   /**
-   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of content.
+   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of
+   * content.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to edit the content.
    */
@@ -392,13 +396,15 @@ export class ContentRestrictions {
   }
 
   /**
-   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of content.
+   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of
+   * content.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to edit the content.
    */
   async removeGroupById<T = unknown>(parameters: Parameters.RemoveGroupById, callback: Callback<T>): Promise<void>;
   /**
-   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of content.
+   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of
+   * content.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to edit the content.
    */
@@ -502,7 +508,8 @@ export class ContentRestrictions {
   }
 
   /**
-   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of content.
+   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of
+   * content.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to edit the content.
    */
@@ -511,7 +518,8 @@ export class ContentRestrictions {
     callback: Callback<T>
   ): Promise<void>;
   /**
-   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of content.
+   * Removes a group from a content restriction. That is, remove read or update permission for the group for a piece of
+   * content.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to edit the content.
    */

package/src/api/contentWatches.ts

@@ -8,7 +8,8 @@ export class ContentWatches {
   constructor(private client: Client) {}
 
   /**
-   * Returns the watches for a page. A user that watches a page will receive receive notifications when the page is updated.
+   * Returns the watches for a page. A user that watches a page will receive receive notifications when the page is
+   * updated.
    *
    * If you want to manage watches for a page, use the following `user` methods:
    *
@@ -24,7 +25,8 @@ export class ContentWatches {
     callback: Callback<T>
   ): Promise<void>;
   /**
-   * Returns the watches for a page. A user that watches a page will receive receive notifications when the page is updated.
+   * Returns the watches for a page. A user that watches a page will receive receive notifications when the page is
+   * updated.
    *
    * If you want to manage watches for a page, use the following `user` methods:
    *
@@ -180,7 +182,8 @@ export class ContentWatches {
    * - Specify a user via a query parameter: Use the `accountId` to identify the user.
    * - Do not specify a user: The currently logged-in user will be used.
    *
-   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF protection.
+   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF
+   * protection.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission
    * if specifying a user, otherwise permission to access the Confluence site ('Can use' global permission).
@@ -192,7 +195,8 @@ export class ContentWatches {
    * - Specify a user via a query parameter: Use the `accountId` to identify the user.
    * - Do not specify a user: The currently logged-in user will be used.
    *
-   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF protection.
+   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF
+   * protection.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission
    * if specifying a user, otherwise permission to access the Confluence site ('Can use' global permission).
@@ -304,7 +308,8 @@ export class ContentWatches {
    * - Specify a user via a query parameter: Use the `accountId` to identify the user.
    * - Do not specify a user: The currently logged-in user will be used.
    *
-   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF protection.
+   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF
+   * protection.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission
    * if specifying a user, otherwise permission to access the Confluence site ('Can use' global permission).
@@ -316,7 +321,8 @@ export class ContentWatches {
    * - Specify a user via a query parameter: Use the `accountId` to identify the user.
    * - Do not specify a user: The currently logged-in user will be used.
    *
-   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF protection.
+   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF
+   * protection.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission
    * if specifying a user, otherwise permission to access the Confluence site ('Can use' global permission).
@@ -422,7 +428,8 @@ export class ContentWatches {
    * - Specify a user via a query parameter: Use the `accountId` to identify the user.
    * - Do not specify a user: The currently logged-in user will be used.
    *
-   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF protection.
+   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF
+   * protection.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission
    * if specifying a user, otherwise permission to access the Confluence site ('Can use' global permission).
@@ -434,7 +441,8 @@ export class ContentWatches {
    * - Specify a user via a query parameter: Use the `accountId` to identify the user.
    * - Do not specify a user: The currently logged-in user will be used.
    *
-   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF protection.
+   * Note, you must add the `X-Atlassian-Token: no-check` header when making a request, as this operation has XSRF
+   * protection.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global permission
    * if specifying a user, otherwise permission to access the Confluence site ('Can use' global permission).

package/src/api/parameters/convertContentBody.ts

@@ -3,8 +3,43 @@ import { ContentBodyCreate } from '../models';
 export interface ConvertContentBody extends ContentBodyCreate {
   /** The name of the target format for the content body. */
   to: string;
-  /** A multi-value parameter indicating which properties of the content to expand. */
-  expand?: string[];
+
+  /**
+   * A multi-value parameter indicating which properties of the content to expand. Expands are dependent on the to
+   * conversion format and may be irrelevant for certain conversions (e.g. macroRenderedOutput is redundant when
+   * converting to view format).
+   *
+   * - `webresource` returns JS and CSS resources necessary for displaying nested content in `view` format
+   * - `webresource.superbatch.uris.js` returns all common JS dependencies
+   * - `webresource.superbatch.uris.css` returns all common CSS dependencies
+   * - `webresource.uris.js` returns JS dependencies specific to conversion
+   * - `webresource.uris.css` returns CSS dependencies specific to conversion
+   * - `embeddedContent` returns metadata for nested content (e.g. page included using page include macro)
+   * - `mediaToken` returns JWT token for retrieving attachment data from Media API
+   * - `macroRenderedOutput` additionally converts body to view format
+   */
+  expand?:
+  | 'webresource'
+  | 'webresource.superbatch.uris.js'
+  | 'webresource.superbatch.uris.css'
+  | 'webresource.uris.js'
+  | 'webresource.uris.css'
+  | 'embeddedContent'
+  | 'mediaToken'
+  | 'macroRenderedOutput'
+  | (
+    | 'webresource'
+    | 'webresource.superbatch.uris.js'
+    | 'webresource.superbatch.uris.css'
+    | 'webresource.uris.js'
+    | 'webresource.uris.css'
+    | 'embeddedContent'
+    | 'mediaToken'
+    | 'macroRenderedOutput'
+  )[]
+  | string
+  | string[];
+
   /**
    * The space key used for resolving embedded content (page includes, files, and links) in the content body. For
    * example, if the source content contains the link `<ac:link><ri:page ri:content-title="Example page" /><ac:link>`
@@ -27,4 +62,6 @@ export interface ConvertContentBody extends ContentBodyCreate {
    * - `version-at-save` renders the embedded content using the version at the time of save.
    */
   embeddedContentRender?: string;
+
+  additionalProperties?: any[];
 }

package/src/api/relation.ts

@@ -8,7 +8,8 @@ export class Relation {
   constructor(private client: Client) {}
 
   /**
-   * Returns all target entities that have a particular relationship to the source entity. Note, relationships are one way.
+   * Returns all target entities that have a particular relationship to the source entity. Note, relationships are one
+   * way.
    *
    * For example, the following method finds all content that the current user has an 'ignore' relationship with: `GET
    * https://your-domain.atlassian.net/wiki/rest/api/relation/ignore/from/user/current/to/content` Note, 'ignore' is an
@@ -22,7 +23,8 @@ export class Relation {
     callback: Callback<T>
   ): Promise<void>;
   /**
-   * Returns all target entities that have a particular relationship to the source entity. Note, relationships are one way.
+   * Returns all target entities that have a particular relationship to the source entity. Note, relationships are one
+   * way.
    *
    * For example, the following method finds all content that the current user has an 'ignore' relationship with: `GET
    * https://your-domain.atlassian.net/wiki/rest/api/relation/ignore/from/user/current/to/content` Note, 'ignore' is an
@@ -205,7 +207,8 @@ export class Relation {
   }
 
   /**
-   * Returns all target entities that have a particular relationship to the source entity. Note, relationships are one way.
+   * Returns all target entities that have a particular relationship to the source entity. Note, relationships are one
+   * way.
    *
    * For example, the following method finds all users that have a 'collaborator' relationship to a piece of content
    * with an ID of '1234': `GET
@@ -220,7 +223,8 @@ export class Relation {
     callback: Callback<T>
   ): Promise<void>;
   /**
-   * Returns all target entities that have a particular relationship to the source entity. Note, relationships are one way.
+   * Returns all target entities that have a particular relationship to the source entity. Note, relationships are one
+   * way.
    *
    * For example, the following method finds all users that have a 'collaborator' relationship to a piece of content
    * with an ID of '1234': `GET

package/src/api/settings.ts

@@ -11,7 +11,8 @@ export class Settings {
    * Returns the look and feel settings for the site or a single space. This includes attributes such as the color
    * scheme, padding, and border radius.
    *
-   * The look and feel settings for a space can be inherited from the global look and feel settings or provided by a theme.
+   * The look and feel settings for a space can be inherited from the global look and feel settings or provided by a
+   * theme.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: None
    */
@@ -23,7 +24,8 @@ export class Settings {
    * Returns the look and feel settings for the site or a single space. This includes attributes such as the color
    * scheme, padding, and border radius.
    *
-   * The look and feel settings for a space can be inherited from the global look and feel settings or provided by a theme.
+   * The look and feel settings for a space can be inherited from the global look and feel settings or provided by a
+   * theme.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: None
    */