Nick: 1.2 - v1 llm extract

apps/js-sdk/firecrawl/build/cjs/index.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrawlWatcher = void 0;
 const axios_1 = __importDefault(require("axios"));
-const zod_1 = require("zod");
 const zod_to_json_schema_1 = require("zod-to-json-schema");
 const isows_1 = require("isows");
 const typescript_event_target_1 = require("typescript-event-target");
@@ -34,26 +33,13 @@ class FirecrawlApp {
             Authorization: `Bearer ${this.apiKey}`,
         };
         let jsonData = { url, ...params };
-        if (this.version === 'v0' && jsonData?.extractorOptions?.extractionSchema) {
-            let schema = jsonData.extractorOptions.extractionSchema;
-            // Check if schema is an instance of ZodSchema to correctly identify Zod schemas
-            if (schema instanceof zod_1.z.ZodSchema) {
+        if (jsonData?.extract?.schema) {
+            let schema = jsonData.extract.schema;
+            // Try parsing the schema as a Zod schema
+            try {
                 schema = (0, zod_to_json_schema_1.zodToJsonSchema)(schema);
             }
-            jsonData = {
-                ...jsonData,
-                extractorOptions: {
-                    ...jsonData.extractorOptions,
-                    extractionSchema: schema,
-                    mode: jsonData.extractorOptions.mode || "llm-extraction",
-                },
-            };
-        }
-        else if (this.version === 'v1' && jsonData?.extract?.schema) {
-            let schema = jsonData.extract.schema;
-            // Check if schema is an instance of ZodSchema to correctly identify Zod schemas
-            if (schema instanceof zod_1.z.ZodSchema) {
-                schema = (0, zod_to_json_schema_1.zodToJsonSchema)(schema);
+            catch (error) {
             }
             jsonData = {
                 ...jsonData,

apps/js-sdk/firecrawl/build/esm/index.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import { z } from "zod";
 import { zodToJsonSchema } from "zod-to-json-schema";
 import { WebSocket } from "isows";
 import { TypedEventTarget } from "typescript-event-target";
@@ -28,26 +27,13 @@ export default class FirecrawlApp {
             Authorization: `Bearer ${this.apiKey}`,
         };
         let jsonData = { url, ...params };
-        if (this.version === 'v0' && jsonData?.extractorOptions?.extractionSchema) {
-            let schema = jsonData.extractorOptions.extractionSchema;
-            // Check if schema is an instance of ZodSchema to correctly identify Zod schemas
-            if (schema instanceof z.ZodSchema) {
+        if (jsonData?.extract?.schema) {
+            let schema = jsonData.extract.schema;
+            // Try parsing the schema as a Zod schema
+            try {
                 schema = zodToJsonSchema(schema);
             }
-            jsonData = {
-                ...jsonData,
-                extractorOptions: {
-                    ...jsonData.extractorOptions,
-                    extractionSchema: schema,
-                    mode: jsonData.extractorOptions.mode || "llm-extraction",
-                },
-            };
-        }
-        else if (this.version === 'v1' && jsonData?.extract?.schema) {
-            let schema = jsonData.extract.schema;
-            // Check if schema is an instance of ZodSchema to correctly identify Zod schemas
-            if (schema instanceof z.ZodSchema) {
-                schema = zodToJsonSchema(schema);
+            catch (error) {
             }
             jsonData = {
                 ...jsonData,

apps/js-sdk/firecrawl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mendable/firecrawl-js",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "JavaScript SDK for Firecrawl API",
   "main": "build/cjs/index.js",
   "types": "types/index.d.ts",

apps/js-sdk/firecrawl/types/index.d.ts

@@ -1,6 +1,6 @@
 import { AxiosResponse, AxiosRequestHeaders } from "axios";
-import { TypedEventTarget } from "typescript-event-target";
 import { z } from "zod";
+import { TypedEventTarget } from "typescript-event-target";
 /**
  * Configuration interface for FirecrawlApp.
  * @param apiKey - Optional API key for authentication.
@@ -73,13 +73,13 @@ export interface ScrapeParams {
     includeTags?: string[];
     excludeTags?: string[];
     onlyMainContent?: boolean;
-    waitFor?: number;
-    timeout?: number;
     extract?: {
         prompt?: string;
         schema?: z.ZodSchema | any;
         systemPrompt?: string;
     };
+    waitFor?: number;
+    timeout?: number;
 }
 /**
  * Response interface for scraping operations.