Using builtin formdata (nodejs + browsers)

MrRefactoring · MrRefactoring · commit 411d08327dd3 · 2025-04-27T17:52:43.000+03:00
diff --git a/.npmignore b/.npmignore
@@ -6,7 +6,7 @@ coverage
 .idea
 examples
 
-.eslintrc
+eslint.config.js
 .editorconfig
 .DS_Store
 pnpm-lock.yaml
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "5.0.0",
   "description": "A comprehensive JavaScript/TypeScript library designed for both Node.JS and browsers, facilitating seamless interaction with the Atlassian Jira API.",
   "repository": "https://github.com/MrRefactoring/jira.js.git",
+  "homepage": "https://mrrefactoring.github.io/jira.js",
   "author": "Vladislav Tupikin <vladislav.tupikin@icloud.com>",
   "license": "MIT",
   "type": "module",
@@ -35,11 +36,9 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
-    "node": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.esm.js",
-      "require": "./dist/index.cjs.js"
-    }
+    "types": "./dist/index.d.ts",
+    "import": "./dist/index.esm.js",
+    "require": "./dist/index.cjs.js"
   },
   "scripts": {
     "build": "pnpm run build:src && pnpm run build:tests",
@@ -83,7 +82,6 @@
   },
   "dependencies": {
     "axios": "^1.9.0",
-    "formdata-node": "^6.0.3",
     "mime": "^4.0.7",
     "zod": "^3.24.3"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/rollup.config.ts b/rollup.config.ts
@@ -35,5 +35,5 @@ export default defineConfig({
     commonjs(),
     typescript({ tsconfig: './tsconfig.json' }),
   ],
-  external, // todo build for browsers
+  external,
 });
diff --git a/src/createClient.ts b/src/createClient.ts
@@ -15,6 +15,7 @@ export enum ClientType {
 export function createClient(clientType: ClientType.Agile, config: Config): AgileClient;
 export function createClient(clientType: ClientType.Version2, config: Config): Version2Client;
 export function createClient(clientType: ClientType.Version3, config: Config): Version3Client;
+export function createClient(clientType: ClientType.ServiceDesk, config: Config): ServiceDeskClient;
 export function createClient(clientType: ClientType, config: Config): BaseClient {
   switch (clientType) {
     case ClientType.Agile:
diff --git a/src/serviceDesk/serviceDesk.ts b/src/serviceDesk/serviceDesk.ts
@@ -1,5 +1,4 @@
-import { FormData, File } from 'formdata-node';
-import type { Mime } from 'mime' with { 'resolution-mode': 'import' };
+import mime, { Mime } from 'mime';
 import * as Models from './models';
 import * as Parameters from './parameters';
 import { Callback } from '../callback';
@@ -117,8 +116,6 @@ export class ServiceDesk {
     const formData = new FormData();
     const attachments = Array.isArray(parameters.attachment) ? parameters.attachment : [parameters.attachment];
 
-    const { default: mime } = await import('mime');
-
     let Readable: typeof import('stream').Readable | undefined;
 
     if (typeof window === 'undefined') {
diff --git a/src/version2/issueAttachments.ts b/src/version2/issueAttachments.ts
@@ -1,5 +1,4 @@
-import { FormData, File } from 'formdata-node';
-import type { Mime } from 'mime' with { 'resolution-mode': 'import' };
+import mime, { Mime } from 'mime';
 import * as Models from './models';
 import * as Parameters from './parameters';
 import { Client } from '../clients';
@@ -414,8 +413,6 @@ export class IssueAttachments {
     const formData = new FormData();
     const attachments = Array.isArray(parameters.attachment) ? parameters.attachment : [parameters.attachment];
 
-    const { default: mime } = await import('mime');
-
     let Readable: typeof import('stream').Readable | undefined;
 
     if (typeof window === 'undefined') {
diff --git a/src/version3/issueAttachments.ts b/src/version3/issueAttachments.ts
@@ -1,5 +1,4 @@
-import { FormData, File } from 'formdata-node';
-import type { Mime } from 'mime' with { 'resolution-mode': 'import' };
+import mime, { Mime } from 'mime';
 import * as Models from './models';
 import * as Parameters from './parameters';
 import { Client } from '../clients';
@@ -436,8 +435,6 @@ export class IssueAttachments {
     const formData = new FormData();
     const attachments = Array.isArray(parameters.attachment) ? parameters.attachment : [parameters.attachment];
 
-    const { default: mime } = await import('mime');
-
     let Readable: typeof import('stream').Readable | undefined;
 
     if (typeof window === 'undefined') {
diff --git a/tests/integration/utils/createSoftwareProject.ts b/tests/integration/utils/createSoftwareProject.ts
@@ -9,7 +9,6 @@ export const createSoftwareProject = async () => {
   if (!currentUser.accountId) {
     throw new Error(
       "Couldn't get the current user's account ID",
-      // @ts-expect-error -- Requires to use lib ES2022+ in tsconfig to use "cause"
       { cause: { currentUser } },
     );
   }
diff --git a/tests/unit/createClient.test.ts b/tests/unit/createClient.test.ts
@@ -39,6 +39,7 @@ test('should create ServiceDesk client', ({ expect }) => {
 });
 
 test('should create Base client', ({ expect }) => {
+  // @ts-expect-error Internal typings
   const client = createClient('baseClient', defaultConfig);
 
   expect(!!client).toBeTruthy();
diff --git a/tests/unit/services/authenticationService.test.ts b/tests/unit/services/authenticationService.test.ts
@@ -11,7 +11,7 @@ test('should return undefined when authentication does not used', async ({ expec
 });
 
 test('should return Basic authentication token for apiToken case', async ({ expect }) => {
-  const authentication: Config.Authentication = {
+  const authentication: Config['authentication'] = {
     basic: {
       email: 'test_email@test.qwe',
       apiToken: 'test_apiToken',
@@ -22,13 +22,3 @@ test('should return Basic authentication token for apiToken case', async ({ expe
 
   expect(token).toBe('Basic dGVzdF9lbWFpbEB0ZXN0LnF3ZTp0ZXN0X2FwaVRva2Vu');
 });
-
-test('should generate Bearer Header correctly for Personal Access Token', async ({ expect }) => {
-  const authentication: Config.Authentication = {
-    personalAccessToken: 'secretPAT',
-  };
-
-  const token = await getAuthenticationToken(authentication);
-
-  expect(token).toBe('Bearer secretPAT');
-});
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,12 +1,12 @@
 {
   "compilerOptions": {
-    "target": "ES2018",
+    "target": "ES2022",
     "outDir": "dist",
-    "module": "ESNext",
+    "module": "ES2022",
     "moduleResolution": "bundler",
     "skipLibCheck": true,
     "lib": [
-      "ES2018",
+      "ES2022",
       "DOM"
     ],
     "baseUrl": ".",

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ export const createSoftwareProject = async () => {`
`9`	`9`	`if (!currentUser.accountId) {`
`10`	`10`	`throw new Error(`
`11`	`11`	`"Couldn't get the current user's account ID",`
`12`		`- // @ts-expect-error -- Requires to use lib ES2022+ in tsconfig to use "cause"`
`13`	`12`	`{ cause: { currentUser } },`
`14`	`13`	`);`
`15`	`14`	`}`