confluence.js 1.4.1 → 1.5.0

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

@@ -1,7 +1,9 @@
+import { CreateAttachments } from './createAttachments';
 export interface CreateOrUpdateAttachments {
     /** The ID of the content to add the attachment to. */
     id: string;
     /** The status of the content that the attachment is being added to. This should always be set to 'current'. */
-    status?: string;
-    [key: string]: any;
+    status?: 'current' | 'draft' | string;
+    /** The attachments to be created or updated. */
+    attachments: CreateAttachments.Attachment | CreateAttachments.Attachment[];
 }

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

@@ -2,7 +2,7 @@ export interface GetAttachments {
     /** The ID of the content to be queried for its attachments. */
     id: string;
     /** A multi-value parameter indicating which properties of the content to expand. */
-    expand?: string | string[] | GetAttachments.Expand | GetAttachments.Expand[];
+    expand?: 'childTypes.all' | 'childTypes.attachment' | 'childTypes.comment' | 'childTypes.page' | 'container' | 'metadata' | 'metadata.currentuser' | 'metadata.properties' | 'metadata.labels' | 'metadata.frontend' | 'operations' | 'children.page' | 'children.attachment' | 'children.comment' | 'restrictions.read.restrictions.user' | 'restrictions.read.restrictions.group' | 'restrictions.update.restrictions.user' | 'restrictions.update.restrictions.group' | 'history' | 'history.lastUpdated' | 'history.previousVersion' | 'history.contributors' | 'history.nextVersion' | 'ancestors' | 'body' | 'version' | 'descendants.page' | 'descendants.attachment' | 'descendants.comment' | 'space' | 'extensions.inlineProperties' | 'extensions.resolution' | ('childTypes.all' | 'childTypes.attachment' | 'childTypes.comment' | 'childTypes.page' | 'container' | 'metadata' | 'metadata.currentuser' | 'metadata.properties' | 'metadata.labels' | 'metadata.frontend' | 'operations' | 'children.page' | 'children.attachment' | 'children.comment' | 'restrictions.read.restrictions.user' | 'restrictions.read.restrictions.group' | 'restrictions.update.restrictions.user' | 'restrictions.update.restrictions.group' | 'history' | 'history.lastUpdated' | 'history.previousVersion' | 'history.contributors' | 'history.nextVersion' | 'ancestors' | 'body' | 'version' | 'descendants.page' | 'descendants.attachment' | 'descendants.comment' | 'space' | 'extensions.inlineProperties' | 'extensions.resolution')[] | string | string[] | GetAttachments.Expand | GetAttachments.Expand[];
     /** The starting index of the returned attachments. */
     start?: number;
     /** The maximum number of attachments to return per page. Note, this may be restricted by fixed system limits. */

package/out/api/parameters/getAttachments.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAttachments.js","sourceRoot":"","sources":["../../../src/api/parameters/getAttachments.ts"],"names":[],"mappings":";;;AAeA,IAAiB,cAAc,CAmF9B;AAnFD,WAAiB,cAAc;IAC7B,IAAY,MAiFX;IAjFD,WAAY,MAAM;QAChB;;;WAGG;QACH,0CAAgC,CAAA;QAChC,mDAAmD;QACnD,uDAA6C,CAAA;QAC7C,gDAAgD;QAChD,iDAAuC,CAAA;QACvC,mDAAmD;QACnD,2CAAiC,CAAA;QACjC;;;WAGG;QACH,iCAAuB,CAAA;QACvB;;;WAGG;QACH,sDAA4C,CAAA;QAC5C,iFAAiF;QACjF,oDAA0C,CAAA;QAC1C,8DAA8D;QAC9D,4CAAkC,CAAA;QAClC,+CAA+C;QAC/C,gDAAsC,CAAA;QACtC,uFAAuF;QACvF,mCAAyB,CAAA;QACzB,qFAAqF;QACrF,wCAA8B,CAAA;QAC9B,+CAA+C;QAC/C,oDAA0C,CAAA;QAC1C,2CAA2C;QAC3C,8CAAoC,CAAA;QACpC,kEAAkE;QAClE,qEAA2D,CAAA;QAC3D;;;WAGG;QACH,uEAA6D,CAAA;QAC7D,oEAAoE;QACpE,yEAA+D,CAAA;QAC/D;;;WAGG;QACH,2EAAiE,CAAA;QACjE,6EAA6E;QAC7E,6BAAmB,CAAA;QACnB,yHAAyH;QACzH,6CAAmC,CAAA;QACnC,gFAAgF;QAChF,qDAA2C,CAAA;QAC3C,oEAAoE;QACpE,+CAAqC,CAAA;QACrC,gFAAgF;QAChF,6CAAmC,CAAA;QACnC,yDAAyD;QACzD,iCAAuB,CAAA;QACvB,yHAAyH;QACzH,uBAAa,CAAA;QACb,yHAAyH;QACzH,6BAAmB,CAAA;QACnB,yEAAyE;QACzE,6CAAmC,CAAA;QACnC,8EAA8E;QAC9E,yDAA+C,CAAA;QAC/C,uEAAuE;QACvE,mDAAyC,CAAA;QACzC;;;WAGG;QACH,yBAAe,CAAA;QACf,kDAAkD;QAClD,0DAAgD,CAAA;QAChD,qDAAqD;QACrD,8CAAoC,CAAA;IACtC,CAAC,EAjFW,MAAM,GAAN,qBAAM,KAAN,qBAAM,QAiFjB;AACH,CAAC,EAnFgB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAmF9B"}
+{"version":3,"file":"getAttachments.js","sourceRoot":"","sources":["../../../src/api/parameters/getAttachments.ts"],"names":[],"mappings":";;;AAqFA,IAAiB,cAAc,CAmF9B;AAnFD,WAAiB,cAAc;IAC7B,IAAY,MAiFX;IAjFD,WAAY,MAAM;QAChB;;;WAGG;QACH,0CAAgC,CAAA;QAChC,mDAAmD;QACnD,uDAA6C,CAAA;QAC7C,gDAAgD;QAChD,iDAAuC,CAAA;QACvC,mDAAmD;QACnD,2CAAiC,CAAA;QACjC;;;WAGG;QACH,iCAAuB,CAAA;QACvB;;;WAGG;QACH,sDAA4C,CAAA;QAC5C,iFAAiF;QACjF,oDAA0C,CAAA;QAC1C,8DAA8D;QAC9D,4CAAkC,CAAA;QAClC,+CAA+C;QAC/C,gDAAsC,CAAA;QACtC,uFAAuF;QACvF,mCAAyB,CAAA;QACzB,qFAAqF;QACrF,wCAA8B,CAAA;QAC9B,+CAA+C;QAC/C,oDAA0C,CAAA;QAC1C,2CAA2C;QAC3C,8CAAoC,CAAA;QACpC,kEAAkE;QAClE,qEAA2D,CAAA;QAC3D;;;WAGG;QACH,uEAA6D,CAAA;QAC7D,oEAAoE;QACpE,yEAA+D,CAAA;QAC/D;;;WAGG;QACH,2EAAiE,CAAA;QACjE,6EAA6E;QAC7E,6BAAmB,CAAA;QACnB,yHAAyH;QACzH,6CAAmC,CAAA;QACnC,gFAAgF;QAChF,qDAA2C,CAAA;QAC3C,oEAAoE;QACpE,+CAAqC,CAAA;QACrC,gFAAgF;QAChF,6CAAmC,CAAA;QACnC,yDAAyD;QACzD,iCAAuB,CAAA;QACvB,yHAAyH;QACzH,uBAAa,CAAA;QACb,yHAAyH;QACzH,6BAAmB,CAAA;QACnB,yEAAyE;QACzE,6CAAmC,CAAA;QACnC,8EAA8E;QAC9E,yDAA+C,CAAA;QAC/C,uEAAuE;QACvE,mDAAyC,CAAA;QACzC;;;WAGG;QACH,yBAAe,CAAA;QACf,kDAAkD;QAClD,0DAAgD,CAAA;QAChD,qDAAqD;QACrD,8CAAoC,CAAA;IACtC,CAAC,EAjFW,MAAM,GAAN,qBAAM,KAAN,qBAAM,QAiFjB;AACH,CAAC,EAnFgB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAmF9B"}

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

@@ -1,7 +1,9 @@
-import { AttachmentUpdate } from '../models';
-export interface UpdateAttachmentData extends AttachmentUpdate {
+import { CreateAttachments } from './createAttachments';
+export interface UpdateAttachmentData {
     /** The ID of the content that the attachment is attached to. */
     id: string;
     /** The ID of the attachment to update. */
     attachmentId: string;
+    /** Attachment data to update. */
+    attachment: CreateAttachments.Attachment;
 }

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

@@ -1,8 +1,51 @@
-import { AttachmentUpdate } from '../models';
+import { AttachmentMetadata, Container, Content, ContentChildren, ContentChildType, ContentHistory, GenericLinks, OperationCheckResult, Space, Version } from '../models';
 export interface UpdateAttachmentProperties {
     /** The ID of the content that the attachment is attached to. */
     id: string;
     /** The ID of the attachment to update. */
     attachmentId: string;
-    body: AttachmentUpdate;
+    /** @deprecated Use `update` property instead. */
+    body?: UpdateAttachmentProperties.Properties;
+    update?: UpdateAttachmentProperties.Properties;
+}
+export declare namespace UpdateAttachmentProperties {
+    interface Properties {
+        [key: string]: any;
+        id: string;
+        type: 'page' | 'blogpost' | 'attachment' | 'content' | string;
+        status: 'current' | 'draft' | string;
+        title?: string;
+        space?: Space;
+        history?: ContentHistory;
+        version: Partial<Version>;
+        ancestors?: Content[];
+        operations?: OperationCheckResult[];
+        children?: ContentChildren;
+        childTypes?: ContentChildType;
+        descendants?: ContentChildren;
+        container?: Container;
+        body?: any;
+        restrictions?: any;
+        metadata?: Partial<AttachmentMetadata>;
+        macroRenderedOutput?: any;
+        extensions?: any;
+        _expandable?: {
+            'childTypes': string;
+            'container': string;
+            'metadata': string;
+            'operations': string;
+            'children': string;
+            'restrictions': string;
+            'history': string;
+            'ancestors': string;
+            'body': string;
+            'version': string;
+            'descendants': string;
+            'space': string;
+            'extensions': string;
+            'schedulePublishDate': string;
+            'macroRenderedOutput': string;
+        };
+        _links?: GenericLinks;
+    }
 }

package/out/clients/baseClient.js

@@ -79,13 +79,14 @@ class BaseClient {
                 return responseHandler(response.data);
             }
             catch (e) {
+                const err = this.config.newErrorHandling && e.isAxiosError ? e.response.data : e;
                 const callbackErrorHandler = callback && ((error) => callback(error));
                 const defaultErrorHandler = (error) => {
                     throw error;
                 };
                 const errorHandler = callbackErrorHandler !== null && callbackErrorHandler !== void 0 ? callbackErrorHandler : defaultErrorHandler;
-                (_d = (_c = this.config.middlewares) === null || _c === void 0 ? void 0 : _c.onError) === null || _d === void 0 ? void 0 : _d.call(_c, e);
-                return errorHandler(e);
+                (_d = (_c = this.config.middlewares) === null || _c === void 0 ? void 0 : _c.onError) === null || _d === void 0 ? void 0 : _d.call(_c, err);
+                return errorHandler(err);
             }
         });
     }

package/out/clients/baseClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseClient.js","sourceRoot":"","sources":["../../src/clients/baseClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"baseClient.js","sourceRoot":"","sources":["../../src/clients/baseClient.ts"],"names":[],"mappings":"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"}

package/out/config.d.ts

@@ -12,6 +12,8 @@ export interface Config {
      * Adds `'X-Atlassian-Token': 'no-check'` to each request header
      */
     noCheckAtlassianToken?: boolean;
+    /** Enable new API error handling. `false` by default. */
+    newErrorHandling?: boolean;
 }
 export declare namespace Config {
     type BaseRequestConfig = RequestConfig;

package/out/paramSerializer.js

@@ -11,7 +11,7 @@ function paramSerializer(key, values) {
     if (!values.length) {
         return '';
     }
-    return () => values.map((value) => `${key}=${value}`).join('&');
+    return () => values.map(value => `${key}=${value}`).join('&');
 }
 exports.paramSerializer = paramSerializer;
 //# sourceMappingURL=paramSerializer.js.map

package/out/paramSerializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"paramSerializer.js","sourceRoot":"","sources":["../src/paramSerializer.ts"],"names":[],"mappings":";;;AAAA,SAAgB,eAAe,CAAC,GAAW,EAAE,MAA0B;IACrE,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,OAAO,GAAG,EAAE,CAAC,GAAG,GAAG,IAAI,MAAM,EAAE,CAAC;KACjC;IAED,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,OAAO,EAAE,CAAC;KACX;IAED,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClE,CAAC;AAdD,0CAcC"}
+{"version":3,"file":"paramSerializer.js","sourceRoot":"","sources":["../src/paramSerializer.ts"],"names":[],"mappings":";;;AAAA,SAAgB,eAAe,CAAC,GAAW,EAAE,MAA0B;IACrE,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,OAAO,GAAG,EAAE,CAAC,GAAG,GAAG,IAAI,MAAM,EAAE,CAAC;KACjC;IAED,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,OAAO,EAAE,CAAC;KACX;IAED,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAChE,CAAC;AAdD,0CAcC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "confluence.js",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "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",
@@ -14,7 +14,7 @@
     "test": "npm run test:unit && npm run test:e2e",
     "prettier": "prettier --write src/**/*.ts",
     "doc": "typedoc --name \"Confluence.js - Cloud and Server API library\" --out docs ./src/index.ts --plugin typedoc-plugin-extras --footerDate --footerTime --footerTypedocVersion --favicon https://svgshare.com/i/bVi.svg",
-    "lint": "eslint src --ext .ts",
+    "lint": "eslint src tests --ext .ts",
     "lint:fix": "npm run lint -- --fix",
     "test:unit": "ava tests/unit",
     "test:e2e": "ava --timeout=2m --fail-fast --no-worker-threads -c 1 -s tests/e2e/**/*.test.ts"
@@ -36,34 +36,36 @@
     "api",
     "wrapper",
     "client",
+    "cloud",
     "rest",
     "wiki",
     "atlassian"
   ],
   "devDependencies": {
-    "@swc-node/register": "^1.4.2",
+    "@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.21.0",
-    "@typescript-eslint/parser": "^5.21.0",
+    "@typescript-eslint/eslint-plugin": "^5.25.0",
+    "@typescript-eslint/parser": "^5.25.0",
     "ava": "^4.2.0",
-    "dotenv": "^16.0.0",
-    "eslint": "^8.14.0",
+    "dotenv": "^16.0.1",
+    "eslint": "^8.16.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-import-resolver-typescript": "^2.7.1",
     "eslint-plugin-import": "^2.26.0",
     "prettier": "^2.6.2",
     "prettier-plugin-jsdoc": "^0.3.38",
-    "sinon": "^13.0.2",
+    "sinon": "^14.0.0",
     "typedoc": "^0.22.15",
     "typedoc-plugin-extras": "^2.2.3",
-    "typescript": "^4.6.3"
+    "typescript": "^4.6.4"
   },
   "dependencies": {
     "atlassian-jwt": "^2.0.2",
-    "axios": "^0.27.0",
+    "axios": "^0.27.2",
+    "form-data": "^4.0.0",
     "oauth": "^0.9.15",
     "tslib": "^2.4.0"
   }

package/src/api/contentAttachments.ts

@@ -1,3 +1,4 @@
+import * as FormData from 'form-data';
 import * as Models from './models';
 import * as Parameters from './parameters';
 import { Callback } from '../callback';
@@ -15,7 +16,7 @@ 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>(
+  async getAttachments<T = Models.ContentArray<Models.Attachment>>(
     parameters: Parameters.GetAttachments,
     callback: Callback<T>
   ): Promise<void>;
@@ -27,8 +28,8 @@ 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>(parameters: Parameters.GetAttachments, callback?: never): Promise<T>;
-  async getAttachments<T = Models.ContentArray>(
+  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>,
   ): Promise<void | T> {
@@ -49,91 +50,55 @@ 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](#api-content-id-child-attachment-put).
-   *
-   * Note, you must set a `X-Atlassian-Token: nocheck` header on the request for this method, otherwise it will be
-   * blocked. This protects against XSRF attacks, which is necessary as this method accepts multipart/form-data.
-   *
-   * The media type 'multipart/form-data' is defined in [RFC 7578](https://www.ietf.org/rfc/rfc7578.txt). Most client
-   * libraries have classes that make it easier to implement multipart posts, like the
-   * [MultipartEntityBuilder](https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/) Java class
-   * provided by Apache HTTP Components.
-   *
-   * Note, according to [RFC 7578](https://tools.ietf.org/html/rfc7578#section-4.5), in the case where the form data is
-   * text, the charset parameter for the "text/plain" Content-Type may be used to indicate the character encoding used
-   * in that part. In the case of this API endpoint, the `comment` body parameter should be sent with `type=text/plain`
-   * and `charset=utf-8` values. This will force the charset to be UTF-8.
-   *
-   * Example: This curl command attaches a file ('example.txt') to a container (id='123') with a comment and `minorEdits`=true.
-   *
-   * ```bash
-   * curl -D- \
-   *   -u admin:admin \
-   *   -X POST \
-   *   -H 'X-Atlassian-Token: nocheck' \
-   *   -F 'file=@"example.txt"' \
-   *   -F 'minorEdit="true"' \
-   *   -F 'comment="Example attachment comment"; type=text/plain; charset=utf-8' \
-   *   http://myhost/rest/api/content/123/child/attachment
-   * ```
+   * 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.
    */
-  async createAttachments<T = Models.ContentArray>(
+  async createAttachments<T = Models.ContentArray<Models.CreatedAttachment>>(
     parameters: Parameters.CreateAttachments,
     callback: Callback<T>
   ): 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](#api-content-id-child-attachment-put).
-   *
-   * Note, you must set a `X-Atlassian-Token: nocheck` header on the request for this method, otherwise it will be
-   * blocked. This protects against XSRF attacks, which is necessary as this method accepts multipart/form-data.
-   *
-   * The media type 'multipart/form-data' is defined in [RFC 7578](https://www.ietf.org/rfc/rfc7578.txt). Most client
-   * libraries have classes that make it easier to implement multipart posts, like the
-   * [MultipartEntityBuilder](https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/) Java class
-   * provided by Apache HTTP Components.
-   *
-   * Note, according to [RFC 7578](https://tools.ietf.org/html/rfc7578#section-4.5), in the case where the form data is
-   * text, the charset parameter for the "text/plain" Content-Type may be used to indicate the character encoding used
-   * in that part. In the case of this API endpoint, the `comment` body parameter should be sent with `type=text/plain`
-   * and `charset=utf-8` values. This will force the charset to be UTF-8.
-   *
-   * Example: This curl command attaches a file ('example.txt') to a container (id='123') with a comment and `minorEdits`=true.
-   *
-   * ```bash
-   * curl -D- \
-   *   -u admin:admin \
-   *   -X POST \
-   *   -H 'X-Atlassian-Token: nocheck' \
-   *   -F 'file=@"example.txt"' \
-   *   -F 'minorEdit="true"' \
-   *   -F 'comment="Example attachment comment"; type=text/plain; charset=utf-8' \
-   *   http://myhost/rest/api/content/123/child/attachment
-   * ```
+   * 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.
    */
-  async createAttachments<T = Models.ContentArray>(
+  async createAttachments<T = Models.ContentArray<Models.CreatedAttachment>>(
     parameters: Parameters.CreateAttachments,
     callback?: never
   ): Promise<T>;
-  async createAttachments<T = Models.ContentArray>(
+  async createAttachments<T = Models.ContentArray<Models.CreatedAttachment>>(
     parameters: Parameters.CreateAttachments,
     callback?: Callback<T>,
   ): Promise<void | T> {
+    const formData = new FormData();
+    const attachments = Array.isArray(parameters.attachments) ? parameters.attachments : [parameters.attachments];
+
+    attachments.forEach(attachment => {
+      formData.append('minorEdit', attachment.minorEdit.toString(), 'minorEdit');
+      formData.append('file', attachment.file, {
+        filename: attachment.filename,
+        contentType: attachment.contentType,
+      });
+
+      if (attachment.comment) {
+        formData.append('comment', attachment.comment, 'comment');
+      }
+    });
+
     const config: RequestConfig = {
       url: `/api/content/${parameters.id}/child/attachment`,
       method: 'POST',
+      headers: {
+        'X-Atlassian-Token': 'no-check',
+        'Content-Type': 'multipart/form-data',
+        ...formData.getHeaders?.(),
+      },
       params: {
         status: parameters.status,
       },
-      data: {
-        ...parameters,
-        id: undefined,
-        status: undefined,
-      },
+      data: formData,
     };
 
     return this.client.sendRequest(config, callback);
@@ -143,36 +108,9 @@ export class ContentAttachments {
    * Adds an attachment to a piece of content. If the attachment already exists for the content, then the attachment is
    * updated (i.e. a new version of the attachment is created).
    *
-   * Note, you must set a `X-Atlassian-Token: nocheck` header on the request for this method, otherwise it will be
-   * blocked. This protects against XSRF attacks, which is necessary as this method accepts multipart/form-data.
-   *
-   * The media type 'multipart/form-data' is defined in [RFC 7578](https://www.ietf.org/rfc/rfc7578.txt). Most client
-   * libraries have classes that make it easier to implement multipart posts, like the
-   * [MultipartEntityBuilder](https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/) Java class
-   * provided by Apache HTTP Components.
-   *
-   * Note, according to [RFC 7578](https://tools.ietf.org/html/rfc7578#section-4.5), in the case where the form data is
-   * text, the charset parameter for the "text/plain" Content-Type may be used to indicate the character encoding used
-   * in that part. In the case of this API endpoint, the `comment` body parameter should be sent with `type=text/plain`
-   * and `charset=utf-8` values. This will force the charset to be UTF-8.
-   *
-   * Example: This curl command attaches a file ('example.txt') to a piece of content (id='123') with a comment and
-   * `minorEdits`=true. If the 'example.txt' file already exists, it will update it with a new version of the attachment.
-   *
-   * ```bash
-   * curl -D- \
-   *   -u admin:admin \
-   *   -X PUT \
-   *   -H 'X-Atlassian-Token: nocheck' \
-   *   -F 'file=@"example.txt"' \
-   *   -F 'minorEdit="true"' \
-   *   -F 'comment="Example attachment comment"; type=text/plain; charset=utf-8' \
-   *   http://myhost/rest/api/content/123/child/attachment
-   * ```
-   *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to update the content.
    */
-  async createOrUpdateAttachments<T = Models.ContentArray>(
+  async createOrUpdateAttachments<T = Models.ContentArray<Models.CreatedAttachment>>(
     parameters: Parameters.CreateOrUpdateAttachments,
     callback: Callback<T>
   ): Promise<void>;
@@ -180,54 +118,43 @@ export class ContentAttachments {
    * Adds an attachment to a piece of content. If the attachment already exists for the content, then the attachment is
    * updated (i.e. a new version of the attachment is created).
    *
-   * Note, you must set a `X-Atlassian-Token: nocheck` header on the request for this method, otherwise it will be
-   * blocked. This protects against XSRF attacks, which is necessary as this method accepts multipart/form-data.
-   *
-   * The media type 'multipart/form-data' is defined in [RFC 7578](https://www.ietf.org/rfc/rfc7578.txt). Most client
-   * libraries have classes that make it easier to implement multipart posts, like the
-   * [MultipartEntityBuilder](https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/) Java class
-   * provided by Apache HTTP Components.
-   *
-   * Note, according to [RFC 7578](https://tools.ietf.org/html/rfc7578#section-4.5), in the case where the form data is
-   * text, the charset parameter for the "text/plain" Content-Type may be used to indicate the character encoding used
-   * in that part. In the case of this API endpoint, the `comment` body parameter should be sent with `type=text/plain`
-   * and `charset=utf-8` values. This will force the charset to be UTF-8.
-   *
-   * Example: This curl command attaches a file ('example.txt') to a piece of content (id='123') with a comment and
-   * `minorEdits`=true. If the 'example.txt' file already exists, it will update it with a new version of the attachment.
-   *
-   * ```bash
-   * curl -D- \
-   *   -u admin:admin \
-   *   -X PUT \
-   *   -H 'X-Atlassian-Token: nocheck' \
-   *   -F 'file=@"example.txt"' \
-   *   -F 'minorEdit="true"' \
-   *   -F 'comment="Example attachment comment"; type=text/plain; charset=utf-8' \
-   *   http://myhost/rest/api/content/123/child/attachment
-   * ```
-   *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to update the content.
    */
-  async createOrUpdateAttachments<T = Models.ContentArray>(
+  async createOrUpdateAttachments<T = Models.ContentArray<Models.CreatedAttachment>>(
     parameters: Parameters.CreateOrUpdateAttachments,
     callback?: never
   ): Promise<T>;
-  async createOrUpdateAttachments<T = Models.ContentArray>(
+  async createOrUpdateAttachments<T = Models.ContentArray<Models.CreatedAttachment>>(
     parameters: Parameters.CreateOrUpdateAttachments,
     callback?: Callback<T>,
   ): Promise<void | T> {
+    const formData = new FormData();
+    const attachments = Array.isArray(parameters.attachments) ? parameters.attachments : [parameters.attachments];
+
+    attachments.forEach(attachment => {
+      formData.append('minorEdit', attachment.minorEdit.toString(), 'minorEdit');
+      formData.append('file', attachment.file, {
+        filename: attachment.filename,
+        contentType: attachment.contentType,
+      });
+
+      if (attachment.comment) {
+        formData.append('comment', attachment.comment, 'comment');
+      }
+    });
+
     const config: RequestConfig = {
       url: `/api/content/${parameters.id}/child/attachment`,
       method: 'PUT',
+      headers: {
+        'X-Atlassian-Token': 'no-check',
+        'Content-Type': 'multipart/form-data',
+        ...formData.getHeaders?.(),
+      },
       params: {
         status: parameters.status,
       },
-      data: {
-        ...parameters,
-        id: undefined,
-        status: undefined,
-      },
+      data: formData,
     };
 
     return this.client.sendRequest(config, callback);
@@ -239,7 +166,7 @@ export class ContentAttachments {
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to update the content.
    */
-  async updateAttachmentProperties<T = Models.Content>(
+  async updateAttachmentProperties<T = Models.CreatedAttachment>(
     parameters: Parameters.UpdateAttachmentProperties,
     callback: Callback<T>
   ): Promise<void>;
@@ -249,18 +176,18 @@ export class ContentAttachments {
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to update the content.
    */
-  async updateAttachmentProperties<T = Models.Content>(
+  async updateAttachmentProperties<T = Models.CreatedAttachment>(
     parameters: Parameters.UpdateAttachmentProperties,
     callback?: never
   ): Promise<T>;
-  async updateAttachmentProperties<T = Models.Content>(
+  async updateAttachmentProperties<T = Models.CreatedAttachment>(
     parameters: Parameters.UpdateAttachmentProperties,
     callback?: Callback<T>,
   ): Promise<void | T> {
     const config: RequestConfig = {
       url: `/api/content/${parameters.id}/child/attachment/${parameters.attachmentId}`,
       method: 'PUT',
-      data: parameters.body,
+      data: parameters.update ?? parameters.body,
     };
 
     return this.client.sendRequest(config, callback);
@@ -269,106 +196,67 @@ export class ContentAttachments {
   /**
    * 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](#api-content-id-child-attachment-put), except
+   * 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.
    *
-   * Note, you must set a `X-Atlassian-Token: nocheck` header on the request for this method, otherwise it will be
-   * blocked. This protects against XSRF attacks, which is necessary as this method accepts multipart/form-data.
-   *
-   * The media type 'multipart/form-data' is defined in [RFC 7578](https://www.ietf.org/rfc/rfc7578.txt). Most client
-   * libraries have classes that make it easier to implement multipart posts, like the
-   * [MultipartEntityBuilder](https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/) Java class
-   * provided by Apache HTTP Components.
-   *
-   * Note, according to [RFC 7578](https://tools.ietf.org/html/rfc7578#section-4.5), in the case where the form data is
-   * text, the charset parameter for the "text/plain" Content-Type may be used to indicate the character encoding used
-   * in that part. In the case of this API endpoint, the `comment` body parameter should be sent with `type=text/plain`
-   * and `charset=utf-8` values. This will force the charset to be UTF-8.
-   *
-   * Example: This curl command updates an attachment (id='att456') that is attached to a piece of content (id='123')
-   * with a comment and `minorEdits`=true.
-   *
-   * ```bash
-   * curl -D- \
-   *   -u admin:admin \
-   *   -X POST \
-   *   -H 'X-Atlassian-Token: nocheck' \
-   *   -F 'file=@"example.txt"' \
-   *   -F 'minorEdit="true"' \
-   *   -F 'comment="Example attachment comment"; type=text/plain; charset=utf-8' \
-   *   http://myhost/rest/api/content/123/child/attachment/att456/data
-   * ```
-   *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to update the content.
    */
-  async updateAttachmentData<T = Models.Content>(
+  async updateAttachmentData<T = Models.CreatedAttachment>(
     parameters: Parameters.UpdateAttachmentData,
     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.
    *
-   * This method is essentially the same as [Create or update attachments](#api-content-id-child-attachment-put), except
+   * 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.
    *
-   * Note, you must set a `X-Atlassian-Token: nocheck` header on the request for this method, otherwise it will be
-   * blocked. This protects against XSRF attacks, which is necessary as this method accepts multipart/form-data.
-   *
-   * The media type 'multipart/form-data' is defined in [RFC 7578](https://www.ietf.org/rfc/rfc7578.txt). Most client
-   * libraries have classes that make it easier to implement multipart posts, like the
-   * [MultipartEntityBuilder](https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/) Java class
-   * provided by Apache HTTP Components.
-   *
-   * Note, according to [RFC 7578](https://tools.ietf.org/html/rfc7578#section-4.5), in the case where the form data is
-   * text, the charset parameter for the "text/plain" Content-Type may be used to indicate the character encoding used
-   * in that part. In the case of this API endpoint, the `comment` body parameter should be sent with `type=text/plain`
-   * and `charset=utf-8` values. This will force the charset to be UTF-8.
-   *
-   * Example: This curl command updates an attachment (id='att456') that is attached to a piece of content (id='123')
-   * with a comment and `minorEdits`=true.
-   *
-   * ```bash
-   * curl -D- \
-   *   -u admin:admin \
-   *   -X POST \
-   *   -H 'X-Atlassian-Token: nocheck' \
-   *   -F 'file=@"example.txt"' \
-   *   -F 'minorEdit="true"' \
-   *   -F 'comment="Example attachment comment"; type=text/plain; charset=utf-8' \
-   *   http://myhost/rest/api/content/123/child/attachment/att456/data
-   * ```
-   *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to update the content.
    */
-  async updateAttachmentData<T = Models.Content>(
+  async updateAttachmentData<T = Models.CreatedAttachment>(
     parameters: Parameters.UpdateAttachmentData,
     callback?: never
   ): Promise<T>;
-  async updateAttachmentData<T = Models.Content>(
+  async updateAttachmentData<T = Models.CreatedAttachment>(
     parameters: Parameters.UpdateAttachmentData,
     callback?: Callback<T>,
   ): Promise<void | T> {
+    const { attachment } = parameters;
+
+    const formData = new FormData();
+
+    formData.append('minorEdit', attachment.minorEdit.toString(), 'minorEdit');
+    formData.append('file', attachment.file, {
+      filename: attachment.filename,
+      contentType: attachment.contentType,
+    });
+
+    if (attachment.comment) {
+      formData.append('comment', attachment.comment, 'comment');
+    }
+
     const config: RequestConfig = {
       url: `/api/content/${parameters.id}/child/attachment/${parameters.attachmentId}/data`,
       method: 'POST',
-      data: {
-        ...parameters,
-        id: undefined,
-        attachmentId: undefined,
+      headers: {
+        'X-Atlassian-Token': 'no-check',
+        'Content-Type': 'multipart/form-data',
+        ...formData.getHeaders?.(),
       },
+      data: formData,
     };
 
     return this.client.sendRequest(config, callback);
   }
 
   /** Redirects the client to a URL that serves an attachment's binary data. */
-  async downloadAttachment<T = ArrayBuffer>(
+  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 = ArrayBuffer>(parameters: Parameters.DownloadAttachment, callback?: never): Promise<T>;
-  async downloadAttachment<T = ArrayBuffer>(
+  async downloadAttachment<T = Buffer>(parameters: Parameters.DownloadAttachment, callback?: never): Promise<T>;
+  async downloadAttachment<T = Buffer>(
     parameters: Parameters.DownloadAttachment,
     callback?: Callback<T>,
   ): Promise<void | T> {