nylas 7.11.0 → 7.12.0

package/lib/cjs/apiClient.js

@@ -156,10 +156,6 @@ class APIClient {
         }
         if (optionParams.form) {
             requestOptions.body = optionParams.form;
-            requestOptions.headers = {
-                ...requestOptions.headers,
-                ...optionParams.form.getHeaders(),
-            };
         }
         return requestOptions;
     }
@@ -198,6 +194,10 @@ class APIClient {
     }
     async requestStream(options) {
         const response = await this.sendRequest(options);
+        // TODO: See if we can fix this in a backwards compatible way
+        if (!response.body) {
+            throw new Error('No response body');
+        }
         return response.body;
     }
 }

package/lib/cjs/resources/auth.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Auth = void 0;
 const uuid_1 = require("uuid");
-const crypto_1 = require("crypto");
+const node_crypto_1 = require("node:crypto");
 const resource_js_1 = require("./resource.js");
 const utils_js_1 = require("../utils.js");
 /**
@@ -166,7 +166,7 @@ class Auth extends resource_js_1.Resource {
         return url;
     }
     hashPKCESecret(secret) {
-        const hash = (0, crypto_1.createHash)('sha256').update(secret).digest('hex');
+        const hash = (0, node_crypto_1.createHash)('sha256').update(secret).digest('hex');
         return Buffer.from(hash).toString('base64').replace(/=+$/, '');
     }
     getTokenInfo(params) {

package/lib/cjs/resources/drafts.js

@@ -55,7 +55,7 @@ class Drafts extends resource_js_1.Resource {
             });
         }
         else if (requestBody.attachments) {
-            const processedAttachments = await (0, utils_js_1.encodeAttachmentStreams)(requestBody.attachments);
+            const processedAttachments = await (0, utils_js_1.encodeAttachmentContent)(requestBody.attachments);
             requestBody = {
                 ...requestBody,
                 attachments: processedAttachments,
@@ -88,7 +88,7 @@ class Drafts extends resource_js_1.Resource {
             });
         }
         else if (requestBody.attachments) {
-            const processedAttachments = await (0, utils_js_1.encodeAttachmentStreams)(requestBody.attachments);
+            const processedAttachments = await (0, utils_js_1.encodeAttachmentContent)(requestBody.attachments);
             requestBody = {
                 ...requestBody,
                 attachments: processedAttachments,

package/lib/cjs/resources/messages.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Messages = void 0;
+const formdata_node_1 = require("formdata-node");
 const utils_js_1 = require("../utils.js");
 const resource_js_1 = require("./resource.js");
 const smartCompose_js_1 = require("./smartCompose.js");
@@ -96,7 +97,7 @@ class Messages extends resource_js_1.Resource {
         }
         else {
             if (requestBody.attachments) {
-                const processedAttachments = await (0, utils_js_1.encodeAttachmentStreams)(requestBody.attachments);
+                const processedAttachments = await (0, utils_js_1.encodeAttachmentContent)(requestBody.attachments);
                 requestOptions.body = {
                     ...requestBody,
                     attachments: processedAttachments,
@@ -155,10 +156,7 @@ class Messages extends resource_js_1.Resource {
         });
     }
     static _buildFormRequest(requestBody) {
-        // FormData imports are funky, cjs needs to use .default, es6 doesn't
-        const FD = require('form-data');
-        const FormDataConstructor = FD.default || FD;
-        const form = new FormDataConstructor();
+        const form = new formdata_node_1.FormData();
         // Split out the message payload from the attachments
         const messagePayload = {
             ...requestBody,
@@ -166,13 +164,30 @@ class Messages extends resource_js_1.Resource {
         };
         form.append('message', JSON.stringify((0, utils_js_1.objKeysToSnakeCase)(messagePayload)));
         // Add a separate form field for each attachment
-        requestBody.attachments?.forEach((attachment, index) => {
-            const contentId = attachment.contentId || `file${index}`;
-            form.append(contentId, attachment.content, {
-                filename: attachment.filename,
-                contentType: attachment.contentType,
+        if (requestBody.attachments && requestBody.attachments.length > 0) {
+            requestBody.attachments.map((attachment, index) => {
+                const contentId = attachment.contentId || `file${index}`;
+                // Handle different content types for formdata-node
+                if (typeof attachment.content === 'string') {
+                    // Base64 string - create a Blob
+                    const buffer = Buffer.from(attachment.content, 'base64');
+                    const blob = new formdata_node_1.Blob([buffer], { type: attachment.contentType });
+                    form.append(contentId, blob, attachment.filename);
+                }
+                else if (Buffer.isBuffer(attachment.content)) {
+                    // Buffer - create a Blob
+                    const blob = new formdata_node_1.Blob([attachment.content], {
+                        type: attachment.contentType,
+                    });
+                    form.append(contentId, blob, attachment.filename);
+                }
+                else {
+                    // ReadableStream - create a proper file-like object according to formdata-node docs
+                    const file = (0, utils_js_1.attachmentStreamToFile)(attachment);
+                    form.append(contentId, file, attachment.filename);
+                }
             });
-        });
+        }
         return form;
     }
 }

package/lib/cjs/utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFileRequestBuilder = createFileRequestBuilder;
+exports.attachmentStreamToFile = attachmentStreamToFile;
+exports.encodeAttachmentContent = encodeAttachmentContent;
 exports.encodeAttachmentStreams = encodeAttachmentStreams;
 exports.objKeysToCamelCase = objKeysToCamelCase;
 exports.objKeysToSnakeCase = objKeysToSnakeCase;
@@ -8,10 +10,10 @@ exports.safePath = safePath;
 exports.makePathParams = makePathParams;
 exports.calculateTotalPayloadSize = calculateTotalPayloadSize;
 const change_case_1 = require("change-case");
-const fs = require("fs");
-const path = require("path");
+const fs = require("node:fs");
+const path = require("node:path");
 const mime = require("mime-types");
-const stream_1 = require("stream");
+const node_stream_1 = require("node:stream");
 function createFileRequestBuilder(filePath) {
     const stats = fs.statSync(filePath);
     const filename = path.basename(filePath);
@@ -45,18 +47,67 @@ function streamToBase64(stream) {
     });
 }
 /**
- * Encodes the content of each attachment stream to base64.
+ * Converts a ReadableStream to a File-like object that can be used with FormData.
+ * @param attachment The attachment containing the stream and metadata.
+ * @param mimeType The MIME type for the file (optional).
+ * @returns A File-like object that properly handles the stream.
+ */
+function attachmentStreamToFile(attachment, mimeType) {
+    if (mimeType != null && typeof mimeType !== 'string') {
+        throw new Error('Invalid mimetype, expected string.');
+    }
+    const content = attachment.content;
+    if (typeof content === 'string' || Buffer.isBuffer(content)) {
+        throw new Error('Invalid attachment content, expected ReadableStream.');
+    }
+    // Create a file-shaped object that FormData can handle properly
+    const fileObject = {
+        type: mimeType || attachment.contentType,
+        name: attachment.filename,
+        [Symbol.toStringTag]: 'File',
+        stream() {
+            return content;
+        },
+    };
+    // Add size if available
+    if (attachment.size !== undefined) {
+        fileObject.size = attachment.size;
+    }
+    return fileObject;
+}
+/**
+ * Encodes the content of each attachment to base64.
+ * Handles ReadableStream, Buffer, and string content types.
  * @param attachments The attachments to encode.
  * @returns The attachments with their content encoded to base64.
  */
-async function encodeAttachmentStreams(attachments) {
+async function encodeAttachmentContent(attachments) {
     return await Promise.all(attachments.map(async (attachment) => {
-        const base64EncodedContent = attachment.content instanceof stream_1.Readable
-            ? await streamToBase64(attachment.content)
-            : attachment.content;
-        return { ...attachment, content: base64EncodedContent }; // Replace the stream with its base64 string
+        let base64EncodedContent;
+        if (attachment.content instanceof node_stream_1.Readable) {
+            // ReadableStream -> base64
+            base64EncodedContent = await streamToBase64(attachment.content);
+        }
+        else if (Buffer.isBuffer(attachment.content)) {
+            // Buffer -> base64
+            base64EncodedContent = attachment.content.toString('base64');
+        }
+        else {
+            // string (assumed to already be base64)
+            base64EncodedContent = attachment.content;
+        }
+        return { ...attachment, content: base64EncodedContent };
     }));
 }
+/**
+ * @deprecated Use encodeAttachmentContent instead. This alias is provided for backwards compatibility.
+ * Encodes the content of each attachment stream to base64.
+ * @param attachments The attachments to encode.
+ * @returns The attachments with their content encoded to base64.
+ */
+async function encodeAttachmentStreams(attachments) {
+    return encodeAttachmentContent(attachments);
+}
 /**
  * Applies the casing function and ensures numeric parts are preceded by underscores in snake_case.
  * @param casingFunction The original casing function.

package/lib/cjs/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDK_VERSION = void 0;
 // This file is generated by scripts/exportVersion.js
-exports.SDK_VERSION = '7.11.0';
+exports.SDK_VERSION = '7.12.0';

package/lib/esm/apiClient.js

@@ -153,10 +153,6 @@ export default class APIClient {
         }
         if (optionParams.form) {
             requestOptions.body = optionParams.form;
-            requestOptions.headers = {
-                ...requestOptions.headers,
-                ...optionParams.form.getHeaders(),
-            };
         }
         return requestOptions;
     }
@@ -195,6 +191,10 @@ export default class APIClient {
     }
     async requestStream(options) {
         const response = await this.sendRequest(options);
+        // TODO: See if we can fix this in a backwards compatible way
+        if (!response.body) {
+            throw new Error('No response body');
+        }
         return response.body;
     }
 }

package/lib/esm/resources/auth.js

@@ -1,5 +1,5 @@
 import { v4 as uuid } from 'uuid';
-import { createHash } from 'crypto';
+import { createHash } from 'node:crypto';
 import { Resource } from './resource.js';
 import { makePathParams } from '../utils.js';
 /**

package/lib/esm/resources/drafts.js

@@ -1,6 +1,6 @@
 import { Messages } from './messages.js';
 import { Resource } from './resource.js';
-import { encodeAttachmentStreams, calculateTotalPayloadSize, } from '../utils.js';
+import { encodeAttachmentContent, calculateTotalPayloadSize, } from '../utils.js';
 import { makePathParams } from '../utils.js';
 /**
  * Nylas Drafts API
@@ -52,7 +52,7 @@ export class Drafts extends Resource {
             });
         }
         else if (requestBody.attachments) {
-            const processedAttachments = await encodeAttachmentStreams(requestBody.attachments);
+            const processedAttachments = await encodeAttachmentContent(requestBody.attachments);
             requestBody = {
                 ...requestBody,
                 attachments: processedAttachments,
@@ -85,7 +85,7 @@ export class Drafts extends Resource {
             });
         }
         else if (requestBody.attachments) {
-            const processedAttachments = await encodeAttachmentStreams(requestBody.attachments);
+            const processedAttachments = await encodeAttachmentContent(requestBody.attachments);
             requestBody = {
                 ...requestBody,
                 attachments: processedAttachments,

package/lib/esm/resources/messages.js

@@ -1,4 +1,5 @@
-import { encodeAttachmentStreams, objKeysToSnakeCase, makePathParams, calculateTotalPayloadSize, } from '../utils.js';
+import { Blob, FormData } from 'formdata-node';
+import { attachmentStreamToFile, calculateTotalPayloadSize, encodeAttachmentContent, makePathParams, objKeysToSnakeCase, } from '../utils.js';
 import { Resource } from './resource.js';
 import { SmartCompose } from './smartCompose.js';
 /**
@@ -93,7 +94,7 @@ export class Messages extends Resource {
         }
         else {
             if (requestBody.attachments) {
-                const processedAttachments = await encodeAttachmentStreams(requestBody.attachments);
+                const processedAttachments = await encodeAttachmentContent(requestBody.attachments);
                 requestOptions.body = {
                     ...requestBody,
                     attachments: processedAttachments,
@@ -152,10 +153,7 @@ export class Messages extends Resource {
         });
     }
     static _buildFormRequest(requestBody) {
-        // FormData imports are funky, cjs needs to use .default, es6 doesn't
-        const FD = require('form-data');
-        const FormDataConstructor = FD.default || FD;
-        const form = new FormDataConstructor();
+        const form = new FormData();
         // Split out the message payload from the attachments
         const messagePayload = {
             ...requestBody,
@@ -163,13 +161,30 @@ export class Messages extends Resource {
         };
         form.append('message', JSON.stringify(objKeysToSnakeCase(messagePayload)));
         // Add a separate form field for each attachment
-        requestBody.attachments?.forEach((attachment, index) => {
-            const contentId = attachment.contentId || `file${index}`;
-            form.append(contentId, attachment.content, {
-                filename: attachment.filename,
-                contentType: attachment.contentType,
+        if (requestBody.attachments && requestBody.attachments.length > 0) {
+            requestBody.attachments.map((attachment, index) => {
+                const contentId = attachment.contentId || `file${index}`;
+                // Handle different content types for formdata-node
+                if (typeof attachment.content === 'string') {
+                    // Base64 string - create a Blob
+                    const buffer = Buffer.from(attachment.content, 'base64');
+                    const blob = new Blob([buffer], { type: attachment.contentType });
+                    form.append(contentId, blob, attachment.filename);
+                }
+                else if (Buffer.isBuffer(attachment.content)) {
+                    // Buffer - create a Blob
+                    const blob = new Blob([attachment.content], {
+                        type: attachment.contentType,
+                    });
+                    form.append(contentId, blob, attachment.filename);
+                }
+                else {
+                    // ReadableStream - create a proper file-like object according to formdata-node docs
+                    const file = attachmentStreamToFile(attachment);
+                    form.append(contentId, file, attachment.filename);
+                }
             });
-        });
+        }
         return form;
     }
 }

package/lib/esm/utils.js

@@ -1,8 +1,8 @@
 import { camelCase, snakeCase } from 'change-case';
-import * as fs from 'fs';
-import * as path from 'path';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
 import * as mime from 'mime-types';
-import { Readable } from 'stream';
+import { Readable } from 'node:stream';
 export function createFileRequestBuilder(filePath) {
     const stats = fs.statSync(filePath);
     const filename = path.basename(filePath);
@@ -36,18 +36,67 @@ function streamToBase64(stream) {
     });
 }
 /**
- * Encodes the content of each attachment stream to base64.
+ * Converts a ReadableStream to a File-like object that can be used with FormData.
+ * @param attachment The attachment containing the stream and metadata.
+ * @param mimeType The MIME type for the file (optional).
+ * @returns A File-like object that properly handles the stream.
+ */
+export function attachmentStreamToFile(attachment, mimeType) {
+    if (mimeType != null && typeof mimeType !== 'string') {
+        throw new Error('Invalid mimetype, expected string.');
+    }
+    const content = attachment.content;
+    if (typeof content === 'string' || Buffer.isBuffer(content)) {
+        throw new Error('Invalid attachment content, expected ReadableStream.');
+    }
+    // Create a file-shaped object that FormData can handle properly
+    const fileObject = {
+        type: mimeType || attachment.contentType,
+        name: attachment.filename,
+        [Symbol.toStringTag]: 'File',
+        stream() {
+            return content;
+        },
+    };
+    // Add size if available
+    if (attachment.size !== undefined) {
+        fileObject.size = attachment.size;
+    }
+    return fileObject;
+}
+/**
+ * Encodes the content of each attachment to base64.
+ * Handles ReadableStream, Buffer, and string content types.
  * @param attachments The attachments to encode.
  * @returns The attachments with their content encoded to base64.
  */
-export async function encodeAttachmentStreams(attachments) {
+export async function encodeAttachmentContent(attachments) {
     return await Promise.all(attachments.map(async (attachment) => {
-        const base64EncodedContent = attachment.content instanceof Readable
-            ? await streamToBase64(attachment.content)
-            : attachment.content;
-        return { ...attachment, content: base64EncodedContent }; // Replace the stream with its base64 string
+        let base64EncodedContent;
+        if (attachment.content instanceof Readable) {
+            // ReadableStream -> base64
+            base64EncodedContent = await streamToBase64(attachment.content);
+        }
+        else if (Buffer.isBuffer(attachment.content)) {
+            // Buffer -> base64
+            base64EncodedContent = attachment.content.toString('base64');
+        }
+        else {
+            // string (assumed to already be base64)
+            base64EncodedContent = attachment.content;
+        }
+        return { ...attachment, content: base64EncodedContent };
     }));
 }
+/**
+ * @deprecated Use encodeAttachmentContent instead. This alias is provided for backwards compatibility.
+ * Encodes the content of each attachment stream to base64.
+ * @param attachments The attachments to encode.
+ * @returns The attachments with their content encoded to base64.
+ */
+export async function encodeAttachmentStreams(attachments) {
+    return encodeAttachmentContent(attachments);
+}
 /**
  * Applies the casing function and ensures numeric parts are preceded by underscores in snake_case.
  * @param casingFunction The original casing function.

package/lib/esm/version.js

@@ -1,2 +1,2 @@
 // This file is generated by scripts/exportVersion.js
-export const SDK_VERSION = '7.11.0';
+export const SDK_VERSION = '7.12.0';

package/lib/types/apiClient.d.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from 'node-fetch';
 import { NylasConfig, OverridableNylasConfig } from './config.js';
-import FormData from 'form-data';
+import { FormData } from 'formdata-node';
 /**
  * The header key for the debugging flow ID
  */

package/lib/types/resources/messages.d.ts

@@ -1,4 +1,4 @@
-import FormData from 'form-data';
+import { FormData } from 'formdata-node';
 import APIClient from '../apiClient.js';
 import { Overrides } from '../config.js';
 import { CreateDraftRequest, SendMessageRequest, UpdateDraftRequest } from '../models/drafts.js';

package/lib/types/utils.d.ts

@@ -1,6 +1,21 @@
 import { CreateAttachmentRequest } from './models/attachments.js';
 export declare function createFileRequestBuilder(filePath: string): CreateAttachmentRequest;
 /**
+ * Converts a ReadableStream to a File-like object that can be used with FormData.
+ * @param attachment The attachment containing the stream and metadata.
+ * @param mimeType The MIME type for the file (optional).
+ * @returns A File-like object that properly handles the stream.
+ */
+export declare function attachmentStreamToFile(attachment: CreateAttachmentRequest, mimeType?: string): any;
+/**
+ * Encodes the content of each attachment to base64.
+ * Handles ReadableStream, Buffer, and string content types.
+ * @param attachments The attachments to encode.
+ * @returns The attachments with their content encoded to base64.
+ */
+export declare function encodeAttachmentContent(attachments: CreateAttachmentRequest[]): Promise<CreateAttachmentRequest[]>;
+/**
+ * @deprecated Use encodeAttachmentContent instead. This alias is provided for backwards compatibility.
  * Encodes the content of each attachment stream to base64.
  * @param attachments The attachments to encode.
  * @returns The attachments with their content encoded to base64.

package/lib/types/version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "7.11.0";
+export declare const SDK_VERSION = "7.12.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nylas",
-  "version": "7.11.0",
+  "version": "7.12.0",
   "description": "A NodeJS wrapper for the Nylas REST API for email, contacts, and calendar.",
   "main": "lib/cjs/nylas.js",
   "types": "lib/types/nylas.d.ts",
@@ -40,9 +40,10 @@
   "license": "MIT",
   "dependencies": {
     "change-case": "^4.1.2",
-    "form-data": "^4.0.0",
+    "form-data-encoder": "^4.1.0",
+    "formdata-node": "^6.0.3",
     "mime-types": "^2.1.35",
-    "node-fetch": "^2.6.12",
+    "node-fetch": "^3.3.2",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
@@ -50,7 +51,6 @@
     "@types/jest": "^29.5.2",
     "@types/mime-types": "^2.1.2",
     "@types/node": "^22.15.21",
-    "@types/node-fetch": "^2.6.4",
     "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^2.25.0",
     "@typescript-eslint/parser": "^2.25.0",
@@ -60,6 +60,7 @@
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-prettier": "^3.0.1",
     "jest": "^29.6.1",
+    "jest-fetch-mock": "^3.0.3",
     "prettier": "^3.5.3",
     "ts-jest": "^29.1.1",
     "typedoc": "^0.28.4",