firecrawl 1.11.1 → 1.11.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +9 -2
- package/dist/index.d.cts +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +9 -2
- package/package.json +1 -1
- package/src/index.ts +10 -4
package/dist/index.cjs
CHANGED
|
@@ -36,6 +36,7 @@ __export(src_exports, {
|
|
|
36
36
|
});
|
|
37
37
|
module.exports = __toCommonJS(src_exports);
|
|
38
38
|
var import_axios = __toESM(require("axios"), 1);
|
|
39
|
+
var zt = __toESM(require("zod"), 1);
|
|
39
40
|
var import_zod_to_json_schema = require("zod-to-json-schema");
|
|
40
41
|
var import_isows = require("isows");
|
|
41
42
|
var import_typescript_event_target = require("typescript-event-target");
|
|
@@ -495,9 +496,15 @@ var FirecrawlApp = class {
|
|
|
495
496
|
let jsonData = { urls, ...params };
|
|
496
497
|
let jsonSchema;
|
|
497
498
|
try {
|
|
498
|
-
|
|
499
|
+
if (!params?.schema) {
|
|
500
|
+
jsonSchema = void 0;
|
|
501
|
+
} else if (params.schema instanceof zt.ZodType) {
|
|
502
|
+
jsonSchema = (0, import_zod_to_json_schema.zodToJsonSchema)(params.schema);
|
|
503
|
+
} else {
|
|
504
|
+
jsonSchema = params.schema;
|
|
505
|
+
}
|
|
499
506
|
} catch (error) {
|
|
500
|
-
throw new FirecrawlError("Invalid schema.
|
|
507
|
+
throw new FirecrawlError("Invalid schema. Schema must be either a valid Zod schema or JSON schema object.", 400);
|
|
501
508
|
}
|
|
502
509
|
try {
|
|
503
510
|
const response = await this.postRequest(
|
package/dist/index.d.cts
CHANGED
|
@@ -229,7 +229,7 @@ interface MapResponse {
|
|
|
229
229
|
*/
|
|
230
230
|
interface ExtractParams<LLMSchema extends zt.ZodSchema = any> {
|
|
231
231
|
prompt?: string;
|
|
232
|
-
schema?: LLMSchema;
|
|
232
|
+
schema?: LLMSchema | object;
|
|
233
233
|
systemPrompt?: string;
|
|
234
234
|
allowExternalLinks?: boolean;
|
|
235
235
|
includeSubdomains?: boolean;
|
package/dist/index.d.ts
CHANGED
|
@@ -229,7 +229,7 @@ interface MapResponse {
|
|
|
229
229
|
*/
|
|
230
230
|
interface ExtractParams<LLMSchema extends zt.ZodSchema = any> {
|
|
231
231
|
prompt?: string;
|
|
232
|
-
schema?: LLMSchema;
|
|
232
|
+
schema?: LLMSchema | object;
|
|
233
233
|
systemPrompt?: string;
|
|
234
234
|
allowExternalLinks?: boolean;
|
|
235
235
|
includeSubdomains?: boolean;
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// src/index.ts
|
|
2
2
|
import axios, { AxiosError } from "axios";
|
|
3
|
+
import * as zt from "zod";
|
|
3
4
|
import { zodToJsonSchema } from "zod-to-json-schema";
|
|
4
5
|
import { WebSocket } from "isows";
|
|
5
6
|
import { TypedEventTarget } from "typescript-event-target";
|
|
@@ -459,9 +460,15 @@ var FirecrawlApp = class {
|
|
|
459
460
|
let jsonData = { urls, ...params };
|
|
460
461
|
let jsonSchema;
|
|
461
462
|
try {
|
|
462
|
-
|
|
463
|
+
if (!params?.schema) {
|
|
464
|
+
jsonSchema = void 0;
|
|
465
|
+
} else if (params.schema instanceof zt.ZodType) {
|
|
466
|
+
jsonSchema = zodToJsonSchema(params.schema);
|
|
467
|
+
} else {
|
|
468
|
+
jsonSchema = params.schema;
|
|
469
|
+
}
|
|
463
470
|
} catch (error) {
|
|
464
|
-
throw new FirecrawlError("Invalid schema.
|
|
471
|
+
throw new FirecrawlError("Invalid schema. Schema must be either a valid Zod schema or JSON schema object.", 400);
|
|
465
472
|
}
|
|
466
473
|
try {
|
|
467
474
|
const response = await this.postRequest(
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import axios, { type AxiosResponse, type AxiosRequestHeaders, AxiosError } from "axios";
|
|
2
|
-
import
|
|
2
|
+
import * as zt from "zod";
|
|
3
3
|
import { zodToJsonSchema } from "zod-to-json-schema";
|
|
4
4
|
import { WebSocket } from "isows";
|
|
5
5
|
import { TypedEventTarget } from "typescript-event-target";
|
|
@@ -247,7 +247,7 @@ export interface MapResponse {
|
|
|
247
247
|
*/
|
|
248
248
|
export interface ExtractParams<LLMSchema extends zt.ZodSchema = any> {
|
|
249
249
|
prompt?: string;
|
|
250
|
-
schema?: LLMSchema;
|
|
250
|
+
schema?: LLMSchema | object;
|
|
251
251
|
systemPrompt?: string;
|
|
252
252
|
allowExternalLinks?: boolean;
|
|
253
253
|
includeSubdomains?: boolean;
|
|
@@ -838,9 +838,15 @@ export default class FirecrawlApp {
|
|
|
838
838
|
let jsonData: { urls: string[] } & ExtractParams<T> = { urls, ...params };
|
|
839
839
|
let jsonSchema: any;
|
|
840
840
|
try {
|
|
841
|
-
|
|
841
|
+
if (!params?.schema) {
|
|
842
|
+
jsonSchema = undefined;
|
|
843
|
+
} else if (params.schema instanceof zt.ZodType) {
|
|
844
|
+
jsonSchema = zodToJsonSchema(params.schema);
|
|
845
|
+
} else {
|
|
846
|
+
jsonSchema = params.schema;
|
|
847
|
+
}
|
|
842
848
|
} catch (error: any) {
|
|
843
|
-
throw new FirecrawlError("Invalid schema.
|
|
849
|
+
throw new FirecrawlError("Invalid schema. Schema must be either a valid Zod schema or JSON schema object.", 400);
|
|
844
850
|
}
|
|
845
851
|
|
|
846
852
|
try {
|