confluence.js 1.2.2 → 1.4.0

package/out/server/parameters/index.js

@@ -1,67 +1,67 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./addContentWatcher"), exports);
-(0, tslib_1.__exportStar)(require("./addLabelsToContent"), exports);
-(0, tslib_1.__exportStar)(require("./addSpaceWatch"), exports);
-(0, tslib_1.__exportStar)(require("./convertContentBody"), exports);
-(0, tslib_1.__exportStar)(require("./createAttachments"), exports);
-(0, tslib_1.__exportStar)(require("./createAuditRecord"), exports);
-(0, tslib_1.__exportStar)(require("./createContent"), exports);
-(0, tslib_1.__exportStar)(require("./createContentProperty"), exports);
-(0, tslib_1.__exportStar)(require("./createContentPropertyForKey"), exports);
-(0, tslib_1.__exportStar)(require("./createPrivateSpace"), exports);
-(0, tslib_1.__exportStar)(require("./createSpace"), exports);
-(0, tslib_1.__exportStar)(require("./createSpaceProperty"), exports);
-(0, tslib_1.__exportStar)(require("./createSpacePropertyForKey"), exports);
-(0, tslib_1.__exportStar)(require("./deleteContent"), exports);
-(0, tslib_1.__exportStar)(require("./deleteContentProperty"), exports);
-(0, tslib_1.__exportStar)(require("./deleteLabel"), exports);
-(0, tslib_1.__exportStar)(require("./deleteLabelWithQueryParam"), exports);
-(0, tslib_1.__exportStar)(require("./deleteSpace"), exports);
-(0, tslib_1.__exportStar)(require("./deleteSpaceProperty"), exports);
-(0, tslib_1.__exportStar)(require("./exportAuditRecords"), exports);
-(0, tslib_1.__exportStar)(require("./getAttachments"), exports);
-(0, tslib_1.__exportStar)(require("./getAuditRecords"), exports);
-(0, tslib_1.__exportStar)(require("./getAuditRecordsSince"), exports);
-(0, tslib_1.__exportStar)(require("./getContent"), exports);
-(0, tslib_1.__exportStar)(require("./getContentById"), exports);
-(0, tslib_1.__exportStar)(require("./getContentByType"), exports);
-(0, tslib_1.__exportStar)(require("./getContentChildren"), exports);
-(0, tslib_1.__exportStar)(require("./getContentChildrenByType"), exports);
-(0, tslib_1.__exportStar)(require("./getContentComments"), exports);
-(0, tslib_1.__exportStar)(require("./getContentDescendants"), exports);
-(0, tslib_1.__exportStar)(require("./getContentDescendantsOfType"), exports);
-(0, tslib_1.__exportStar)(require("./getContentForSpace"), exports);
-(0, tslib_1.__exportStar)(require("./getContentLabels"), exports);
-(0, tslib_1.__exportStar)(require("./getContentProperties"), exports);
-(0, tslib_1.__exportStar)(require("./getContentProperty"), exports);
-(0, tslib_1.__exportStar)(require("./getContentWatchStatus"), exports);
-(0, tslib_1.__exportStar)(require("./getCurrentUser"), exports);
-(0, tslib_1.__exportStar)(require("./getGroup"), exports);
-(0, tslib_1.__exportStar)(require("./getGroups"), exports);
-(0, tslib_1.__exportStar)(require("./getHistory"), exports);
-(0, tslib_1.__exportStar)(require("./getMacroBodyByHash"), exports);
-(0, tslib_1.__exportStar)(require("./getMacroBodyByMacroId"), exports);
-(0, tslib_1.__exportStar)(require("./getMembers"), exports);
-(0, tslib_1.__exportStar)(require("./getRestrictionsByOperation"), exports);
-(0, tslib_1.__exportStar)(require("./getRestrictionsForOperation"), exports);
-(0, tslib_1.__exportStar)(require("./getSpace"), exports);
-(0, tslib_1.__exportStar)(require("./getSpaceProperties"), exports);
-(0, tslib_1.__exportStar)(require("./getSpaceProperty"), exports);
-(0, tslib_1.__exportStar)(require("./getSpaces"), exports);
-(0, tslib_1.__exportStar)(require("./getTask"), exports);
-(0, tslib_1.__exportStar)(require("./getTasks"), exports);
-(0, tslib_1.__exportStar)(require("./getUser"), exports);
-(0, tslib_1.__exportStar)(require("./isWatchingSpace"), exports);
-(0, tslib_1.__exportStar)(require("./publishLegacyDraft"), exports);
-(0, tslib_1.__exportStar)(require("./publishSharedDraft"), exports);
-(0, tslib_1.__exportStar)(require("./removeContentWatcher"), exports);
-(0, tslib_1.__exportStar)(require("./removeSpaceWatch"), exports);
-(0, tslib_1.__exportStar)(require("./searchContent"), exports);
-(0, tslib_1.__exportStar)(require("./updateAttachmentData"), exports);
-(0, tslib_1.__exportStar)(require("./updateAttachmentProperties"), exports);
-(0, tslib_1.__exportStar)(require("./updateContent"), exports);
-(0, tslib_1.__exportStar)(require("./updateContentProperty"), exports);
-(0, tslib_1.__exportStar)(require("./updateSpace"), exports);
-(0, tslib_1.__exportStar)(require("./updateSpaceProperty"), exports);
+tslib_1.__exportStar(require("./addContentWatcher"), exports);
+tslib_1.__exportStar(require("./addLabelsToContent"), exports);
+tslib_1.__exportStar(require("./addSpaceWatch"), exports);
+tslib_1.__exportStar(require("./convertContentBody"), exports);
+tslib_1.__exportStar(require("./createAttachments"), exports);
+tslib_1.__exportStar(require("./createAuditRecord"), exports);
+tslib_1.__exportStar(require("./createContent"), exports);
+tslib_1.__exportStar(require("./createContentProperty"), exports);
+tslib_1.__exportStar(require("./createContentPropertyForKey"), exports);
+tslib_1.__exportStar(require("./createPrivateSpace"), exports);
+tslib_1.__exportStar(require("./createSpace"), exports);
+tslib_1.__exportStar(require("./createSpaceProperty"), exports);
+tslib_1.__exportStar(require("./createSpacePropertyForKey"), exports);
+tslib_1.__exportStar(require("./deleteContent"), exports);
+tslib_1.__exportStar(require("./deleteContentProperty"), exports);
+tslib_1.__exportStar(require("./deleteLabel"), exports);
+tslib_1.__exportStar(require("./deleteLabelWithQueryParam"), exports);
+tslib_1.__exportStar(require("./deleteSpace"), exports);
+tslib_1.__exportStar(require("./deleteSpaceProperty"), exports);
+tslib_1.__exportStar(require("./exportAuditRecords"), exports);
+tslib_1.__exportStar(require("./getAttachments"), exports);
+tslib_1.__exportStar(require("./getAuditRecords"), exports);
+tslib_1.__exportStar(require("./getAuditRecordsSince"), exports);
+tslib_1.__exportStar(require("./getContent"), exports);
+tslib_1.__exportStar(require("./getContentById"), exports);
+tslib_1.__exportStar(require("./getContentByType"), exports);
+tslib_1.__exportStar(require("./getContentChildren"), exports);
+tslib_1.__exportStar(require("./getContentChildrenByType"), exports);
+tslib_1.__exportStar(require("./getContentComments"), exports);
+tslib_1.__exportStar(require("./getContentDescendants"), exports);
+tslib_1.__exportStar(require("./getContentDescendantsOfType"), exports);
+tslib_1.__exportStar(require("./getContentForSpace"), exports);
+tslib_1.__exportStar(require("./getContentLabels"), exports);
+tslib_1.__exportStar(require("./getContentProperties"), exports);
+tslib_1.__exportStar(require("./getContentProperty"), exports);
+tslib_1.__exportStar(require("./getContentWatchStatus"), exports);
+tslib_1.__exportStar(require("./getCurrentUser"), exports);
+tslib_1.__exportStar(require("./getGroup"), exports);
+tslib_1.__exportStar(require("./getGroups"), exports);
+tslib_1.__exportStar(require("./getHistory"), exports);
+tslib_1.__exportStar(require("./getMacroBodyByHash"), exports);
+tslib_1.__exportStar(require("./getMacroBodyByMacroId"), exports);
+tslib_1.__exportStar(require("./getMembers"), exports);
+tslib_1.__exportStar(require("./getRestrictionsByOperation"), exports);
+tslib_1.__exportStar(require("./getRestrictionsForOperation"), exports);
+tslib_1.__exportStar(require("./getSpace"), exports);
+tslib_1.__exportStar(require("./getSpaceProperties"), exports);
+tslib_1.__exportStar(require("./getSpaceProperty"), exports);
+tslib_1.__exportStar(require("./getSpaces"), exports);
+tslib_1.__exportStar(require("./getTask"), exports);
+tslib_1.__exportStar(require("./getTasks"), exports);
+tslib_1.__exportStar(require("./getUser"), exports);
+tslib_1.__exportStar(require("./isWatchingSpace"), exports);
+tslib_1.__exportStar(require("./publishLegacyDraft"), exports);
+tslib_1.__exportStar(require("./publishSharedDraft"), exports);
+tslib_1.__exportStar(require("./removeContentWatcher"), exports);
+tslib_1.__exportStar(require("./removeSpaceWatch"), exports);
+tslib_1.__exportStar(require("./searchContent"), exports);
+tslib_1.__exportStar(require("./updateAttachmentData"), exports);
+tslib_1.__exportStar(require("./updateAttachmentProperties"), exports);
+tslib_1.__exportStar(require("./updateContent"), exports);
+tslib_1.__exportStar(require("./updateContentProperty"), exports);
+tslib_1.__exportStar(require("./updateSpace"), exports);
+tslib_1.__exportStar(require("./updateSpaceProperty"), exports);

package/out/server/search.d.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 { Pagination } from '../pagination';
 export declare class Search {
     private client;

package/out/server/search.js

@@ -7,7 +7,7 @@ class Search {
         this.client = client;
     }
     search(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: '/rest/api/search',
                 method: 'GET',

package/out/server/space.d.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 { Pagination } from '../pagination';
 export declare class Space {
     private client;

package/out/server/space.js

@@ -7,7 +7,7 @@ class Space {
         this.client = client;
     }
     getSpaces(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: '/rest/api/space',
                 method: 'GET',
@@ -26,7 +26,7 @@ class Space {
         });
     }
     createSpace(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: '/rest/api/space',
                 method: 'POST',
@@ -41,7 +41,7 @@ class Space {
         });
     }
     createPrivateSpace(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: '/rest/api/space/_private',
                 method: 'POST',
@@ -55,7 +55,7 @@ class Space {
         });
     }
     getSpace(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/space/${parameters.spaceKey}`,
                 method: 'GET',
@@ -67,7 +67,7 @@ class Space {
         });
     }
     updateSpace(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/space/${parameters.spaceKey}`,
                 method: 'PUT',
@@ -81,7 +81,7 @@ class Space {
         });
     }
     deleteSpace(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/space/${parameters.spaceKey}`,
                 method: 'DELETE',
@@ -90,7 +90,7 @@ class Space {
         });
     }
     getContentForSpace(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/space/${parameters.spaceKey}/content`,
                 method: 'GET',
@@ -105,7 +105,7 @@ class Space {
         });
     }
     getContentByType(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/space/${parameters.spaceKey}/content/${parameters.type}`,
                 method: 'GET',
@@ -120,7 +120,7 @@ class Space {
         });
     }
     getSpaceProperties(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/space/${parameters.spaceKey}/property`,
                 method: 'GET',
@@ -134,7 +134,7 @@ class Space {
         });
     }
     createSpaceProperty(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/space/${parameters.spaceKey}/property`,
                 method: 'POST',
@@ -147,7 +147,7 @@ class Space {
         });
     }
     getSpaceProperty(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/space/${parameters.spaceKey}/property/${parameters.key}`,
                 method: 'GET',
@@ -159,7 +159,7 @@ class Space {
         });
     }
     createSpacePropertyForKey(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/space/${parameters.spaceKey}/property/${parameters.key}`,
                 method: 'POST',
@@ -171,7 +171,7 @@ class Space {
         });
     }
     updateSpaceProperty(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/space/${parameters.spaceKey}/property/${parameters.key}`,
                 method: 'PUT',
@@ -180,7 +180,7 @@ class Space {
         });
     }
     deleteSpaceProperty(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/space/${parameters.spaceKey}/property/${parameters.key}`,
                 method: 'DELETE',

package/out/server/user.d.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 { Pagination } from '../pagination';
 export declare class User {
     private client;

package/out/server/user.js

@@ -7,7 +7,7 @@ class User {
         this.client = client;
     }
     getUser(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: '/rest/api/user',
                 method: 'GET',
@@ -21,7 +21,7 @@ class User {
         });
     }
     getAnonymousUser(callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: '/rest/api/user/anonymous',
                 method: 'GET',
@@ -30,7 +30,7 @@ class User {
         });
     }
     getCurrentUser(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: '/rest/api/user/current',
                 method: 'GET',
@@ -42,7 +42,7 @@ class User {
         });
     }
     getGroupMembershipsForUser(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: '/rest/api/user/memberof',
                 method: 'GET',
@@ -58,7 +58,7 @@ class User {
         });
     }
     getContentWatchStatus(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/user/watch/content/${parameters.contentId}`,
                 method: 'GET',
@@ -71,7 +71,7 @@ class User {
         });
     }
     addContentWatcher(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/user/watch/content/${parameters.contentId}`,
                 method: 'POST',
@@ -84,7 +84,7 @@ class User {
         });
     }
     removeContentWatcher(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/user/watch/content/${parameters.contentId}`,
                 method: 'DELETE',
@@ -97,7 +97,7 @@ class User {
         });
     }
     isWatchingSpace(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/user/watch/space/${parameters.spaceKey}`,
                 method: 'GET',
@@ -110,7 +110,7 @@ class User {
         });
     }
     addSpaceWatch(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/user/watch/space/${parameters.spaceKey}`,
                 method: 'POST',
@@ -123,7 +123,7 @@ class User {
         });
     }
     removeSpaceWatch(parameters, callback) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const config = {
                 url: `/rest/api/user/watch/space/${parameters.spaceKey}`,
                 method: 'DELETE',

package/out/services/authenticationService/authenticationService.js

@@ -6,7 +6,7 @@ const authentications_1 = require("./authentications");
 var AuthenticationService;
 (function (AuthenticationService) {
     function getAuthenticationToken(authentication, requestData) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!authentication) {
                 return undefined;
             }
@@ -19,6 +19,9 @@ var AuthenticationService;
             if (authentication.jwt) {
                 return (0, authentications_1.createJWTAuthentication)(authentication.jwt, requestData);
             }
+            if (authentication.personalAccessToken) {
+                return (0, authentications_1.createPATAuthenticationToken)(authentication.personalAccessToken);
+            }
             return undefined;
         });
     }

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

@@ -0,0 +1,2 @@
+import { Config } from '../../../config';
+export declare function createPATAuthenticationToken(authenticationData: Config.Authentication.PersonalAccessToken): Promise<string>;

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

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPATAuthenticationToken = void 0;
+const tslib_1 = require("tslib");
+function createPATAuthenticationToken(authenticationData) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return `Bearer ${authenticationData}`;
+    });
+}
+exports.createPATAuthenticationToken = createPATAuthenticationToken;

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,7 @@
 "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);

package/out/services/authenticationService/index.js

@@ -1,4 +1,4 @@
 "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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "confluence.js",
-  "version": "1.2.2",
+  "version": "1.4.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",
@@ -12,16 +12,21 @@
     "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",
-    "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 --timeout=2m 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": [
+      "ts-node/register",
+      "dotenv/config"
+    ]
   },
   "keywords": [
     "confluence",
@@ -34,31 +39,29 @@
   ],
   "devDependencies": {
     "@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.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
-    "dotenv": "^10.0.0",
-    "eslint": "^8.2.0",
-    "eslint-config-airbnb": "^19.0.0",
-    "eslint-config-airbnb-typescript": "^16.0.0",
-    "eslint-import-resolver-typescript": "^2.5.0",
-    "eslint-plugin-import": "^2.25.3",
-    "jest": "^27.3.1",
-    "prettier": "^2.4.1",
-    "prettier-plugin-jsdoc": "^0.3.30",
-    "sinon": "^12.0.1",
-    "ts-jest": "^27.0.7",
-    "typedoc": "^0.22.9",
-    "typedoc-plugin-extras": "^2.2.1",
-    "typescript": "^4.5.2"
+    "@types/sinon": "^10.0.11",
+    "@typescript-eslint/eslint-plugin": "^5.17.0",
+    "@typescript-eslint/parser": "^5.17.0",
+    "ava": "^4.1.0",
+    "dotenv": "^16.0.0",
+    "eslint": "^8.12.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-typescript": "^16.2.0",
+    "eslint-import-resolver-typescript": "^2.7.0",
+    "eslint-plugin-import": "^2.25.4",
+    "prettier": "^2.6.1",
+    "prettier-plugin-jsdoc": "^0.3.36",
+    "sinon": "^13.0.1",
+    "ts-node": "^10.7.0",
+    "typedoc": "^0.22.13",
+    "typedoc-plugin-extras": "^2.2.3",
+    "typescript": "^4.6.3"
   },
   "dependencies": {
     "atlassian-jwt": "^2.0.2",
-    "axios": "^0.24.0",
+    "axios": "^0.26.1",
     "oauth": "^0.9.15",
-    "telemetry.confluence.js": "<2",
     "tslib": "^2.3.1"
   }
 }

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);
   }
 }