Skip to content

Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥

Nick: fixed schemas on extract for node

Nicolas87757d9b8e6b
diff --git a/apps/js-sdk/firecrawl/package.json b/apps/js-sdk/firecrawl/package.json
index 9aab848ae..681404372 100644
--- a/apps/js-sdk/firecrawl/package.json
+++ b/apps/js-sdk/firecrawl/package.json
@@ -1,6 +1,6 @@
{
"name": "@mendable/firecrawl-js",
- "version": "1.11.0",
+ "version": "1.11.2",
"description": "JavaScript SDK for Firecrawl API",
"main": "dist/index.js",
"types": "dist/index.d.ts",
diff --git a/apps/js-sdk/firecrawl/src/index.ts b/apps/js-sdk/firecrawl/src/index.ts
index af9dbc756..60f485d07 100644
--- a/apps/js-sdk/firecrawl/src/index.ts
+++ b/apps/js-sdk/firecrawl/src/index.ts
@@ -1,5 +1,5 @@
import axios, { type AxiosResponse, type AxiosRequestHeaders, AxiosError } from "axios";
-import type * as zt from "zod";
+import * as zt from "zod";
import { zodToJsonSchema } from "zod-to-json-schema";
import { WebSocket } from "isows";
import { TypedEventTarget } from "typescript-event-target";
@@ -247,7 +247,7 @@ export interface MapResponse {
*/
export interface ExtractParams<LLMSchema extends zt.ZodSchema = any> {
prompt?: string;
- schema?: LLMSchema;
+ schema?: LLMSchema | object;
systemPrompt?: string;
allowExternalLinks?: boolean;
includeSubdomains?: boolean;
@@ -835,16 +835,18 @@ export default class FirecrawlApp {
async extract<T extends zt.ZodSchema = any>(urls: string[], params?: ExtractParams<T>): Promise<ExtractResponse<zt.infer<T>> | ErrorResponse> {
const headers = this.prepareHeaders();
- if (!params?.prompt) {
- throw new FirecrawlError("Prompt is required", 400);
- }
-
let jsonData: { urls: string[] } & ExtractParams<T> = { urls, ...params };
let jsonSchema: any;
try {
- jsonSchema = params?.schema ? zodToJsonSchema(params.schema) : undefined;
+ if (!params?.schema) {
+ jsonSchema = undefined;
+ } else if (params.schema instanceof zt.ZodType) {
+ jsonSchema = zodToJsonSchema(params.schema);
+ } else {
+ jsonSchema = params.schema;
+ }
} catch (error: any) {
- throw new FirecrawlError("Invalid schema. Use a valid Zod schema.", 400);
+ throw new FirecrawlError("Invalid schema. Schema must be either a valid Zod schema or JSON schema object.", 400);
}
try {