confluence.js 1.3.0 → 1.4.1

package/out/services/authenticationService/authentications/createPATAuthenticationToken.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createPATAuthenticationToken.js","sourceRoot":"","sources":["../../../../src/services/authenticationService/authentications/createPATAuthenticationToken.ts"],"names":[],"mappings":";;;;AAEA,SAAsB,4BAA4B,CAAC,kBAA6D;;QAC9G,OAAO,UAAU,kBAAkB,EAAE,CAAC;IACxC,CAAC;CAAA;AAFD,oEAEC"}

package/out/services/authenticationService/authentications/index.d.ts

@@ -1,3 +1,4 @@
 export * from './createBasicAuthenticationToken';
 export * from './createJWTAuthentication';
 export * from './createOAuth2AuthenticationToken';
+export * from './createPATAuthenticationToken';

package/out/services/authenticationService/authentications/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./createBasicAuthenticationToken"), exports);
-(0, tslib_1.__exportStar)(require("./createJWTAuthentication"), exports);
-(0, tslib_1.__exportStar)(require("./createOAuth2AuthenticationToken"), exports);
+tslib_1.__exportStar(require("./createBasicAuthenticationToken"), exports);
+tslib_1.__exportStar(require("./createJWTAuthentication"), exports);
+tslib_1.__exportStar(require("./createOAuth2AuthenticationToken"), exports);
+tslib_1.__exportStar(require("./createPATAuthenticationToken"), exports);
+//# sourceMappingURL=index.js.map

package/out/services/authenticationService/authentications/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/authenticationService/authentications/index.ts"],"names":[],"mappings":";;;AAAA,2EAAiD;AACjD,oEAA0C;AAC1C,4EAAkD;AAClD,yEAA+C"}

package/out/services/authenticationService/base64Encoder.js

@@ -58,3 +58,4 @@ var Base64Encoder;
         return output;
     };
 })(Base64Encoder = exports.Base64Encoder || (exports.Base64Encoder = {}));
+//# sourceMappingURL=base64Encoder.js.map

package/out/services/authenticationService/base64Encoder.js.map

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

package/out/services/authenticationService/index.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./authenticationService"), exports);
+tslib_1.__exportStar(require("./authenticationService"), exports);
+//# sourceMappingURL=index.js.map

package/out/services/authenticationService/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/authenticationService/index.ts"],"names":[],"mappings":";;;AAAA,kEAAwC"}

package/out/utilityTypes.d.ts

@@ -4,6 +4,5 @@ export declare namespace UtilityTypes {
         [P in Exclude<keyof T, keyof U>]?: never;
     };
     /** get the XOR type which could make 2 types exclude each other */
-    export type XOR<T, U> = T | U extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
-    export {};
+    type XOR<T, U> = T | U extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
 }

package/out/utilityTypes.js

@@ -1,2 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=utilityTypes.js.map

package/out/utilityTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utilityTypes.js","sourceRoot":"","sources":["../src/utilityTypes.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "confluence.js",
-  "version": "1.3.0",
+  "version": "1.4.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",
@@ -12,16 +12,24 @@
     "build": "tsc",
     "prepublishOnly": "npm run build && npm run test && npm run lint",
     "test": "npm run test:unit && npm run test:e2e",
-    "test:unit": "jest tests/unit --verbose",
-    "test:e2e": "jest tests/e2e --setupFiles=./tests/setup.ts --runInBand",
     "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:fix": "npm run lint -- --fix"
+    "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"
   },
-  "jest": {
-    "preset": "ts-jest",
-    "testEnvironment": "node"
+  "ava": {
+    "extensions": [
+      "ts"
+    ],
+    "require": [
+      "@swc-node/register",
+      "dotenv/config"
+    ],
+    "environmentVariables": {
+      "SWC_NODE_PROJECT": "./tsconfig.lint.json"
+    }
   },
   "keywords": [
     "confluence",
@@ -33,31 +41,30 @@
     "atlassian"
   ],
   "devDependencies": {
+    "@swc-node/register": "^1.4.2",
     "@types/express": "^4.17.13",
-    "@types/jest": "^27.0.3",
     "@types/oauth": "^0.9.1",
-    "@types/sinon": "^10.0.6",
-    "@typescript-eslint/eslint-plugin": "^5.6.0",
-    "@typescript-eslint/parser": "^5.6.0",
-    "dotenv": "^10.0.0",
-    "eslint": "^8.4.1",
-    "eslint-config-airbnb": "^19.0.2",
-    "eslint-config-airbnb-typescript": "^16.1.0",
-    "eslint-import-resolver-typescript": "^2.5.0",
-    "eslint-plugin-import": "^2.25.3",
-    "jest": "^27.4.3",
-    "prettier": "^2.5.1",
-    "prettier-plugin-jsdoc": "^0.3.30",
-    "sinon": "^12.0.1",
-    "ts-jest": "^27.1.1",
-    "typedoc": "^0.22.10",
-    "typedoc-plugin-extras": "^2.2.1",
-    "typescript": "^4.5.2"
+    "@types/sinon": "^10.0.11",
+    "@typescript-eslint/eslint-plugin": "^5.21.0",
+    "@typescript-eslint/parser": "^5.21.0",
+    "ava": "^4.2.0",
+    "dotenv": "^16.0.0",
+    "eslint": "^8.14.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",
+    "typedoc": "^0.22.15",
+    "typedoc-plugin-extras": "^2.2.3",
+    "typescript": "^4.6.3"
   },
   "dependencies": {
     "atlassian-jwt": "^2.0.2",
-    "axios": "^0.24.0",
+    "axios": "^0.27.0",
     "oauth": "^0.9.15",
-    "tslib": "^2.3.1"
+    "tslib": "^2.4.0"
   }
 }

package/src/api/analytics.ts

@@ -0,0 +1,44 @@
+import * as Models from './models';
+import * as Parameters from './parameters';
+import { Callback } from '../callback';
+import { Client } from '../clients';
+import { RequestConfig } from '../requestConfig';
+
+export class Analytics {
+  constructor(private client: Client) {}
+
+  /** Get the total number of views a piece of content has. */
+  async getViews<T = Models.GetViews>(parameters: Parameters.GetViews, callback: Callback<T>): Promise<void>;
+  /** Get the total number of views a piece of content has. */
+  async getViews<T = Models.GetViews>(parameters: Parameters.GetViews, callback?: never): Promise<T>;
+  async getViews<T = Models.GetViews>(parameters: Parameters.GetViews, callback?: Callback<T>): Promise<void | T> {
+    const config: RequestConfig = {
+      url: `/api/analytics/content/${parameters.contentId}/views`,
+      method: 'GET',
+      params: {
+        fromDate: parameters.fromDate,
+      },
+    };
+
+    return this.client.sendRequest(config, callback);
+  }
+
+  /** Get the total number of distinct viewers a piece of content has. */
+  async getViewers<T = Models.GetViewers>(parameters: Parameters.GetViewers, callback: Callback<T>): Promise<void>;
+  /** Get the total number of distinct viewers a piece of content has. */
+  async getViewers<T = Models.GetViewers>(parameters: Parameters.GetViewers, callback?: never): Promise<T>;
+  async getViewers<T = Models.GetViewers>(
+    parameters: Parameters.GetViewers,
+    callback?: Callback<T>,
+  ): Promise<void | T> {
+    const config: RequestConfig = {
+      url: `/api/analytics/content/${parameters.contentId}/viewers`,
+      method: 'GET',
+      params: {
+        fromDate: parameters.fromDate,
+      },
+    };
+
+    return this.client.sendRequest(config, callback);
+  }
+}

package/src/api/audit.ts

@@ -1,7 +1,7 @@
 import * as Models from './models';
 import * as Parameters from './parameters';
-import { Client } from '../clients';
 import { Callback } from '../callback';
+import { Client } from '../clients';
 import { RequestConfig } from '../requestConfig';
 
 export class Audit {
@@ -45,7 +45,7 @@ export class Audit {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getAuditRecords' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -87,7 +87,7 @@ export class Audit {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createAuditRecord' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -120,7 +120,7 @@ export class Audit {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'exportAuditRecords' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -143,7 +143,7 @@ export class Audit {
       method: 'GET',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getRetentionPeriod' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -177,7 +177,7 @@ export class Audit {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'setRetentionPeriod' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -224,6 +224,6 @@ export class Audit {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getAuditRecordsForTimePeriod' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/content.ts

@@ -1,7 +1,7 @@
 import * as Models from './models';
 import * as Parameters from './parameters';
-import { Client } from '../clients';
 import { Callback } from '../callback';
+import { Client } from '../clients';
 import { RequestConfig } from '../requestConfig';
 
 export class Content {
@@ -49,7 +49,7 @@ export class Content {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContent' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -99,7 +99,7 @@ export class Content {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createContent' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -113,7 +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 = unknown>(
+  async archivePages<T = Models.LongTask>(
     parameters: Parameters.ArchivePages,
     callback: Callback<T>
   ): Promise<void>;
@@ -128,8 +128,8 @@ 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 = unknown>(parameters: Parameters.ArchivePages, callback?: never): Promise<T>;
-  async archivePages<T = unknown>(parameters: Parameters.ArchivePages, callback?: Callback<T>): Promise<void | T> {
+  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> {
     const config: RequestConfig = {
       url: '/api/content/archive',
       method: 'POST',
@@ -138,7 +138,7 @@ export class Content {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'archivePages' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -185,7 +185,7 @@ export class Content {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'publishLegacyDraft' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -230,7 +230,7 @@ export class Content {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'publishSharedDraft' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -286,7 +286,7 @@ export class Content {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'searchContentByCQL' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -323,7 +323,7 @@ export class Content {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentById' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -365,7 +365,7 @@ export class Content {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'updateContent' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -377,7 +377,7 @@ export class Content {
    * - 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
-   * content is in, and permission to edit the content.
+   * content is in.
    */
   async deleteContent<T = void>(parameters: Parameters.DeleteContent, callback: Callback<T>): Promise<void>;
   /**
@@ -389,7 +389,7 @@ export class Content {
    * - 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
-   * content is in, and permission to edit the content.
+   * content is in.
    */
   async deleteContent<T = void>(parameters: Parameters.DeleteContent, callback?: never): Promise<T>;
   async deleteContent<T = void>(parameters: Parameters.DeleteContent, callback?: Callback<T>): Promise<void | T> {
@@ -401,7 +401,7 @@ export class Content {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'deleteContent' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -434,6 +434,6 @@ export class Content {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getHistoryForContent' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/contentAttachments.ts

@@ -1,7 +1,7 @@
 import * as Models from './models';
 import * as Parameters from './parameters';
-import { Client } from '../clients';
 import { Callback } from '../callback';
+import { Client } from '../clients';
 import { RequestConfig } from '../requestConfig';
 
 export class ContentAttachments {
@@ -44,7 +44,7 @@ export class ContentAttachments {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getAttachments' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -136,7 +136,7 @@ export class ContentAttachments {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createAttachments' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -230,7 +230,7 @@ export class ContentAttachments {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createOrUpdateAttachments' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -263,7 +263,7 @@ export class ContentAttachments {
       data: parameters.body,
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'updateAttachmentProperties' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -358,7 +358,7 @@ export class ContentAttachments {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'updateAttachmentData' });
+    return this.client.sendRequest(config, callback);
   }
 
   /** Redirects the client to a URL that serves an attachment's binary data. */
@@ -381,6 +381,6 @@ export class ContentAttachments {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'downloadAttachment' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/contentBody.ts

@@ -1,7 +1,7 @@
 import * as Models from './models';
 import * as Parameters from './parameters';
-import { Client } from '../clients';
 import { Callback } from '../callback';
+import { Client } from '../clients';
 import { RequestConfig } from '../requestConfig';
 
 export class ContentBody {
@@ -61,6 +61,6 @@ export class ContentBody {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'convertContentBody' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/contentChildrenAndDescendants.ts

@@ -1,7 +1,7 @@
 import * as Models from './models';
 import * as Parameters from './parameters';
-import { Client } from '../clients';
 import { Callback } from '../callback';
+import { Client } from '../clients';
 import { RequestConfig } from '../requestConfig';
 
 export class ContentChildrenAndDescendants {
@@ -64,7 +64,7 @@ export class ContentChildrenAndDescendants {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentChildren' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -97,7 +97,7 @@ export class ContentChildrenAndDescendants {
       method: 'PUT',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'movePage' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -156,7 +156,7 @@ export class ContentChildrenAndDescendants {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentChildrenByType' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -215,7 +215,7 @@ export class ContentChildrenAndDescendants {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentDescendants' });
+    return this.client.sendRequest(config, callback);
   }
 
   /** @deprecated This API will be removed in the next major version. Use `getDescendantsOfType` method instead. */
@@ -292,7 +292,7 @@ export class ContentChildrenAndDescendants {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'descendantsOfType' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -302,7 +302,10 @@ export class ContentChildrenAndDescendants {
    * of renaming page titles during the copy; for example, search and replace can be used in conjunction to rewrite the
    * copied page titles.
    */
-  async copyPageHierarchy<T = unknown>(parameters: Parameters.CopyPageHierarchy, callback: Callback<T>): Promise<void>;
+  async copyPageHierarchy<T = Models.LongTask>(
+    parameters: Parameters.CopyPageHierarchy,
+    callback: Callback<T>
+  ): Promise<void>;
   /**
    * Copy page hierarchy allows the copying of an entire hierarchy of pages and their associated properties, permissions
    * and attachments. The id path parameter refers to the content id of the page to copy, and the new parent of this
@@ -310,8 +313,8 @@ export class ContentChildrenAndDescendants {
    * of renaming page titles during the copy; for example, search and replace can be used in conjunction to rewrite the
    * copied page titles.
    */
-  async copyPageHierarchy<T = unknown>(parameters: Parameters.CopyPageHierarchy, callback?: never): Promise<T>;
-  async copyPageHierarchy<T = unknown>(
+  async copyPageHierarchy<T = Models.LongTask>(parameters: Parameters.CopyPageHierarchy, callback?: never): Promise<T>;
+  async copyPageHierarchy<T = Models.LongTask>(
     parameters: Parameters.CopyPageHierarchy,
     callback?: Callback<T>,
   ): Promise<void | T> {
@@ -324,12 +327,13 @@ export class ContentChildrenAndDescendants {
         copyProperties: parameters.copyProperties,
         copyLabels: parameters.copyLabels,
         copyCustomContents: parameters.copyCustomContents,
+        copyDescendants: parameters.copyDescendants,
         destinationPageId: parameters.destinationPageId,
         titleOptions: parameters.titleOptions,
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'copyPageHierarchy' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -372,6 +376,6 @@ export class ContentChildrenAndDescendants {
       data: parameters.bodyParameters,
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'copyPage' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/contentComments.ts

@@ -1,7 +1,7 @@
 import * as Models from './models';
 import * as Parameters from './parameters';
-import { Client } from '../clients';
 import { Callback } from '../callback';
+import { Client } from '../clients';
 import { RequestConfig } from '../requestConfig';
 
 export class ContentComments {
@@ -43,6 +43,6 @@ export class ContentComments {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentComments' });
+    return this.client.sendRequest(config, callback);
   }
 }