@hasna/connectors 1.4.6 → 1.4.7

package/bin/index.js

@@ -1909,7 +1909,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/connectors",
-    version: "1.4.6",
+    version: "1.4.7",
     description: "Open source connector library - Install API connectors with a single command",
     type: "module",
     bin: {

package/bin/mcp.js

@@ -5905,7 +5905,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/connectors",
-    version: "1.4.6",
+    version: "1.4.7",
     description: "Open source connector library - Install API connectors with a single command",
     type: "module",
     bin: {

package/bin/serve.js

@@ -6535,7 +6535,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/connectors",
-    version: "1.4.6",
+    version: "1.4.7",
     description: "Open source connector library - Install API connectors with a single command",
     type: "module",
     bin: {

package/connectors/firecrawl/src/api/client.ts

@@ -13,6 +13,7 @@ export interface RequestOptions {
 export class FirecrawlClient {
   private readonly apiKey: string;
   private readonly baseUrl: string;
+  private readonly fetchImpl: (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
 
   constructor(config: FirecrawlConfig) {
     if (!config.apiKey) {
@@ -20,6 +21,7 @@ export class FirecrawlClient {
     }
     this.apiKey = config.apiKey;
     this.baseUrl = config.baseUrl || DEFAULT_BASE_URL;
+    this.fetchImpl = config.fetchImpl || fetch;
   }
 
   private buildUrl(path: string, params?: Record<string, string | number | boolean | undefined>): string {
@@ -64,7 +66,7 @@ export class FirecrawlClient {
       fetchOptions.body = typeof body === 'string' ? body : JSON.stringify(body);
     }
 
-    const response = await fetch(url, fetchOptions);
+    const response = await this.fetchImpl(url, fetchOptions);
 
     // Handle 204 No Content
     if (response.status === 204) {

package/connectors/firecrawl/src/api/scrape-contract.test.ts

@@ -0,0 +1,64 @@
+import { describe, expect, test } from 'bun:test';
+import { FirecrawlClient } from './client';
+import { ScrapeApi } from './scrape';
+
+function contractFetch(requests: Request[], bodies: Record<string, unknown>[]) {
+  return async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
+    const request = new Request(input, init);
+    requests.push(request);
+    if (request.method !== 'POST' || new URL(request.url).pathname !== '/v1/scrape') {
+      return Response.json({ error: 'wrong method or path' }, { status: 404 });
+    }
+    if (request.headers.get('authorization') !== 'Bearer fixture-key' || request.headers.get('content-type') !== 'application/json') {
+      return Response.json({ error: 'wrong headers' }, { status: 401 });
+    }
+    const body = await request.json() as { formats?: unknown[]; jsonOptions?: unknown; extract?: unknown };
+    bodies.push(body);
+    const formats = Array.isArray(body.formats) ? body.formats : [];
+    const hasJsonOptions = body.jsonOptions !== undefined;
+    const hasJsonFormat = formats.includes('json');
+    if (body.extract !== undefined || hasJsonOptions !== hasJsonFormat) {
+      return Response.json({ success: false, error: 'v1 requires jsonOptions with the json format' }, { status: 400 });
+    }
+    return Response.json({ success: true, data: { formats, jsonOptions: body.jsonOptions } });
+  };
+}
+
+describe('Firecrawl v1 scrape extraction contract', () => {
+  test('rejects the legacy shape and verifies method, path, headers, and mixed formats', async () => {
+    const requests: Request[] = [];
+    const bodies: Record<string, unknown>[] = [];
+    const client = new FirecrawlClient({ apiKey: 'fixture-key', baseUrl: 'http://fixture/v1', fetchImpl: contractFetch(requests, bodies) });
+    await expect(client.post('/scrape', {
+      url: 'https://example.com', formats: ['markdown', 'html', 'links'],
+      extract: { schema: { type: 'object' }, prompt: 'Extract the title' },
+    })).rejects.toMatchObject({ statusCode: 400 });
+    const response = await client.post<{ success: boolean; data: { formats: unknown[]; jsonOptions: unknown } }>('/scrape', {
+      url: 'https://example.com', formats: ['markdown', 'html', 'links', 'json'],
+      jsonOptions: { schema: { type: 'object' }, prompt: 'Extract the title' },
+    });
+    expect(response.data.formats).toEqual(['markdown', 'html', 'links', 'json']);
+    expect(response.data.jsonOptions).toEqual({ schema: { type: 'object' }, prompt: 'Extract the title' });
+    expect(requests).toHaveLength(2);
+    expect(requests[1].method).toBe('POST');
+    expect(new URL(requests[1].url).pathname).toBe('/v1/scrape');
+    expect(requests[1].headers.get('authorization')).toBe('Bearer fixture-key');
+    expect(requests[1].headers.get('content-type')).toBe('application/json');
+  });
+
+  test('SDK convenience extraction uses jsonOptions and preserves requested content formats', async () => {
+    const requests: Request[] = [];
+    const bodies: Record<string, unknown>[] = [];
+    const client = new FirecrawlClient({ apiKey: 'fixture-key', baseUrl: 'http://fixture/v1', fetchImpl: contractFetch(requests, bodies) });
+    const response = await new ScrapeApi(client).scrapeWithExtraction('https://example.com', {
+      type: 'object', properties: { title: { type: 'string' } },
+    }, 'Extract the title', ['html', 'links']);
+    expect(response.success).toBe(true);
+    expect(requests).toHaveLength(1);
+    const body = bodies[0] as { formats: string[]; jsonOptions: unknown };
+    expect(body.formats).toEqual(['markdown', 'html', 'links', 'json']);
+    expect(body.jsonOptions).toEqual({
+      schema: { type: 'object', properties: { title: { type: 'string' } } }, prompt: 'Extract the title',
+    });
+  });
+});

package/connectors/firecrawl/src/api/scrape.ts

@@ -43,11 +43,12 @@ export class ScrapeApi {
   async scrapeWithExtraction(
     url: string,
     schema: Record<string, unknown>,
-    prompt?: string
+    prompt?: string,
+    formats: ScrapeFormat[] = ['markdown'],
   ): Promise<ScrapeResponse> {
     return this.scrape(url, {
-      formats: ['markdown'],
-      extract: {
+      formats: Array.from(new Set<ScrapeFormat>(['markdown', ...formats, 'json'])),
+      jsonOptions: {
         schema,
         prompt,
       },

package/connectors/firecrawl/src/cli/extraction.test.ts

@@ -11,8 +11,8 @@ describe('Firecrawl CLI extraction options', () => {
     writeFileSync(schemaPath, JSON.stringify({ type: 'object', properties: { title: { type: 'string' } } }));
 
     expect(buildExtractionOptions(schemaPath, 'Extract the page title')).toEqual({
-      formats: ['markdown'],
-      extract: {
+      formats: ['markdown', 'json'],
+      jsonOptions: {
         schema: { type: 'object', properties: { title: { type: 'string' } } },
         prompt: 'Extract the page title',
       },
@@ -21,15 +21,15 @@ describe('Firecrawl CLI extraction options', () => {
 
   test('supports a prompt without a schema file', () => {
     expect(buildExtractionOptions(undefined, '  Find the publication date  ')).toEqual({
-      formats: ['markdown'],
-      extract: { schema: undefined, prompt: 'Find the publication date' },
+      formats: ['markdown', 'json'],
+      jsonOptions: { schema: undefined, prompt: 'Find the publication date' },
     });
   });
 
   test('preserves requested formats while adding markdown for extraction', () => {
     expect(buildExtractionOptions(undefined, 'Extract the title', ['html', 'screenshot@fullPage'])).toEqual({
-      formats: ['markdown', 'html', 'screenshot@fullPage'],
-      extract: { schema: undefined, prompt: 'Extract the title' },
+      formats: ['markdown', 'html', 'screenshot@fullPage', 'json'],
+      jsonOptions: { schema: undefined, prompt: 'Extract the title' },
     });
   });
 

package/connectors/firecrawl/src/cli/extraction.ts

@@ -22,13 +22,15 @@ export function buildExtractionOptions(
   schemaPath?: string,
   prompt?: string,
   formats: ScrapeFormat[] = ['markdown'],
-): Pick<ScrapeRequest, 'formats' | 'extract'> | undefined {
+): Pick<ScrapeRequest, 'formats' | 'jsonOptions'> | undefined {
   const normalizedPrompt = prompt?.trim();
   if (!schemaPath && !normalizedPrompt) return undefined;
 
   return {
-    formats: Array.from(new Set<ScrapeFormat>(['markdown', ...formats])),
-    extract: {
+    // Firecrawl's v1 scrape contract requires jsonOptions with the json
+    // format. Keep the requested content formats as well.
+    formats: Array.from(new Set<ScrapeFormat>(['markdown', ...formats, 'json'])),
+    jsonOptions: {
       schema: schemaPath ? readExtractionSchema(schemaPath) : undefined,
       prompt: normalizedPrompt,
     },

package/connectors/firecrawl/src/types/index.ts

@@ -7,6 +7,7 @@
 export interface FirecrawlConfig {
   apiKey: string;
   baseUrl?: string; // Override default base URL (https://api.firecrawl.dev/v1)
+  fetchImpl?: (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>; // Injectable transport for isolated contract tests
 }
 
 // ============================================
@@ -15,7 +16,7 @@ export interface FirecrawlConfig {
 
 export type OutputFormat = 'json' | 'pretty';
 
-export type ScrapeFormat = 'markdown' | 'html' | 'rawHtml' | 'links' | 'screenshot' | 'screenshot@fullPage';
+export type ScrapeFormat = 'markdown' | 'html' | 'rawHtml' | 'links' | 'json' | 'screenshot' | 'screenshot@fullPage';
 
 export interface Action {
   type: 'wait' | 'click' | 'write' | 'press' | 'screenshot' | 'scroll';
@@ -43,7 +44,7 @@ export interface ScrapeRequest {
   skipTlsVerification?: boolean;
   timeout?: number;
   actions?: Action[];
-  extract?: {
+  jsonOptions?: {
     schema?: Record<string, unknown>;
     systemPrompt?: string;
     prompt?: string;

package/dist/index.js

@@ -5862,7 +5862,7 @@ function extractGoogleError(body) {
 // package.json
 var package_default = {
   name: "@hasna/connectors",
-  version: "1.4.6",
+  version: "1.4.7",
   description: "Open source connector library - Install API connectors with a single command",
   type: "module",
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/connectors",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "description": "Open source connector library - Install API connectors with a single command",
   "type": "module",
   "bin": {