confluence.js 1.5.3 → 1.6.1

package/out/api/parameters/removeContentState.d.ts

@@ -1,4 +1,8 @@
 export interface RemoveContentState {
     /** The Id of the content whose content state is to be set. */
-    contentId: string;
+    id?: string;
+    /** Status of content state from which to delete state. Can be draft or archived */
+    status?: string;
+    /** @deprecated The Id of the content whose content state is to be set. */
+    contentId?: string;
 }

package/out/api/parameters/setContentState.d.ts

@@ -1,8 +1,14 @@
-export interface SetContentState {
+import { ContentStateRestInput } from '../models';
+export interface SetContentState extends ContentStateRestInput {
     /** The Id of the content whose content state is to be set. */
-    contentId: string;
-    /** The Id of the content */
+    id?: string;
+    /**
+     * Status of content onto which state will be placed. If draft, then draft state will change. If current, state will
+     * be placed onto a new version of the content with same body as previous version.
+     */
+    status?: 'current' | 'draft' | string;
+    /** @deprecated The Id of the content whose content state is to be set. */
+    contentId?: string;
+    /** @deprecated The Id of the content */
     contentStateId?: number;
-    name?: string;
-    color?: string;
 }

package/out/api/settings.d.ts

@@ -105,8 +105,8 @@ export declare class Settings {
      * ('Can use' global permission).
      */
     getSystemInfo<T = Models.SystemInfoEntity>(callback?: never): Promise<T>;
-    /** Gets Content State settings for a space */
+    /** @deprecated Gets Content State settings for a space */
     getContentStateSettings<T = Models.ContentStateSettings>(parameters: Parameters.GetContentStateSettings, callback: Callback<T>): Promise<void>;
-    /** Gets Content State settings for a space */
+    /** @deprecated Gets Content State settings for a space */
     getContentStateSettings<T = Models.ContentStateSettings>(parameters: Parameters.GetContentStateSettings, callback?: never): Promise<T>;
 }

package/out/api/space.d.ts

@@ -88,7 +88,7 @@ export declare class Space {
      *
      * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Admin' permission for the space.
      */
-    deleteSpace<T = Models.DeletedSpace>(parameters: Parameters.DeleteSpace, callback: Callback<T>): Promise<void>;
+    deleteSpace<T = Models.LongTask>(parameters: Parameters.DeleteSpace, callback: Callback<T>): Promise<void>;
     /**
      * Deletes a space. Note, the space will be deleted in a long running task. Therefore, the space may not be deleted
      * yet when this method has returned. Clients should poll the status link that is returned in the response until the
@@ -96,7 +96,7 @@ export declare class Space {
      *
      * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Admin' permission for the space.
      */
-    deleteSpace<T = Models.DeletedSpace>(parameters: Parameters.DeleteSpace, callback?: never): Promise<T>;
+    deleteSpace<T = Models.LongTask>(parameters: Parameters.DeleteSpace, callback?: never): Promise<T>;
     /**
      * Returns all content in a space. The returned content is grouped by type (pages then blogposts), then ordered by
      * content ID in ascending order.

package/out/api/spaceProperties.d.ts

@@ -42,15 +42,15 @@ export declare class SpaceProperties {
      */
     getSpaceProperty<T = Models.SpaceProperty>(parameters: Parameters.GetSpaceProperty, callback?: never): Promise<T>;
     /**
-     * Creates a new space property. This is the same as `POST /wiki/rest/api/space/{spaceKey}/property` but the key for
-     * the property is passed as a path parameter, rather than in the request body.
+     * Creates a new space property. This is the same as `POST /api/space/{spaceKey}/property` but the key for the
+     * property is passed as a path parameter, rather than in the request body.
      *
      * **[Permissions required](https://confluence.atlassian.com/x/_AozKw)**: ‘Admin’ permission for the space.
      */
     createSpacePropertyForKey<T = Models.SpaceProperty>(parameters: Parameters.CreateSpacePropertyForKey, callback: Callback<T>): Promise<void>;
     /**
-     * Creates a new space property. This is the same as `POST /wiki/rest/api/space/{spaceKey}/property` but the key for
-     * the property is passed as a path parameter, rather than in the request body.
+     * Creates a new space property. This is the same as `POST /api/space/{spaceKey}/property` but the key for the
+     * property is passed as a path parameter, rather than in the request body.
      *
      * **[Permissions required](https://confluence.atlassian.com/x/_AozKw)**: ‘Admin’ permission for the space.
      */

package/out/clients/confluenceClient.d.ts

@@ -1,5 +1,5 @@
 import { BaseClient } from './baseClient';
-import { Analytics, Audit, Content, ContentAttachments, ContentBody, ContentChildrenAndDescendants, ContentComments, ContentContentState, ContentLabels, ContentMacroBody, ContentPermissions, ContentProperties, ContentRestrictions, ContentVersions, ContentWatches, DynamicModules, Experimental, Group, InlineTasks, LabelInfo, LongRunningTask, Relation, Search, Settings, Space, SpacePermissions, SpaceProperties, SpaceSettings, Template, Themes, Users } from '../api';
+import { Analytics, Audit, Content, ContentAttachments, ContentBody, ContentChildrenAndDescendants, ContentComments, ContentContentState, ContentLabels, ContentMacroBody, ContentPermissions, ContentProperties, ContentRestrictions, ContentStates, ContentVersions, ContentWatches, DynamicModules, Experimental, Group, InlineTasks, LabelInfo, LongRunningTask, Relation, Search, Settings, Space, SpacePermissions, SpaceProperties, SpaceSettings, Template, Themes, Users } from '../api';
 export declare class ConfluenceClient extends BaseClient {
     analytics: Analytics;
     audit: Audit;
@@ -14,6 +14,7 @@ export declare class ConfluenceClient extends BaseClient {
     contentPermissions: ContentPermissions;
     contentProperties: ContentProperties;
     contentRestrictions: ContentRestrictions;
+    contentStates: ContentStates;
     contentVersions: ContentVersions;
     contentWatches: ContentWatches;
     dynamicModules: DynamicModules;

package/out/clients/confluenceClient.js

@@ -19,6 +19,7 @@ class ConfluenceClient extends baseClient_1.BaseClient {
         this.contentPermissions = new api_1.ContentPermissions(this);
         this.contentProperties = new api_1.ContentProperties(this);
         this.contentRestrictions = new api_1.ContentRestrictions(this);
+        this.contentStates = new api_1.ContentStates(this);
         this.contentVersions = new api_1.ContentVersions(this);
         this.contentWatches = new api_1.ContentWatches(this);
         this.dynamicModules = new api_1.DynamicModules(this);

package/out/clients/confluenceClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"confluenceClient.js","sourceRoot":"","sources":["../../src/clients/confluenceClient.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,gCAgCgB;AAEhB,MAAa,gBAAiB,SAAQ,uBAAU;IAAhD;;QACE,cAAS,GAAG,IAAI,eAAS,CAAC,IAAI,CAAC,CAAC;QAChC,UAAK,GAAG,IAAI,WAAK,CAAC,IAAI,CAAC,CAAC;QACxB,YAAO,GAAG,IAAI,aAAO,CAAC,IAAI,CAAC,CAAC;QAC5B,uBAAkB,GAAG,IAAI,wBAAkB,CAAC,IAAI,CAAC,CAAC;QAClD,gBAAW,GAAG,IAAI,iBAAW,CAAC,IAAI,CAAC,CAAC;QACpC,kCAA6B,GAAG,IAAI,mCAA6B,CAAC,IAAI,CAAC,CAAC;QACxE,oBAAe,GAAG,IAAI,qBAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,wBAAmB,GAAG,IAAI,yBAAmB,CAAC,IAAI,CAAC,CAAC;QACpD,kBAAa,GAAG,IAAI,mBAAa,CAAC,IAAI,CAAC,CAAC;QACxC,qBAAgB,GAAG,IAAI,sBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9C,uBAAkB,GAAG,IAAI,wBAAkB,CAAC,IAAI,CAAC,CAAC;QAClD,sBAAiB,GAAG,IAAI,uBAAiB,CAAC,IAAI,CAAC,CAAC;QAChD,wBAAmB,GAAG,IAAI,yBAAmB,CAAC,IAAI,CAAC,CAAC;QACpD,oBAAe,GAAG,IAAI,qBAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,mBAAc,GAAG,IAAI,oBAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,mBAAc,GAAG,IAAI,oBAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,iBAAY,GAAG,IAAI,kBAAY,CAAC,IAAI,CAAC,CAAC;QACtC,UAAK,GAAG,IAAI,WAAK,CAAC,IAAI,CAAC,CAAC;QACxB,gBAAW,GAAG,IAAI,iBAAW,CAAC,IAAI,CAAC,CAAC;QACpC,cAAS,GAAG,IAAI,eAAS,CAAC,IAAI,CAAC,CAAC;QAChC,oBAAe,GAAG,IAAI,qBAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,aAAQ,GAAG,IAAI,cAAQ,CAAC,IAAI,CAAC,CAAC;QAC9B,WAAM,GAAG,IAAI,YAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,aAAQ,GAAG,IAAI,cAAQ,CAAC,IAAI,CAAC,CAAC;QAC9B,UAAK,GAAG,IAAI,WAAK,CAAC,IAAI,CAAC,CAAC;QACxB,qBAAgB,GAAG,IAAI,sBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9C,oBAAe,GAAG,IAAI,qBAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,kBAAa,GAAG,IAAI,mBAAa,CAAC,IAAI,CAAC,CAAC;QACxC,aAAQ,GAAG,IAAI,cAAQ,CAAC,IAAI,CAAC,CAAC;QAC9B,WAAM,GAAG,IAAI,YAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,UAAK,GAAG,IAAI,WAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAhCD,4CAgCC"}
+{"version":3,"file":"confluenceClient.js","sourceRoot":"","sources":["../../src/clients/confluenceClient.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,gCAiCgB;AAEhB,MAAa,gBAAiB,SAAQ,uBAAU;IAAhD;;QACE,cAAS,GAAG,IAAI,eAAS,CAAC,IAAI,CAAC,CAAC;QAChC,UAAK,GAAG,IAAI,WAAK,CAAC,IAAI,CAAC,CAAC;QACxB,YAAO,GAAG,IAAI,aAAO,CAAC,IAAI,CAAC,CAAC;QAC5B,uBAAkB,GAAG,IAAI,wBAAkB,CAAC,IAAI,CAAC,CAAC;QAClD,gBAAW,GAAG,IAAI,iBAAW,CAAC,IAAI,CAAC,CAAC;QACpC,kCAA6B,GAAG,IAAI,mCAA6B,CAAC,IAAI,CAAC,CAAC;QACxE,oBAAe,GAAG,IAAI,qBAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,wBAAmB,GAAG,IAAI,yBAAmB,CAAC,IAAI,CAAC,CAAC;QACpD,kBAAa,GAAG,IAAI,mBAAa,CAAC,IAAI,CAAC,CAAC;QACxC,qBAAgB,GAAG,IAAI,sBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9C,uBAAkB,GAAG,IAAI,wBAAkB,CAAC,IAAI,CAAC,CAAC;QAClD,sBAAiB,GAAG,IAAI,uBAAiB,CAAC,IAAI,CAAC,CAAC;QAChD,wBAAmB,GAAG,IAAI,yBAAmB,CAAC,IAAI,CAAC,CAAC;QACpD,kBAAa,GAAG,IAAI,mBAAa,CAAC,IAAI,CAAC,CAAC;QACxC,oBAAe,GAAG,IAAI,qBAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,mBAAc,GAAG,IAAI,oBAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,mBAAc,GAAG,IAAI,oBAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,iBAAY,GAAG,IAAI,kBAAY,CAAC,IAAI,CAAC,CAAC;QACtC,UAAK,GAAG,IAAI,WAAK,CAAC,IAAI,CAAC,CAAC;QACxB,gBAAW,GAAG,IAAI,iBAAW,CAAC,IAAI,CAAC,CAAC;QACpC,cAAS,GAAG,IAAI,eAAS,CAAC,IAAI,CAAC,CAAC;QAChC,oBAAe,GAAG,IAAI,qBAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,aAAQ,GAAG,IAAI,cAAQ,CAAC,IAAI,CAAC,CAAC;QAC9B,WAAM,GAAG,IAAI,YAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,aAAQ,GAAG,IAAI,cAAQ,CAAC,IAAI,CAAC,CAAC;QAC9B,UAAK,GAAG,IAAI,WAAK,CAAC,IAAI,CAAC,CAAC;QACxB,qBAAgB,GAAG,IAAI,sBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9C,oBAAe,GAAG,IAAI,qBAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,kBAAa,GAAG,IAAI,mBAAa,CAAC,IAAI,CAAC,CAAC;QACxC,aAAQ,GAAG,IAAI,cAAQ,CAAC,IAAI,CAAC,CAAC;QAC9B,WAAM,GAAG,IAAI,YAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,UAAK,GAAG,IAAI,WAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAjCD,4CAiCC"}

package/out/index.d.ts

@@ -4,6 +4,7 @@ export * from './requestConfig';
 export * from './callback';
 export * from './pagination';
 export * from './utilityTypes';
+export * from './services/authenticationService';
 export * as Api from './api';
 export * as Server from './server';
 export * as Models from './api/models';

package/out/index.js

@@ -8,6 +8,7 @@ tslib_1.__exportStar(require("./requestConfig"), exports);
 tslib_1.__exportStar(require("./callback"), exports);
 tslib_1.__exportStar(require("./pagination"), exports);
 tslib_1.__exportStar(require("./utilityTypes"), exports);
+tslib_1.__exportStar(require("./services/authenticationService"), exports);
 exports.Api = require("./api");
 exports.Server = require("./server");
 exports.Models = require("./api/models");

package/out/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,oDAA0B;AAC1B,mDAAyB;AACzB,0DAAgC;AAChC,qDAA2B;AAC3B,uDAA6B;AAC7B,yDAA+B;AAE/B,+BAA6B;AAC7B,qCAAmC;AACnC,yCAAuC;AACvC,iDAA+C;AAC/C,kDAAgD;AAChD,0DAAwD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,oDAA0B;AAC1B,mDAAyB;AACzB,0DAAgC;AAChC,qDAA2B;AAC3B,uDAA6B;AAC7B,yDAA+B;AAC/B,2EAAiD;AAEjD,+BAA6B;AAC7B,qCAAmC;AACnC,yCAAuC;AACvC,iDAA+C;AAC/C,kDAAgD;AAChD,0DAAwD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "confluence.js",
-  "version": "1.5.3",
+  "version": "1.6.1",
   "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",
@@ -42,25 +42,25 @@
     "atlassian"
   ],
   "devDependencies": {
-    "@swc-node/register": "^1.5.1",
-    "@types/express": "^4.17.13",
+    "@swc-node/register": "^1.5.4",
+    "@types/express": "^4.17.14",
     "@types/oauth": "^0.9.1",
     "@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",
+    "@typescript-eslint/eslint-plugin": "^5.41.0",
+    "@typescript-eslint/parser": "^5.41.0",
+    "ava": "^5.0.1",
+    "dotenv": "^16.0.3",
+    "eslint": "^8.26.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-import-resolver-typescript": "^3.5.1",
+    "eslint-import-resolver-typescript": "^3.5.2",
     "eslint-plugin-import": "^2.26.0",
     "prettier": "^2.7.1",
     "prettier-plugin-jsdoc": "^0.4.2",
-    "sinon": "^14.0.0",
-    "typedoc": "^0.23.14",
+    "sinon": "^14.0.1",
+    "typedoc": "^0.23.19",
     "typedoc-plugin-extras": "^2.3.0",
-    "typescript": "^4.8.2"
+    "typescript": "^4.8.4"
   },
   "dependencies": {
     "atlassian-jwt": "^2.0.2",

package/src/api/contentBody.ts

@@ -65,4 +65,104 @@ export class ContentBody {
 
     return this.client.sendRequest(config, callback);
   }
+
+  /**
+   * Converts a content body from one format to another format asynchronously. Returns the asyncId for the asynchronous
+   * task.
+   *
+   * Supported conversions:
+   *
+   * - Storage: export_view
+   *
+   * No other conversions are supported at the moment. Once a conversion is completed, it will be available for 5
+   * minutes at the result endpoint.
+   *
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: If request specifies 'contentIdContext',
+   * 'View' permission for the space, and permission to view the content.
+   */
+  async asyncConvertContentBodyRequest<T = Models.AsyncId>(
+    parameters: Parameters.AsyncConvertContentBodyRequest,
+    callback: Callback<T>
+  ): Promise<void>;
+  /**
+   * Converts a content body from one format to another format asynchronously. Returns the asyncId for the asynchronous
+   * task.
+   *
+   * Supported conversions:
+   *
+   * - Storage: export_view
+   *
+   * No other conversions are supported at the moment. Once a conversion is completed, it will be available for 5
+   * minutes at the result endpoint.
+   *
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: If request specifies 'contentIdContext',
+   * 'View' permission for the space, and permission to view the content.
+   */
+  async asyncConvertContentBodyRequest<T = Models.AsyncId>(
+    parameters: Parameters.AsyncConvertContentBodyRequest,
+    callback?: never
+  ): Promise<T>;
+  async asyncConvertContentBodyRequest<T = Models.AsyncId>(
+    parameters: Parameters.AsyncConvertContentBodyRequest,
+    callback?: Callback<T>,
+  ): Promise<void | T> {
+    const config: RequestConfig = {
+      url: `/api/contentbody/convert/async/${parameters.to}`,
+      method: 'POST',
+      params: {
+        spaceKeyContext: parameters.spaceKeyContext,
+        contentIdContext: parameters.contentIdContext,
+        allowCache: parameters.allowCache,
+        embeddedContentRender: parameters.embeddedContentRender,
+        expand: parameters.expand,
+      },
+      data: {
+        value: parameters.value,
+        representation: parameters.representation,
+        ...parameters.additionalProperties,
+      },
+    };
+
+    return this.client.sendRequest(config, callback);
+  }
+
+  /**
+   * Returns the Asynchronous Content Body for the corresponding asyncId if the task is complete or returns the status
+   * of the task.
+   *
+   * After the task is completed, the result can be obtained for 5 minutes, or until an identical conversion request is
+   * made again, with allowCache query param set to false.
+   *
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: If request specifies 'contentIdContext',
+   * 'View' permission for the space, and permission to view the content.
+   */
+  async asyncConvertContentBodyResponse<T = Models.AsyncContentBody>(
+    parameters: Parameters.AsyncConvertContentBodyResponse,
+    callback: Callback<T>
+  ): Promise<void>;
+  /**
+   * Returns the Asynchronous Content Body for the corresponding asyncId if the task is complete or returns the status
+   * of the task.
+   *
+   * After the task is completed, the result can be obtained for 5 minutes, or until an identical conversion request is
+   * made again, with allowCache query param set to false.
+   *
+   * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: If request specifies 'contentIdContext',
+   * 'View' permission for the space, and permission to view the content.
+   */
+  async asyncConvertContentBodyResponse<T = Models.AsyncContentBody>(
+    parameters: Parameters.AsyncConvertContentBodyResponse,
+    callback?: never
+  ): Promise<T>;
+  async asyncConvertContentBodyResponse<T = Models.AsyncContentBody>(
+    parameters: Parameters.AsyncConvertContentBodyResponse,
+    callback?: Callback<T>,
+  ): Promise<void | T> {
+    const config: RequestConfig = {
+      url: `/api/contentbody/convert/async/${parameters.id}`,
+      method: 'GET',
+    };
+
+    return this.client.sendRequest(config, callback);
+  }
 }

package/src/api/contentChildrenAndDescendants.ts

@@ -92,8 +92,10 @@ export class ContentChildrenAndDescendants {
    */
   async movePage<T = Models.MovePage>(parameters: Parameters.MovePage, callback?: never): Promise<T>;
   async movePage<T = Models.MovePage>(parameters: Parameters.MovePage, callback?: Callback<T>): Promise<void | T> {
+    const pageId = parameters.pageId || parameters.id;
+
     const config: RequestConfig = {
-      url: `/api/content/${parameters.id}/move/${parameters.position}/${parameters.targetId}`,
+      url: `/api/content/${pageId}/move/${parameters.position}/${parameters.targetId}`,
       method: 'PUT',
     };
 

package/src/api/contentContentState.ts

@@ -4,20 +4,22 @@ import { Callback } from '../callback';
 import { Client } from '../clients';
 import { RequestConfig } from '../requestConfig';
 
+/** @deprecated Use {@link ContentStates} instead. */
 export class ContentContentState {
+  /** @deprecated */
   constructor(private client: Client) {}
 
   /**
-   * Gets the current page status of the draft or published version of content. To specify the draft version, set the
-   * parameter status to PUBLISHED, otherwise DRAFT.
+   * @deprecated Gets the current page status of the draft or published version of content. To specify the draft
+   *   version, set the parameter status to PUBLISHED, otherwise DRAFT.
    */
   async getContentState<T = Models.ContentStateContainer>(
     parameters: Parameters.GetContentState,
     callback: Callback<T>
   ): Promise<void>;
   /**
-   * Gets the current page status of the draft or published version of content. To specify the draft version, set the
-   * parameter status to PUBLISHED, otherwise DRAFT.
+   * @deprecated Gets the current page status of the draft or published version of content. To specify the draft
+   *   version, set the parameter status to PUBLISHED, otherwise DRAFT.
    */
   async getContentState<T = Models.ContentStateContainer>(
     parameters: Parameters.GetContentState,
@@ -39,28 +41,28 @@ export class ContentContentState {
   }
 
   /**
-   * Sets the content state of the content specified and creates a new version (publishes the content without changing
-   * the body) of the content with the new status. The desired type of status must be allowed. There are space suggested
-   * statuses and custom statuses. To specify the desired new status, one can use the id of the status or the name and
-   * color of the status. If contentStateId is defined, then name and color are ignored. If contentStateId is not
-   * defined, name and color will be used if provided. Firstly, we will determine if a status of this name and color
-   * exists, and if it does, that this status is used. If it does not exist, and custom statuses are allowed, a custom
-   * status with this name and color will be created. Color can be specified in traditional english colors (teal,
-   * magenta, lavender, etc.) or as a hex string ex: #0ff0Fd.
+   * @deprecated Sets the content state of the content specified and creates a new version (publishes the content
+   *   without changing the body) of the content with the new status. The desired type of status must be allowed. There
+   *   are space suggested statuses and custom statuses. To specify the desired new status, one can use the id of the
+   *   status or the name and color of the status. If contentStateId is defined, then name and color are ignored. If
+   *   contentStateId is not defined, name and color will be used if provided. Firstly, we will determine if a status of
+   *   this name and color exists, and if it does, that this status is used. If it does not exist, and custom statuses
+   *   are allowed, a custom status with this name and color will be created. Color can be specified in traditional
+   *   english colors (teal, magenta, lavender, etc.) or as a hex string ex: #0ff0Fd.
    */
   async setContentState<T = Models.ContentStateContainer>(
     parameters: Parameters.SetContentState,
     callback: Callback<T>
   ): Promise<void>;
   /**
-   * Sets the content state of the content specified and creates a new version (publishes the content without changing
-   * the body) of the content with the new status. The desired type of status must be allowed. There are space suggested
-   * statuses and custom statuses. To specify the desired new status, one can use the id of the status or the name and
-   * color of the status. If contentStateId is defined, then name and color are ignored. If contentStateId is not
-   * defined, name and color will be used if provided. Firstly, we will determine if a status of this name and color
-   * exists, and if it does, that this status is used. If it does not exist, and custom statuses are allowed, a custom
-   * status with this name and color will be created. Color can be specified in traditional english colors (teal,
-   * magenta, lavender, etc.) or as a hex string ex: #0ff0Fd.
+   * @deprecated Sets the content state of the content specified and creates a new version (publishes the content
+   *   without changing the body) of the content with the new status. The desired type of status must be allowed. There
+   *   are space suggested statuses and custom statuses. To specify the desired new status, one can use the id of the
+   *   status or the name and color of the status. If contentStateId is defined, then name and color are ignored. If
+   *   contentStateId is not defined, name and color will be used if provided. Firstly, we will determine if a status of
+   *   this name and color exists, and if it does, that this status is used. If it does not exist, and custom statuses
+   *   are allowed, a custom status with this name and color will be created. Color can be specified in traditional
+   *   english colors (teal, magenta, lavender, etc.) or as a hex string ex: #0ff0Fd.
    */
   async setContentState<T = Models.ContentStateContainer>(
     parameters: Parameters.SetContentState,
@@ -84,16 +86,16 @@ export class ContentContentState {
   }
 
   /**
-   * Removes the content state of the content specified and creates a new version (publishes the content without
-   * changing the body) of the content with the new status.
+   * @deprecated Removes the content state of the content specified and creates a new version (publishes the content
+   *   without changing the body) of the content with the new status.
    */
   async removeContentState<T = Models.ContentStateContainer>(
     parameters: Parameters.RemoveContentState,
     callback: Callback<T>
   ): Promise<void>;
   /**
-   * Removes the content state of the content specified and creates a new version (publishes the content without
-   * changing the body) of the content with the new status.
+   * @deprecated Removes the content state of the content specified and creates a new version (publishes the content
+   *   without changing the body) of the content with the new status.
    */
   async removeContentState<T = Models.ContentStateContainer>(
     parameters: Parameters.RemoveContentState,
@@ -111,12 +113,12 @@ export class ContentContentState {
     return this.client.sendRequest(config, callback);
   }
 
-  /** Gets a Global Timestamp of the last time the content state was updated */
+  /** @deprecated Gets a Global Timestamp of the last time the content state was updated */
   async getContentStateLastUpdated<T = unknown>(
     parameters: Parameters.GetContentStateLastUpdated,
     callback: Callback<T>
   ): Promise<void>;
-  /** Gets a Global Timestamp of the last time the content state was updated */
+  /** @deprecated Gets a Global Timestamp of the last time the content state was updated */
   async getContentStateLastUpdated<T = unknown>(
     parameters: Parameters.GetContentStateLastUpdated,
     callback?: never
@@ -133,12 +135,12 @@ export class ContentContentState {
     return this.client.sendRequest(config, callback);
   }
 
-  /** Gets content states that are available for the content to be set as. */
+  /** @deprecated Gets content states that are available for the content to be set as. */
   async getAvailableContentStates<T = Models.AvailableContentStates>(
     parameters: Parameters.GetAvailableContentStates,
     callback: Callback<T>
   ): Promise<void>;
-  /** Gets content states that are available for the content to be set as. */
+  /** @deprecated Gets content states that are available for the content to be set as. */
   async getAvailableContentStates<T = Models.AvailableContentStates>(
     parameters: Parameters.GetAvailableContentStates,
     callback?: never

package/src/api/contentMacroBody.ts

@@ -58,4 +58,119 @@ export class ContentMacroBody {
 
     return this.client.sendRequest(config, callback);
   }
+
+  /**
+   * Returns the body of a macro in format specified in path, for the given macro ID. This includes information like the
+   * name of the macro, the body of the macro, and any macro parameters.
+   *
+   * About the macro ID: When a macro is created in a new version of content, Confluence will generate a random ID for
+   * it, unless an ID is specified (by an app). The macro ID will look similar to this:
+   * '50884bd9-0cb8-41d5-98be-f80943c14f96'. The ID is then persisted as new versions of content are created, and is
+   * only modified by Confluence if there are conflicting IDs.
+   *
+   * Note, to preserve backwards compatibility this resource will also match on the hash of the macro body, even if a
+   * 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.
+   */
+  async getAndConvertMacroBodyByMacroId<T = Models.ContentBody>(
+    parameters: Parameters.GetAndConvertMacroBodyByMacroId,
+    callback: Callback<T>
+  ): Promise<void>;
+  /**
+   * Returns the body of a macro in format specified in path, for the given macro ID. This includes information like the
+   * name of the macro, the body of the macro, and any macro parameters.
+   *
+   * About the macro ID: When a macro is created in a new version of content, Confluence will generate a random ID for
+   * it, unless an ID is specified (by an app). The macro ID will look similar to this:
+   * '50884bd9-0cb8-41d5-98be-f80943c14f96'. The ID is then persisted as new versions of content are created, and is
+   * only modified by Confluence if there are conflicting IDs.
+   *
+   * Note, to preserve backwards compatibility this resource will also match on the hash of the macro body, even if a
+   * 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.
+   */
+  async getAndConvertMacroBodyByMacroId<T = Models.ContentBody>(
+    parameters: Parameters.GetAndConvertMacroBodyByMacroId,
+    callback?: never
+  ): Promise<T>;
+  async getAndConvertMacroBodyByMacroId<T = Models.ContentBody>(
+    parameters: Parameters.GetAndConvertMacroBodyByMacroId,
+    callback?: Callback<T>,
+  ): Promise<void | T> {
+    const config: RequestConfig = {
+      url: `/api/content/${parameters.id}/history/${parameters.version}/macro/id/${parameters.macroId}/convert/${parameters.to}`,
+      method: 'GET',
+      params: {
+        spaceKeyContext: parameters.spaceKeyContext,
+        embeddedContentRender: parameters.embeddedContentRender,
+        expand: parameters.expand,
+      },
+    };
+
+    return this.client.sendRequest(config, callback);
+  }
+
+  /**
+   * Returns Async Id of the conversion task which will convert the macro into a content body of the desired format. The
+   * result will be available for 5 minutes after completion of the conversion.
+   *
+   * About the macro ID: When a macro is created in a new version of content, Confluence will generate a random ID for
+   * it, unless an ID is specified (by an app). The macro ID will look similar to this:
+   * '884bd9-0cb8-41d5-98be-f80943c14f96'. The ID is then persisted as new versions of content are created, and is only
+   * modified by Confluence if there are conflicting IDs.
+   *
+   * Note, to preserve backwards compatibility this resource will also match on the hash of the macro body, even if a
+   * 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.
+   */
+  async getAndAsyncConvertMacroBodyByMacroId<T = Models.AsyncId>(
+    parameters: Parameters.GetAndAsyncConvertMacroBodyByMacroId,
+    callback: Callback<T>
+  ): Promise<void>;
+  /**
+   * Returns Async Id of the conversion task which will convert the macro into a content body of the desired format. The
+   * result will be available for 5 minutes after completion of the conversion.
+   *
+   * About the macro ID: When a macro is created in a new version of content, Confluence will generate a random ID for
+   * it, unless an ID is specified (by an app). The macro ID will look similar to this:
+   * '884bd9-0cb8-41d5-98be-f80943c14f96'. The ID is then persisted as new versions of content are created, and is only
+   * modified by Confluence if there are conflicting IDs.
+   *
+   * Note, to preserve backwards compatibility this resource will also match on the hash of the macro body, even if a
+   * 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.
+   */
+  async getAndAsyncConvertMacroBodyByMacroId<T = Models.AsyncId>(
+    parameters: Parameters.GetAndAsyncConvertMacroBodyByMacroId,
+    callback?: never
+  ): Promise<T>;
+  async getAndAsyncConvertMacroBodyByMacroId<T = Models.AsyncId>(
+    parameters: Parameters.GetAndAsyncConvertMacroBodyByMacroId,
+    callback?: Callback<T>,
+  ): Promise<void | T> {
+    const config: RequestConfig = {
+      url: `/api/content/${parameters.id}/history/${parameters.version}/macro/id/${parameters.macroId}/convert/async/${parameters.to}`,
+      method: 'GET',
+      params: {
+        allowCache: parameters.allowCache,
+        spaceKeyContext: parameters.spaceKeyContext,
+        embeddedContentRender: parameters.embeddedContentRender,
+        expand: parameters.expand,
+      },
+    };
+
+    return this.client.sendRequest(config, callback);
+  }
 }