confluence.js 2.0.0 → 2.2.0-dev20260318121920

package/dist/esm/types/config.d.ts

@@ -15,24 +15,8 @@ export declare const BasicSchema: z.ZodObject<{
          * @see {@link https://support.atlassian.com/atlassian-account/docs/manage-api-tokens-for-your-atlassian-account/} for how to create API tokens
          */
         apiToken: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        email: string;
-        apiToken: string;
-    }, {
-        email: string;
-        apiToken: string;
-    }>;
-}, "strict", z.ZodTypeAny, {
-    basic: {
-        email: string;
-        apiToken: string;
-    };
-}, {
-    basic: {
-        email: string;
-        apiToken: string;
-    };
-}>;
+    }, z.core.$strict>;
+}, z.core.$strict>;
 /** JWT authentication configuration */
 export declare const JWTSchema: z.ZodObject<{
     jwt: z.ZodObject<{
@@ -42,49 +26,17 @@ export declare const JWTSchema: z.ZodObject<{
         secret: z.ZodString;
         /** Token expiry time (default: 180) */
         expiryTimeSeconds: z.ZodOptional<z.ZodNumber>;
-    }, "strict", z.ZodTypeAny, {
-        issuer: string;
-        secret: string;
-        expiryTimeSeconds?: number | undefined;
-    }, {
-        issuer: string;
-        secret: string;
-        expiryTimeSeconds?: number | undefined;
-    }>;
-}, "strict", z.ZodTypeAny, {
-    jwt: {
-        issuer: string;
-        secret: string;
-        expiryTimeSeconds?: number | undefined;
-    };
-}, {
-    jwt: {
-        issuer: string;
-        secret: string;
-        expiryTimeSeconds?: number | undefined;
-    };
-}>;
+    }, z.core.$strict>;
+}, z.core.$strict>;
 /** OAuth2 authentication configuration */
 export declare const OAuth2Schema: z.ZodObject<{
     oauth2: z.ZodObject<{
         /** OAuth2 access token */
         accessToken: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        accessToken: string;
-    }, {
-        accessToken: string;
-    }>;
-}, "strict", z.ZodTypeAny, {
-    oauth2: {
-        accessToken: string;
-    };
-}, {
-    oauth2: {
-        accessToken: string;
-    };
-}>;
+    }, z.core.$strict>;
+}, z.core.$strict>;
 /** Authentication configuration schema */
-export declare const AuthenticationSchema: z.ZodUnion<[z.ZodObject<{
+export declare const AuthenticationSchema: z.ZodUnion<readonly [z.ZodObject<{
     basic: z.ZodObject<{
         /** User's email associated with Atlassian account */
         email: z.ZodString;
@@ -94,24 +46,8 @@ export declare const AuthenticationSchema: z.ZodUnion<[z.ZodObject<{
          * @see {@link https://support.atlassian.com/atlassian-account/docs/manage-api-tokens-for-your-atlassian-account/} for how to create API tokens
          */
         apiToken: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        email: string;
-        apiToken: string;
-    }, {
-        email: string;
-        apiToken: string;
-    }>;
-}, "strict", z.ZodTypeAny, {
-    basic: {
-        email: string;
-        apiToken: string;
-    };
-}, {
-    basic: {
-        email: string;
-        apiToken: string;
-    };
-}>, z.ZodObject<{
+    }, z.core.$strict>;
+}, z.core.$strict>, z.ZodObject<{
     jwt: z.ZodObject<{
         /** The key from the app descriptor */
         issuer: z.ZodString;
@@ -119,64 +55,24 @@ export declare const AuthenticationSchema: z.ZodUnion<[z.ZodObject<{
         secret: z.ZodString;
         /** Token expiry time (default: 180) */
         expiryTimeSeconds: z.ZodOptional<z.ZodNumber>;
-    }, "strict", z.ZodTypeAny, {
-        issuer: string;
-        secret: string;
-        expiryTimeSeconds?: number | undefined;
-    }, {
-        issuer: string;
-        secret: string;
-        expiryTimeSeconds?: number | undefined;
-    }>;
-}, "strict", z.ZodTypeAny, {
-    jwt: {
-        issuer: string;
-        secret: string;
-        expiryTimeSeconds?: number | undefined;
-    };
-}, {
-    jwt: {
-        issuer: string;
-        secret: string;
-        expiryTimeSeconds?: number | undefined;
-    };
-}>, z.ZodObject<{
+    }, z.core.$strict>;
+}, z.core.$strict>, z.ZodObject<{
     oauth2: z.ZodObject<{
         /** OAuth2 access token */
         accessToken: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        accessToken: string;
-    }, {
-        accessToken: string;
-    }>;
-}, "strict", z.ZodTypeAny, {
-    oauth2: {
-        accessToken: string;
-    };
-}, {
-    oauth2: {
-        accessToken: string;
-    };
-}>]>;
+    }, z.core.$strict>;
+}, z.core.$strict>]>;
 /** Base request configuration */
 export declare const RequestConfigSchema: z.ZodAny;
 /** Middleware configuration schema */
 export declare const MiddlewaresSchema: z.ZodObject<{
-    /** Error handler middleware */
-    onError: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], z.ZodUnknown>, z.ZodVoid>>;
-    /** Response handler middleware */
-    onResponse: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], z.ZodUnknown>, z.ZodVoid>>;
-}, "strip", z.ZodTypeAny, {
-    onError?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-    onResponse?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-}, {
-    onError?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-    onResponse?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-}>;
+    onError: z.ZodOptional<z.ZodCustom<(input: unknown) => void, (input: unknown) => void>>;
+    onResponse: z.ZodOptional<z.ZodCustom<(input: unknown) => void, (input: unknown) => void>>;
+}, z.core.$strip>;
 export declare const ConfigSchema: z.ZodObject<{
-    host: z.ZodString;
+    host: z.ZodURL;
     baseRequestConfig: z.ZodOptional<z.ZodAny>;
-    authentication: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
+    authentication: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
         basic: z.ZodObject<{
             /** User's email associated with Atlassian account */
             email: z.ZodString;
@@ -186,24 +82,8 @@ export declare const ConfigSchema: z.ZodObject<{
              * @see {@link https://support.atlassian.com/atlassian-account/docs/manage-api-tokens-for-your-atlassian-account/} for how to create API tokens
              */
             apiToken: z.ZodString;
-        }, "strict", z.ZodTypeAny, {
-            email: string;
-            apiToken: string;
-        }, {
-            email: string;
-            apiToken: string;
-        }>;
-    }, "strict", z.ZodTypeAny, {
-        basic: {
-            email: string;
-            apiToken: string;
-        };
-    }, {
-        basic: {
-            email: string;
-            apiToken: string;
-        };
-    }>, z.ZodObject<{
+        }, z.core.$strict>;
+    }, z.core.$strict>, z.ZodObject<{
         jwt: z.ZodObject<{
             /** The key from the app descriptor */
             issuer: z.ZodString;
@@ -211,112 +91,21 @@ export declare const ConfigSchema: z.ZodObject<{
             secret: z.ZodString;
             /** Token expiry time (default: 180) */
             expiryTimeSeconds: z.ZodOptional<z.ZodNumber>;
-        }, "strict", z.ZodTypeAny, {
-            issuer: string;
-            secret: string;
-            expiryTimeSeconds?: number | undefined;
-        }, {
-            issuer: string;
-            secret: string;
-            expiryTimeSeconds?: number | undefined;
-        }>;
-    }, "strict", z.ZodTypeAny, {
-        jwt: {
-            issuer: string;
-            secret: string;
-            expiryTimeSeconds?: number | undefined;
-        };
-    }, {
-        jwt: {
-            issuer: string;
-            secret: string;
-            expiryTimeSeconds?: number | undefined;
-        };
-    }>, z.ZodObject<{
+        }, z.core.$strict>;
+    }, z.core.$strict>, z.ZodObject<{
         oauth2: z.ZodObject<{
             /** OAuth2 access token */
             accessToken: z.ZodString;
-        }, "strict", z.ZodTypeAny, {
-            accessToken: string;
-        }, {
-            accessToken: string;
-        }>;
-    }, "strict", z.ZodTypeAny, {
-        oauth2: {
-            accessToken: string;
-        };
-    }, {
-        oauth2: {
-            accessToken: string;
-        };
-    }>]>>;
+        }, z.core.$strict>;
+    }, z.core.$strict>]>>;
     middlewares: z.ZodOptional<z.ZodObject<{
-        /** Error handler middleware */
-        onError: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], z.ZodUnknown>, z.ZodVoid>>;
-        /** Response handler middleware */
-        onResponse: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], z.ZodUnknown>, z.ZodVoid>>;
-    }, "strip", z.ZodTypeAny, {
-        onError?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-        onResponse?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-    }, {
-        onError?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-        onResponse?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-    }>>;
-    /** Adds `'X-Atlassian-Token': 'no-check'` to each request header */
+        onError: z.ZodOptional<z.ZodCustom<(input: unknown) => void, (input: unknown) => void>>;
+        onResponse: z.ZodOptional<z.ZodCustom<(input: unknown) => void, (input: unknown) => void>>;
+    }, z.core.$strip>>;
     noCheckAtlassianToken: z.ZodOptional<z.ZodBoolean>;
-    /** Prefix for all API routes. */
+    suppressWarnings: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     apiPrefix: z.ZodOptional<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
-    host: string;
-    baseRequestConfig?: any;
-    authentication?: {
-        basic: {
-            email: string;
-            apiToken: string;
-        };
-    } | {
-        jwt: {
-            issuer: string;
-            secret: string;
-            expiryTimeSeconds?: number | undefined;
-        };
-    } | {
-        oauth2: {
-            accessToken: string;
-        };
-    } | undefined;
-    middlewares?: {
-        onError?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-        onResponse?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-    } | undefined;
-    noCheckAtlassianToken?: boolean | undefined;
-    apiPrefix?: string | undefined;
-}, {
-    host: string;
-    baseRequestConfig?: any;
-    authentication?: {
-        basic: {
-            email: string;
-            apiToken: string;
-        };
-    } | {
-        jwt: {
-            issuer: string;
-            secret: string;
-            expiryTimeSeconds?: number | undefined;
-        };
-    } | {
-        oauth2: {
-            accessToken: string;
-        };
-    } | undefined;
-    middlewares?: {
-        onError?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-        onResponse?: ((args_0: any, ...args: unknown[]) => void) | undefined;
-    } | undefined;
-    noCheckAtlassianToken?: boolean | undefined;
-    apiPrefix?: string | undefined;
-}>;
+}, z.core.$strip>;
 export type Config = z.infer<typeof ConfigSchema>;
 export type Authentication = z.infer<typeof AuthenticationSchema>;
 export type Basic = z.infer<typeof BasicSchema>;

package/eslint.config.ts

@@ -2,8 +2,7 @@ import js from '@eslint/js';
 import globals from 'globals';
 import tseslint from 'typescript-eslint';
 import { defineConfig } from 'eslint/config';
-import stylisticJs from '@stylistic/eslint-plugin-js';
-import stylisticTs from '@stylistic/eslint-plugin-ts';
+import stylistic from '@stylistic/eslint-plugin';
 
 export default defineConfig([
   { files: ['**/*.{js,mjs,cjs,ts}'], plugins: { js }, extends: ['js/recommended'] },
@@ -17,13 +16,12 @@ export default defineConfig([
       },
     },
     plugins: {
-      '@stylistic/js': stylisticJs,
-      '@stylistic/ts': stylisticTs,
+      '@stylistic': stylistic,
     },
     rules: {
-      '@stylistic/js/no-trailing-spaces': 'error',
-      '@stylistic/ts/indent': ['error', 2],
-      '@stylistic/ts/lines-between-class-members': [
+      '@stylistic/comma-dangle': ['error', 'always-multiline'],
+      '@stylistic/indent': ['error', 2],
+      '@stylistic/lines-between-class-members': [
         'error',
         'always',
         {
@@ -31,7 +29,9 @@ export default defineConfig([
           exceptAfterSingleLine: true,
         },
       ],
-      '@stylistic/ts/padding-line-between-statements': [
+      '@stylistic/no-trailing-spaces': 'error',
+      '@stylistic/object-curly-spacing': ['error', 'always'],
+      '@stylistic/padding-line-between-statements': [
         'error',
         // Return statements
         { blankLine: 'always', prev: '*', next: 'return' },
@@ -39,8 +39,8 @@ export default defineConfig([
         { blankLine: 'always', prev: 'import', next: '*' },
         { blankLine: 'any', prev: 'import', next: 'import' },
       ],
-      '@stylistic/ts/quotes': ['error', 'single'],
-      '@stylistic/ts/semi': ['error', 'always'],
+      '@stylistic/quotes': ['error', 'single'],
+      '@stylistic/semi': ['error', 'always'],
       '@typescript-eslint/consistent-type-imports': [
         'error',
         {
@@ -49,14 +49,9 @@ export default defineConfig([
         },
       ],
       '@typescript-eslint/no-empty-object-type': 'off',
-      '@typescript-eslint/no-redundant-type-constituents': 'off', // todo fix it
-      '@typescript-eslint/no-unnecessary-condition': 'error', // todo fix it
-      '@typescript-eslint/no-unsafe-argument': 'off', // todo fix it
-      '@typescript-eslint/no-unsafe-assignment': 'off', // todo fix it
-      '@typescript-eslint/no-unsafe-call': 'off', // todo fix it
+      '@typescript-eslint/no-unnecessary-condition': 'error',
       '@typescript-eslint/no-unsafe-member-access': 'off',
       '@typescript-eslint/prefer-optional-chain': 'error',
-      '@stylistic/ts/object-curly-spacing': ["error", "always"]
     },
   },
 ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "confluence.js",
-  "version": "2.0.0",
+  "version": "2.2.0-dev20260318121920",
   "description": "confluence.js is a powerful Node.JS/Browser module that allows you to interact with the Confluence API very easily",
   "author": "Vladislav Tupikin <vladislav.tupikin@icloud.com>",
   "license": "MIT",
@@ -16,13 +16,13 @@
   "exports": {
     ".": {
       "types": "./dist/esm/types/index.d.ts",
-      "import": "./dist/esm/index.mjs",
-      "require": "./dist/cjs/index.cjs"
+      "require": "./dist/cjs/index.cjs",
+      "import": "./dist/esm/index.mjs"
     },
     "./*": {
       "types": "./dist/esm/types/*.d.ts",
-      "import": "./dist/esm/*.mjs",
-      "require": "./dist/cjs/*.cjs"
+      "require": "./dist/cjs/*.cjs",
+      "import": "./dist/esm/*.mjs"
     },
     "./package.json": "./package.json"
   },
@@ -44,37 +44,36 @@
     "node": ">=20"
   },
   "dependencies": {
-    "atlassian-jwt": "^2.0.3",
-    "axios": "^1.9.0",
-    "form-data": "^4.0.2",
+    "@atlassian/atlassian-jwt": "^2.2.0",
+    "axios": "^1.13.6",
+    "form-data": "^4.0.5",
     "oauth": "^0.10.2",
-    "zod": "^3.24.4"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@eslint/js": "^9.26.0",
-    "@rollup/plugin-alias": "^5.1.1",
-    "@rollup/plugin-commonjs": "^28.0.3",
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "@rollup/plugin-typescript": "^12.1.2",
-    "@stylistic/eslint-plugin-js": "^4.2.0",
-    "@stylistic/eslint-plugin-ts": "^4.2.0",
-    "@types/express": "^4.17.21",
-    "@types/node": "^20.17.46",
+    "@eslint/js": "^10.0.1",
+    "@rollup/plugin-alias": "^6.0.0",
+    "@rollup/plugin-commonjs": "^29.0.2",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-typescript": "^12.3.0",
+    "@stylistic/eslint-plugin": "^5.10.0",
+    "@types/express": "^4.17.25",
+    "@types/node": "^20.19.37",
     "@types/oauth": "^0.9.6",
-    "dotenv": "^16.5.0",
-    "eslint": "^9.26.0",
-    "globals": "^16.1.0",
-    "jiti": "^2.4.2",
-    "prettier": "^3.5.3",
-    "prettier-plugin-jsdoc": "^1.3.2",
-    "rollup": "^4.40.2",
-    "rollup-plugin-esnext-to-nodenext": "^1.0.0",
-    "rollup-plugin-node-externals": "^8.0.0",
+    "dotenv": "^17.3.1",
+    "eslint": "^10.0.3",
+    "globals": "^17.4.0",
+    "jiti": "^2.6.1",
+    "prettier": "^3.8.1",
+    "prettier-plugin-jsdoc": "^1.8.0",
+    "rollup": "^4.59.0",
+    "rollup-plugin-esnext-to-nodenext": "^1.0.1",
+    "rollup-plugin-node-externals": "^8.1.2",
     "tslib": "^2.8.1",
-    "typedoc": "^0.28.4",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.1",
-    "vitest": "^3.1.3"
+    "typedoc": "^0.28.17",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.57.1",
+    "vitest": "^4.1.0"
   },
   "scripts": {
     "build": "rollup -c rollup.config.ts --configPlugin typescript",
@@ -83,8 +82,10 @@
     "doc": "typedoc --name \"Confluence.js - Cloud and Server API library\" --out docs ./src/index.ts --favicon https://bad37fb3-cb50-4e0b-9035-a3e09e8afb3b.selstorage.ru/confluence.js%2Ffavicon.svg",
     "lint": "eslint --ext .ts src tests",
     "lint:fix": "pnpm run lint --fix",
-    "test:unit": "vitest run tests/unit --minWorkers=1 --maxWorkers=8 --sequence.concurrent",
+    "test:unit": "vitest run tests/unit",
     "test:integration": "vitest run tests/integration --bail=1 --no-file-parallelism --max-concurrency 1 -c vitest.config.mts --hookTimeout 100000 --testTimeout 100000",
-    "code:formatting": "npm run prettier && npm run lint:fix"
+    "replace:wiki-rest": "grep -rl '/wiki/rest' src/api | xargs sed -i '' 's|/wiki/rest||g'",
+    "replace:all": "pnpm run replace:wiki-rest",
+    "code:formatting": "pnpm run replace:all && pnpm run prettier && pnpm run lint:fix"
   }
 }

package/rollup.config.ts

@@ -26,8 +26,8 @@ export default defineConfig([
       nodeExternals(),
       alias({
         entries: [
-          { find: '~', replacement: `${__dirname}/src` }
-        ]
+          { find: '~', replacement: `${__dirname}/src` },
+        ],
       }),
       resolve(),
       commonjs(),
@@ -38,8 +38,8 @@ export default defineConfig([
         declarationDir: 'dist/esm/types',
         tsconfig: './tsconfig.json',
       }),
-      esnextToNodeNext()
-    ]
+      esnextToNodeNext(),
+    ],
   },
   {
     input: 'src/index.ts',
@@ -56,8 +56,8 @@ export default defineConfig([
       nodeExternals(),
       alias({
         entries: [
-          { find: '~', replacement: `${__dirname}/src` }
-        ]
+          { find: '~', replacement: `${__dirname}/src` },
+        ],
       }),
       resolve(),
       commonjs(),
@@ -67,6 +67,6 @@ export default defineConfig([
         declaration: false,
         tsconfig: './tsconfig.json',
       }),
-    ]
-  }
+    ],
+  },
 ]);

package/src/api/analytics.ts

@@ -1,7 +1,7 @@
 import type * as Models from './models';
 import type * as Parameters from './parameters';
-import type { Callback } from '../callback';
 import type { Client } from '../clients';
+import type { Callback } from '../callback';
 import type { RequestConfig } from '../requestConfig';
 
 export class Analytics {

package/src/api/audit.ts

@@ -1,7 +1,7 @@
 import type * as Models from './models';
 import type * as Parameters from './parameters';
-import type { Callback } from '../callback';
 import type { Client } from '../clients';
+import type { Callback } from '../callback';
 import type { RequestConfig } from '../requestConfig';
 
 export class Audit {
@@ -155,7 +155,7 @@ export class Audit {
   }
 
   /**
-   * Sets the retention period for records in the audit log. The retention period can be set to a maximum of 20 years.
+   * Sets the retention period for records in the audit log. The retention period can be set to a maximum of 1 year.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
    * permission.
@@ -165,7 +165,7 @@ export class Audit {
     callback: Callback<T>,
   ): Promise<void>;
   /**
-   * Sets the retention period for records in the audit log. The retention period can be set to a maximum of 20 years.
+   * Sets the retention period for records in the audit log. The retention period can be set to a maximum of 1 year.
    *
    * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Confluence Administrator' global
    * permission.