confluence.js 1.3.0 → 1.3.1

package/out/api/themes.js

@@ -16,7 +16,7 @@ class Themes {
                     limit: parameters === null || parameters === void 0 ? void 0 : parameters.limit,
                 },
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getThemes' });
+            return this.client.sendRequest(config, callback);
         });
     }
     getGlobalTheme(callback) {
@@ -25,7 +25,7 @@ class Themes {
                 url: '/api/settings/theme/selected',
                 method: 'GET',
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getGlobalTheme' });
+            return this.client.sendRequest(config, callback);
         });
     }
     getTheme(parameters, callback) {
@@ -34,7 +34,7 @@ class Themes {
                 url: `/api/settings/theme/${parameters.themeKey}`,
                 method: 'GET',
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getTheme' });
+            return this.client.sendRequest(config, callback);
         });
     }
     getSpaceTheme(parameters, callback) {
@@ -43,7 +43,7 @@ class Themes {
                 url: `/api/space/${parameters.spaceKey}/theme`,
                 method: 'GET',
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getSpaceTheme' });
+            return this.client.sendRequest(config, callback);
         });
     }
     setSpaceTheme(parameters, callback) {
@@ -55,7 +55,7 @@ class Themes {
                     themeKey: parameters.themeKey,
                 },
             };
-            return this.client.sendRequest(config, callback, { methodName: 'setSpaceTheme' });
+            return this.client.sendRequest(config, callback);
         });
     }
     resetSpaceTheme(parameters, callback) {
@@ -64,7 +64,7 @@ class Themes {
                 url: `/api/space/${parameters.spaceKey}/theme`,
                 method: 'DELETE',
             };
-            return this.client.sendRequest(config, callback, { methodName: 'resetSpaceTheme' });
+            return this.client.sendRequest(config, callback);
         });
     }
 }

package/out/api/users.js

@@ -18,7 +18,7 @@ class Users {
                     expand: parameters.expand,
                 },
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getUser' });
+            return this.client.sendRequest(config, callback);
         });
     }
     getAnonymousUser(parameters, callback) {
@@ -30,7 +30,7 @@ class Users {
                     expand: parameters === null || parameters === void 0 ? void 0 : parameters.expand,
                 },
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getAnonymousUser' });
+            return this.client.sendRequest(config, callback);
         });
     }
     getCurrentUser(parameters, callback) {
@@ -42,7 +42,7 @@ class Users {
                     expand: parameters === null || parameters === void 0 ? void 0 : parameters.expand,
                 },
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getCurrentUser' });
+            return this.client.sendRequest(config, callback);
         });
     }
     getGroupMembershipsForUser(parameters, callback) {
@@ -58,7 +58,7 @@ class Users {
                     limit: parameters.limit,
                 },
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getGroupMembershipsForUser' });
+            return this.client.sendRequest(config, callback);
         });
     }
     getBulkUserLookup(parameters, callback) {
@@ -72,7 +72,7 @@ class Users {
                     limit: parameters.limit,
                 },
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getBulkUserLookup' });
+            return this.client.sendRequest(config, callback);
         });
     }
     getPrivacyUnsafeUserEmail(parameters, callback) {
@@ -84,7 +84,7 @@ class Users {
                     accountId: parameters.accountId,
                 },
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getPrivacyUnsafeUserEmail' });
+            return this.client.sendRequest(config, callback);
         });
     }
     getPrivacyUnsafeUserEmailBulk(parameters, callback) {
@@ -96,7 +96,7 @@ class Users {
                     accountId: parameters.accountId,
                 },
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getPrivacyUnsafeUserEmailBulk' });
+            return this.client.sendRequest(config, callback);
         });
     }
     getBulkUserMigration(parameters, callback) {
@@ -111,7 +111,7 @@ class Users {
                     limit: parameters.limit,
                 },
             };
-            return this.client.sendRequest(config, callback, { methodName: 'getBulkUserMigration' });
+            return this.client.sendRequest(config, callback);
         });
     }
 }

package/out/clients/baseClient.js

@@ -17,7 +17,7 @@ class BaseClient {
         const parts = [];
         Object.entries(parameters).forEach(([key, value]) => {
             if (value === null || typeof value === 'undefined') {
-                return undefined;
+                return;
             }
             if (Array.isArray(value)) {
                 // eslint-disable-next-line no-param-reassign
@@ -31,8 +31,12 @@ class BaseClient {
                 // eslint-disable-next-line no-param-reassign
                 value = JSON.stringify(value);
             }
+            else if (value instanceof Function) {
+                const part = value();
+                return part && parts.push(part);
+            }
             parts.push(`${this.encode(key)}=${this.encode(value)}`);
-            return undefined;
+            return;
         });
         return parts.join('&');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "confluence.js",
-  "version": "1.3.0",
+  "version": "1.3.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",
@@ -45,14 +45,14 @@
     "eslint-config-airbnb-typescript": "^16.1.0",
     "eslint-import-resolver-typescript": "^2.5.0",
     "eslint-plugin-import": "^2.25.3",
-    "jest": "^27.4.3",
+    "jest": "^27.4.4",
     "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"
+    "typescript": "^4.5.3"
   },
   "dependencies": {
     "atlassian-jwt": "^2.0.2",

package/src/api/audit.ts

@@ -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

@@ -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);
   }
 
   /**
@@ -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);
   }
 
   /**
@@ -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

@@ -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

@@ -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

@@ -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);
   }
 
   /**
@@ -329,7 +329,7 @@ export class ContentChildrenAndDescendants {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'copyPageHierarchy' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -372,6 +372,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

@@ -43,6 +43,6 @@ export class ContentComments {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentComments' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/contentLabels.ts

@@ -41,7 +41,7 @@ export class ContentLabels {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getLabelsForContent' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -87,7 +87,7 @@ export class ContentLabels {
       data: parameters.body,
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addLabelsToContent' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -128,7 +128,7 @@ export class ContentLabels {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeLabelFromContentUsingQueryParameter' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -165,6 +165,6 @@ export class ContentLabels {
       method: 'DELETE',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeLabelFromContent' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/contentMacroBody.ts

@@ -54,6 +54,6 @@ export class ContentMacroBody {
       method: 'GET',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getMacroBodyByMacroId' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/contentPermissions.ts

@@ -73,6 +73,6 @@ export class ContentPermissions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'checkContentPermission' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/contentProperties.ts

@@ -44,7 +44,7 @@ export class ContentProperties {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentProperties' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -92,7 +92,7 @@ export class ContentProperties {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createContentProperty' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -130,7 +130,7 @@ export class ContentProperties {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentProperty' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -177,7 +177,7 @@ export class ContentProperties {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'createContentPropertyForKey' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -215,7 +215,7 @@ export class ContentProperties {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'updateContentProperty' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -244,6 +244,6 @@ export class ContentProperties {
       method: 'DELETE',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'deleteContentProperty' });
+    return this.client.sendRequest(config, callback);
   }
 }

package/src/api/contentRestrictions.ts

@@ -39,7 +39,7 @@ export class ContentRestrictions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getRestrictions' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -73,7 +73,7 @@ export class ContentRestrictions {
       data: parameters.body,
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addRestrictions' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -109,7 +109,7 @@ export class ContentRestrictions {
       data: parameters.body,
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'updateRestrictions' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -142,7 +142,7 @@ export class ContentRestrictions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'deleteRestrictions' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -179,7 +179,7 @@ export class ContentRestrictions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getRestrictionsByOperation' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -214,7 +214,7 @@ export class ContentRestrictions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getRestrictionsForOperation' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -258,7 +258,7 @@ export class ContentRestrictions {
       method: 'GET',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentRestrictionStatusForGroup' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -288,7 +288,7 @@ export class ContentRestrictions {
       method: 'PUT',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addGroupToContentRestriction' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -312,7 +312,7 @@ export class ContentRestrictions {
       method: 'DELETE',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeGroupByName' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -356,7 +356,7 @@ export class ContentRestrictions {
       method: 'GET',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getIndividualGroupRestrictionStatusByGroupId' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -388,7 +388,7 @@ export class ContentRestrictions {
       method: 'PUT',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addGroupToContentRestrictionByGroupId' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -412,7 +412,7 @@ export class ContentRestrictions {
       method: 'DELETE',
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeGroupById' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -463,7 +463,7 @@ export class ContentRestrictions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'getContentRestrictionStatusForUser' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -498,7 +498,7 @@ export class ContentRestrictions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'addUserToContentRestriction' });
+    return this.client.sendRequest(config, callback);
   }
 
   /**
@@ -533,6 +533,6 @@ export class ContentRestrictions {
       },
     };
 
-    return this.client.sendRequest(config, callback, { methodName: 'removeUserFromContentRestriction' });
+    return this.client.sendRequest(config, callback);
   }
 }