firecrawl-cli 0.0.4 → 0.0.6
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/__tests__/commands/scrape.test.js +21 -6
- package/dist/__tests__/commands/scrape.test.js.map +1 -1
- package/dist/__tests__/utils/config.test.d.ts +5 -0
- package/dist/__tests__/utils/config.test.d.ts.map +1 -0
- package/dist/__tests__/utils/config.test.js +217 -0
- package/dist/__tests__/utils/config.test.js.map +1 -0
- package/dist/commands/crawl.d.ts.map +1 -1
- package/dist/commands/crawl.js +2 -7
- package/dist/commands/crawl.js.map +1 -1
- package/dist/commands/credit-usage.d.ts.map +1 -1
- package/dist/commands/credit-usage.js +5 -4
- package/dist/commands/credit-usage.js.map +1 -1
- package/dist/commands/map.d.ts.map +1 -1
- package/dist/commands/map.js +1 -6
- package/dist/commands/map.js.map +1 -1
- package/dist/commands/scrape.d.ts.map +1 -1
- package/dist/commands/scrape.js +64 -39
- package/dist/commands/scrape.js.map +1 -1
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/types/scrape.d.ts +4 -2
- package/dist/types/scrape.d.ts.map +1 -1
- package/dist/utils/client.d.ts.map +1 -1
- package/dist/utils/client.js +22 -1
- package/dist/utils/client.js.map +1 -1
- package/dist/utils/options.d.ts +7 -1
- package/dist/utils/options.d.ts.map +1 -1
- package/dist/utils/options.js +56 -1
- package/dist/utils/options.js.map +1 -1
- package/dist/utils/output.d.ts +7 -5
- package/dist/utils/output.d.ts.map +1 -1
- package/dist/utils/output.js +83 -48
- package/dist/utils/output.js.map +1 -1
- package/package.json +1 -1
|
@@ -53,7 +53,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
|
|
|
53
53
|
mockClient.scrape.mockResolvedValue(mockResponse);
|
|
54
54
|
await (0, scrape_1.executeScrape)({
|
|
55
55
|
url: 'https://example.com',
|
|
56
|
-
|
|
56
|
+
formats: ['html'],
|
|
57
57
|
});
|
|
58
58
|
(0, vitest_1.expect)(mockClient.scrape).toHaveBeenCalledWith('https://example.com', {
|
|
59
59
|
formats: ['html'],
|
|
@@ -81,7 +81,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
|
|
|
81
81
|
mockClient.scrape.mockResolvedValue(mockResponse);
|
|
82
82
|
await (0, scrape_1.executeScrape)({
|
|
83
83
|
url: 'https://example.com',
|
|
84
|
-
|
|
84
|
+
formats: ['markdown'],
|
|
85
85
|
screenshot: true,
|
|
86
86
|
});
|
|
87
87
|
(0, vitest_1.expect)(mockClient.scrape).toHaveBeenCalledWith('https://example.com', {
|
|
@@ -141,7 +141,7 @@ vitest_1.vi.mock('../../utils/client', async () => {
|
|
|
141
141
|
mockClient.scrape.mockResolvedValue(mockResponse);
|
|
142
142
|
await (0, scrape_1.executeScrape)({
|
|
143
143
|
url: 'https://example.com',
|
|
144
|
-
|
|
144
|
+
formats: ['markdown'],
|
|
145
145
|
screenshot: true,
|
|
146
146
|
onlyMainContent: true,
|
|
147
147
|
waitFor: 3000,
|
|
@@ -211,21 +211,36 @@ vitest_1.vi.mock('../../utils/client', async () => {
|
|
|
211
211
|
});
|
|
212
212
|
(0, vitest_1.describe)('Type safety', () => {
|
|
213
213
|
(0, vitest_1.it)('should accept valid ScrapeFormat types', async () => {
|
|
214
|
-
const
|
|
214
|
+
const formatList = [
|
|
215
215
|
'markdown',
|
|
216
216
|
'html',
|
|
217
217
|
'rawHtml',
|
|
218
218
|
'links',
|
|
219
219
|
];
|
|
220
|
-
for (const format of
|
|
220
|
+
for (const format of formatList) {
|
|
221
221
|
mockClient.scrape.mockResolvedValue({ [format]: 'test' });
|
|
222
222
|
const result = await (0, scrape_1.executeScrape)({
|
|
223
223
|
url: 'https://example.com',
|
|
224
|
-
format,
|
|
224
|
+
formats: [format],
|
|
225
225
|
});
|
|
226
226
|
(0, vitest_1.expect)(result.success).toBe(true);
|
|
227
227
|
}
|
|
228
228
|
});
|
|
229
|
+
(0, vitest_1.it)('should accept multiple formats', async () => {
|
|
230
|
+
mockClient.scrape.mockResolvedValue({
|
|
231
|
+
markdown: '# Test',
|
|
232
|
+
links: ['http://a.com'],
|
|
233
|
+
images: ['http://img.com/a.png'],
|
|
234
|
+
});
|
|
235
|
+
const result = await (0, scrape_1.executeScrape)({
|
|
236
|
+
url: 'https://example.com',
|
|
237
|
+
formats: ['markdown', 'links', 'images'],
|
|
238
|
+
});
|
|
239
|
+
(0, vitest_1.expect)(result.success).toBe(true);
|
|
240
|
+
(0, vitest_1.expect)(mockClient.scrape).toHaveBeenCalledWith('https://example.com', {
|
|
241
|
+
formats: ['markdown', 'links', 'images'],
|
|
242
|
+
});
|
|
243
|
+
});
|
|
229
244
|
});
|
|
230
245
|
});
|
|
231
246
|
//# sourceMappingURL=scrape.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scrape.test.js","sourceRoot":"","sources":["../../../src/__tests__/commands/scrape.test.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAEH,mCAAyE;AACzE,kDAAsD;AACtD,+CAA+C;AAC/C,+CAAsD;AACtD,sDAA+D;AAE/D,mCAAmC;AACnC,WAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;IACvC,MAAM,MAAM,GAAG,MAAM,WAAE,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;IAC3D,OAAO;QACL,GAAG,MAAM;QACT,SAAS,EAAE,WAAE,CAAC,EAAE,EAAE;KACnB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAA,iBAAQ,EAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAI,UAAe,CAAC;IAEpB,IAAA,mBAAU,EAAC,GAAG,EAAE;QACd,IAAA,uBAAS,GAAE,CAAC;QACZ,sCAAsC;QACtC,IAAA,yBAAgB,EAAC;YACf,MAAM,EAAE,cAAc;YACtB,MAAM,EAAE,2BAA2B;SACpC,CAAC,CAAC;QAEH,qBAAqB;QACrB,UAAU,GAAG;YACX,MAAM,EAAE,WAAE,CAAC,EAAE,EAAE;SAChB,CAAC;QAEF,oCAAoC;QACpC,WAAE,CAAC,MAAM,CAAC,kBAAS,CAAC,CAAC,eAAe,CAAC,UAAiB,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,IAAA,kBAAS,EAAC,GAAG,EAAE;QACb,IAAA,0BAAY,GAAE,CAAC;QACf,WAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,IAAA,iBAAQ,EAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,IAAA,WAAE,EAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;YAC/E,MAAM,YAAY,GAAG,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;YACpD,UAAU,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;YAElD,MAAM,IAAA,sBAAa,EAAC;gBAClB,GAAG,EAAE,qBAAqB;aAC3B,CAAC,CAAC;YAEH,IAAA,eAAM,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACnD,IAAA,eAAM,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,qBAAqB,EAAE;gBACpE,OAAO,EAAE,CAAC,UAAU,CAAC;aACtB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAA,WAAE,EAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;YACxD,MAAM,YAAY,GAAG,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;YAClD,UAAU,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;YAElD,MAAM,IAAA,sBAAa,EAAC;gBAClB,GAAG,EAAE,qBAAqB;gBAC1B,
|
|
1
|
+
{"version":3,"file":"scrape.test.js","sourceRoot":"","sources":["../../../src/__tests__/commands/scrape.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/utils/config.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}
|
|
@@ -0,0 +1,217 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Tests for config fallback priority
|
|
4
|
+
*/
|
|
5
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
8
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
9
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
10
|
+
}
|
|
11
|
+
Object.defineProperty(o, k2, desc);
|
|
12
|
+
}) : (function(o, m, k, k2) {
|
|
13
|
+
if (k2 === undefined) k2 = k;
|
|
14
|
+
o[k2] = m[k];
|
|
15
|
+
}));
|
|
16
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
17
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
18
|
+
}) : function(o, v) {
|
|
19
|
+
o["default"] = v;
|
|
20
|
+
});
|
|
21
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
22
|
+
var ownKeys = function(o) {
|
|
23
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
24
|
+
var ar = [];
|
|
25
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
26
|
+
return ar;
|
|
27
|
+
};
|
|
28
|
+
return ownKeys(o);
|
|
29
|
+
};
|
|
30
|
+
return function (mod) {
|
|
31
|
+
if (mod && mod.__esModule) return mod;
|
|
32
|
+
var result = {};
|
|
33
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
34
|
+
__setModuleDefault(result, mod);
|
|
35
|
+
return result;
|
|
36
|
+
};
|
|
37
|
+
})();
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
const vitest_1 = require("vitest");
|
|
40
|
+
const config_1 = require("../../utils/config");
|
|
41
|
+
const client_1 = require("../../utils/client");
|
|
42
|
+
const credentials = __importStar(require("../../utils/credentials"));
|
|
43
|
+
// Mock credentials module
|
|
44
|
+
vitest_1.vi.mock('../../utils/credentials', () => ({
|
|
45
|
+
loadCredentials: vitest_1.vi.fn(),
|
|
46
|
+
saveCredentials: vitest_1.vi.fn(),
|
|
47
|
+
}));
|
|
48
|
+
(0, vitest_1.describe)('Config Fallback Priority', () => {
|
|
49
|
+
const originalEnv = process.env;
|
|
50
|
+
(0, vitest_1.beforeEach)(() => {
|
|
51
|
+
// Reset everything before each test
|
|
52
|
+
(0, client_1.resetClient)();
|
|
53
|
+
(0, config_1.resetConfig)();
|
|
54
|
+
vitest_1.vi.clearAllMocks();
|
|
55
|
+
// Clear env vars
|
|
56
|
+
delete process.env.FIRECRAWL_API_KEY;
|
|
57
|
+
delete process.env.FIRECRAWL_API_URL;
|
|
58
|
+
// Mock loadCredentials to return null by default
|
|
59
|
+
vitest_1.vi.mocked(credentials.loadCredentials).mockReturnValue(null);
|
|
60
|
+
});
|
|
61
|
+
(0, vitest_1.afterEach)(() => {
|
|
62
|
+
// Restore original env
|
|
63
|
+
process.env = originalEnv;
|
|
64
|
+
});
|
|
65
|
+
(0, vitest_1.describe)('initializeConfig fallback priority', () => {
|
|
66
|
+
(0, vitest_1.it)('should prioritize provided config over env vars', () => {
|
|
67
|
+
process.env.FIRECRAWL_API_KEY = 'env-api-key';
|
|
68
|
+
process.env.FIRECRAWL_API_URL = 'https://env-api-url.com';
|
|
69
|
+
(0, config_1.initializeConfig)({
|
|
70
|
+
apiKey: 'provided-api-key',
|
|
71
|
+
apiUrl: 'https://provided-api-url.com',
|
|
72
|
+
});
|
|
73
|
+
const config = (0, config_1.getConfig)();
|
|
74
|
+
(0, vitest_1.expect)(config.apiKey).toBe('provided-api-key');
|
|
75
|
+
(0, vitest_1.expect)(config.apiUrl).toBe('https://provided-api-url.com');
|
|
76
|
+
});
|
|
77
|
+
(0, vitest_1.it)('should use env vars when provided config is not set', () => {
|
|
78
|
+
process.env.FIRECRAWL_API_KEY = 'env-api-key';
|
|
79
|
+
process.env.FIRECRAWL_API_URL = 'https://env-api-url.com';
|
|
80
|
+
(0, config_1.initializeConfig)({});
|
|
81
|
+
const config = (0, config_1.getConfig)();
|
|
82
|
+
(0, vitest_1.expect)(config.apiKey).toBe('env-api-key');
|
|
83
|
+
(0, vitest_1.expect)(config.apiUrl).toBe('https://env-api-url.com');
|
|
84
|
+
});
|
|
85
|
+
(0, vitest_1.it)('should fallback to stored credentials when env vars are not set', () => {
|
|
86
|
+
vitest_1.vi.mocked(credentials.loadCredentials).mockReturnValue({
|
|
87
|
+
apiKey: 'stored-api-key',
|
|
88
|
+
apiUrl: 'https://stored-api-url.com',
|
|
89
|
+
});
|
|
90
|
+
(0, config_1.initializeConfig)({});
|
|
91
|
+
const config = (0, config_1.getConfig)();
|
|
92
|
+
(0, vitest_1.expect)(config.apiKey).toBe('stored-api-key');
|
|
93
|
+
(0, vitest_1.expect)(config.apiUrl).toBe('https://stored-api-url.com');
|
|
94
|
+
});
|
|
95
|
+
(0, vitest_1.it)('should prioritize provided config > env vars > stored credentials', () => {
|
|
96
|
+
process.env.FIRECRAWL_API_KEY = 'env-api-key';
|
|
97
|
+
vitest_1.vi.mocked(credentials.loadCredentials).mockReturnValue({
|
|
98
|
+
apiKey: 'stored-api-key',
|
|
99
|
+
});
|
|
100
|
+
// Provided config should win
|
|
101
|
+
(0, config_1.initializeConfig)({ apiKey: 'provided-api-key' });
|
|
102
|
+
(0, vitest_1.expect)((0, config_1.getConfig)().apiKey).toBe('provided-api-key');
|
|
103
|
+
// Reset and test env var priority
|
|
104
|
+
(0, config_1.resetConfig)();
|
|
105
|
+
(0, config_1.initializeConfig)({});
|
|
106
|
+
(0, vitest_1.expect)((0, config_1.getConfig)().apiKey).toBe('env-api-key');
|
|
107
|
+
// Reset and test stored credentials fallback
|
|
108
|
+
(0, config_1.resetConfig)();
|
|
109
|
+
delete process.env.FIRECRAWL_API_KEY;
|
|
110
|
+
(0, config_1.initializeConfig)({});
|
|
111
|
+
(0, vitest_1.expect)((0, config_1.getConfig)().apiKey).toBe('stored-api-key');
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
(0, vitest_1.describe)('getClient fallback priority', () => {
|
|
115
|
+
(0, vitest_1.beforeEach)(() => {
|
|
116
|
+
// Set up base config
|
|
117
|
+
(0, config_1.initializeConfig)({
|
|
118
|
+
apiKey: 'global-api-key',
|
|
119
|
+
apiUrl: 'https://global-url.com',
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
(0, vitest_1.it)('should prioritize options over global config', () => {
|
|
123
|
+
const client = (0, client_1.getClient)({ apiKey: 'option-api-key' });
|
|
124
|
+
// Verify client was created with option API key
|
|
125
|
+
// We can't directly inspect the client, but we can check the config was updated
|
|
126
|
+
const config = (0, config_1.getConfig)();
|
|
127
|
+
(0, vitest_1.expect)(config.apiKey).toBe('option-api-key');
|
|
128
|
+
});
|
|
129
|
+
(0, vitest_1.it)('should use global config when options not provided', () => {
|
|
130
|
+
(0, client_1.getClient)();
|
|
131
|
+
const config = (0, config_1.getConfig)();
|
|
132
|
+
(0, vitest_1.expect)(config.apiKey).toBe('global-api-key');
|
|
133
|
+
(0, vitest_1.expect)(config.apiUrl).toBe('https://global-url.com');
|
|
134
|
+
});
|
|
135
|
+
(0, vitest_1.it)('should merge options with global config', () => {
|
|
136
|
+
(0, config_1.initializeConfig)({
|
|
137
|
+
apiKey: 'global-api-key',
|
|
138
|
+
apiUrl: 'https://global-url.com',
|
|
139
|
+
timeoutMs: 30000,
|
|
140
|
+
});
|
|
141
|
+
(0, client_1.getClient)({ apiKey: 'option-api-key' });
|
|
142
|
+
const config = (0, config_1.getConfig)();
|
|
143
|
+
(0, vitest_1.expect)(config.apiKey).toBe('option-api-key'); // Option overrides
|
|
144
|
+
(0, vitest_1.expect)(config.apiUrl).toBe('https://global-url.com'); // Global preserved
|
|
145
|
+
(0, vitest_1.expect)(config.timeoutMs).toBe(30000); // Global preserved
|
|
146
|
+
});
|
|
147
|
+
(0, vitest_1.it)('should handle undefined options gracefully', () => {
|
|
148
|
+
(0, config_1.initializeConfig)({ apiKey: 'global-api-key' });
|
|
149
|
+
(0, client_1.getClient)({ apiKey: undefined });
|
|
150
|
+
// When undefined is passed, it should not override
|
|
151
|
+
const config = (0, config_1.getConfig)();
|
|
152
|
+
(0, vitest_1.expect)(config.apiKey).toBe('global-api-key');
|
|
153
|
+
});
|
|
154
|
+
});
|
|
155
|
+
(0, vitest_1.describe)('Combined fallback chain', () => {
|
|
156
|
+
(0, vitest_1.it)('should follow: options > global config > env vars > stored credentials', () => {
|
|
157
|
+
// Set up stored credentials
|
|
158
|
+
vitest_1.vi.mocked(credentials.loadCredentials).mockReturnValue({
|
|
159
|
+
apiKey: 'stored-api-key',
|
|
160
|
+
});
|
|
161
|
+
// Set up env vars
|
|
162
|
+
process.env.FIRECRAWL_API_KEY = 'env-api-key';
|
|
163
|
+
// Initialize with env vars (should use env > stored)
|
|
164
|
+
(0, config_1.initializeConfig)({});
|
|
165
|
+
(0, vitest_1.expect)((0, config_1.getConfig)().apiKey).toBe('env-api-key');
|
|
166
|
+
// Options should override everything
|
|
167
|
+
(0, client_1.getClient)({ apiKey: 'option-api-key' });
|
|
168
|
+
(0, vitest_1.expect)((0, config_1.getConfig)().apiKey).toBe('option-api-key');
|
|
169
|
+
// After reset, should fall back to env
|
|
170
|
+
(0, config_1.resetConfig)();
|
|
171
|
+
(0, config_1.initializeConfig)({});
|
|
172
|
+
(0, vitest_1.expect)((0, config_1.getConfig)().apiKey).toBe('env-api-key');
|
|
173
|
+
// After clearing env, should fall back to stored
|
|
174
|
+
(0, config_1.resetConfig)();
|
|
175
|
+
delete process.env.FIRECRAWL_API_KEY;
|
|
176
|
+
(0, config_1.initializeConfig)({});
|
|
177
|
+
(0, vitest_1.expect)((0, config_1.getConfig)().apiKey).toBe('stored-api-key');
|
|
178
|
+
});
|
|
179
|
+
(0, vitest_1.it)('should update global config when getClient is called with options', () => {
|
|
180
|
+
process.env.FIRECRAWL_API_KEY = 'env-api-key';
|
|
181
|
+
(0, config_1.initializeConfig)({});
|
|
182
|
+
// Initially should use env var
|
|
183
|
+
(0, vitest_1.expect)((0, config_1.getConfig)().apiKey).toBe('env-api-key');
|
|
184
|
+
// Call getClient with option
|
|
185
|
+
(0, client_1.getClient)({ apiKey: 'option-api-key' });
|
|
186
|
+
// Global config should now be updated
|
|
187
|
+
(0, vitest_1.expect)((0, config_1.getConfig)().apiKey).toBe('option-api-key');
|
|
188
|
+
// Subsequent getClient calls without options should use updated global config
|
|
189
|
+
(0, client_1.resetClient)(); // Reset client instance
|
|
190
|
+
(0, client_1.getClient)();
|
|
191
|
+
(0, vitest_1.expect)((0, config_1.getConfig)().apiKey).toBe('option-api-key');
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
(0, vitest_1.describe)('updateConfig behavior', () => {
|
|
195
|
+
(0, vitest_1.it)('should merge with existing config', () => {
|
|
196
|
+
(0, config_1.initializeConfig)({
|
|
197
|
+
apiKey: 'initial-key',
|
|
198
|
+
apiUrl: 'https://initial-url.com',
|
|
199
|
+
});
|
|
200
|
+
(0, config_1.updateConfig)({ apiKey: 'updated-key' });
|
|
201
|
+
const config = (0, config_1.getConfig)();
|
|
202
|
+
(0, vitest_1.expect)(config.apiKey).toBe('updated-key');
|
|
203
|
+
(0, vitest_1.expect)(config.apiUrl).toBe('https://initial-url.com'); // Should be preserved
|
|
204
|
+
});
|
|
205
|
+
(0, vitest_1.it)('should allow partial updates', () => {
|
|
206
|
+
(0, config_1.initializeConfig)({
|
|
207
|
+
apiKey: 'key1',
|
|
208
|
+
apiUrl: 'https://url1.com',
|
|
209
|
+
});
|
|
210
|
+
(0, config_1.updateConfig)({ apiUrl: 'https://url2.com' });
|
|
211
|
+
const config = (0, config_1.getConfig)();
|
|
212
|
+
(0, vitest_1.expect)(config.apiKey).toBe('key1'); // Should be preserved
|
|
213
|
+
(0, vitest_1.expect)(config.apiUrl).toBe('https://url2.com'); // Should be updated
|
|
214
|
+
});
|
|
215
|
+
});
|
|
216
|
+
});
|
|
217
|
+
//# sourceMappingURL=config.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../src/__tests__/utils/config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crawl.d.ts","sourceRoot":"","sources":["../../src/commands/crawl.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,WAAW,EACX,iBAAiB,EAClB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"crawl.d.ts","sourceRoot":"","sources":["../../src/commands/crawl.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,WAAW,EACX,iBAAiB,EAClB,MAAM,gBAAgB,CAAC;AAmCxB;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,WAAW,GAAG,iBAAiB,CAAC,CAoI1C;AAiCD;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAyD7E"}
|
package/dist/commands/crawl.js
CHANGED
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.executeCrawl = executeCrawl;
|
|
7
7
|
exports.handleCrawlCommand = handleCrawlCommand;
|
|
8
8
|
const client_1 = require("../utils/client");
|
|
9
|
-
const config_1 = require("../utils/config");
|
|
10
9
|
const job_1 = require("../utils/job");
|
|
11
10
|
const output_1 = require("../utils/output");
|
|
12
11
|
/**
|
|
@@ -14,7 +13,7 @@ const output_1 = require("../utils/output");
|
|
|
14
13
|
*/
|
|
15
14
|
async function checkCrawlStatus(jobId, options) {
|
|
16
15
|
try {
|
|
17
|
-
const app = (0, client_1.getClient)();
|
|
16
|
+
const app = (0, client_1.getClient)({ apiKey: options.apiKey });
|
|
18
17
|
const status = await app.getCrawlStatus(jobId);
|
|
19
18
|
return {
|
|
20
19
|
success: true,
|
|
@@ -40,11 +39,7 @@ async function checkCrawlStatus(jobId, options) {
|
|
|
40
39
|
*/
|
|
41
40
|
async function executeCrawl(options) {
|
|
42
41
|
try {
|
|
43
|
-
|
|
44
|
-
if (options.apiKey) {
|
|
45
|
-
(0, config_1.updateConfig)({ apiKey: options.apiKey });
|
|
46
|
-
}
|
|
47
|
-
const app = (0, client_1.getClient)();
|
|
42
|
+
const app = (0, client_1.getClient)({ apiKey: options.apiKey });
|
|
48
43
|
const { urlOrJobId, status, wait, pollInterval, timeout } = options;
|
|
49
44
|
// If status flag is set or input looks like a job ID, check status
|
|
50
45
|
if (status || (0, job_1.isJobId)(urlOrJobId)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crawl.js","sourceRoot":"","sources":["../../src/commands/crawl.ts"],"names":[],"mappings":";AAAA;;GAEG;;
|
|
1
|
+
{"version":3,"file":"crawl.js","sourceRoot":"","sources":["../../src/commands/crawl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credit-usage.d.ts","sourceRoot":"","sources":["../../src/commands/credit-usage.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"credit-usage.d.ts","sourceRoot":"","sources":["../../src/commands/credit-usage.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE;QACL,gBAAgB,EAAE,MAAM,CAAC;QACzB,WAAW,EAAE,MAAM,CAAC;QACpB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;QAClC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;KACjC,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uBAAuB;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,4BAA4B;IAC5B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,+BAA+B;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAuD5B;AA6CD;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CA6Cf"}
|
|
@@ -41,20 +41,21 @@ exports.handleCreditUsageCommand = handleCreditUsageCommand;
|
|
|
41
41
|
const fs = __importStar(require("fs"));
|
|
42
42
|
const path = __importStar(require("path"));
|
|
43
43
|
const config_1 = require("../utils/config");
|
|
44
|
+
const client_1 = require("../utils/client");
|
|
44
45
|
/**
|
|
45
46
|
* Execute the credit usage command
|
|
46
47
|
*/
|
|
47
48
|
async function executeCreditUsage(options = {}) {
|
|
48
49
|
try {
|
|
49
|
-
// Update
|
|
50
|
+
// Update config if API key provided (via getClient)
|
|
50
51
|
if (options.apiKey) {
|
|
51
|
-
(0,
|
|
52
|
+
(0, client_1.getClient)({ apiKey: options.apiKey });
|
|
52
53
|
}
|
|
53
54
|
// Get config and validate API key
|
|
54
55
|
const config = (0, config_1.getConfig)();
|
|
55
|
-
|
|
56
|
+
const apiKey = options.apiKey || config.apiKey;
|
|
57
|
+
(0, config_1.validateConfig)(apiKey);
|
|
56
58
|
const apiUrl = config.apiUrl || 'https://api.firecrawl.dev';
|
|
57
|
-
const apiKey = config.apiKey;
|
|
58
59
|
// Make the API call to /v2/team/credit-usage
|
|
59
60
|
const url = `${apiUrl.replace(/\/$/, '')}/v2/team/credit-usage`;
|
|
60
61
|
const response = await fetch(url, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credit-usage.js","sourceRoot":"","sources":["../../src/commands/credit-usage.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"credit-usage.js","sourceRoot":"","sources":["../../src/commands/credit-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../../src/commands/map.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../../src/commands/map.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAI1D;;GAEG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CA8CxE;AAYD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBzE"}
|
package/dist/commands/map.js
CHANGED
|
@@ -6,18 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.executeMap = executeMap;
|
|
7
7
|
exports.handleMapCommand = handleMapCommand;
|
|
8
8
|
const client_1 = require("../utils/client");
|
|
9
|
-
const config_1 = require("../utils/config");
|
|
10
9
|
const output_1 = require("../utils/output");
|
|
11
10
|
/**
|
|
12
11
|
* Execute map command
|
|
13
12
|
*/
|
|
14
13
|
async function executeMap(options) {
|
|
15
14
|
try {
|
|
16
|
-
|
|
17
|
-
if (options.apiKey) {
|
|
18
|
-
(0, config_1.updateConfig)({ apiKey: options.apiKey });
|
|
19
|
-
}
|
|
20
|
-
const app = (0, client_1.getClient)();
|
|
15
|
+
const app = (0, client_1.getClient)({ apiKey: options.apiKey });
|
|
21
16
|
const { urlOrJobId } = options;
|
|
22
17
|
// Build map options
|
|
23
18
|
const mapOptions = {};
|
package/dist/commands/map.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map.js","sourceRoot":"","sources":["../../src/commands/map.ts"],"names":[],"mappings":";AAAA;;GAEG;;
|
|
1
|
+
{"version":3,"file":"map.js","sourceRoot":"","sources":["../../src/commands/map.ts"],"names":[],"mappings":";AAAA;;GAEG;;AASH,gCA8CC;AAeD,4CAyBC;AA5FD,4CAA4C;AAC5C,4CAA8C;AAE9C;;GAEG;AACI,KAAK,UAAU,UAAU,CAAC,OAAmB;IAClD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAA,kBAAS,EAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAClD,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAE/B,oBAAoB;QACpB,MAAM,UAAU,GAAQ,EAAE,CAAC;QAE3B,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAChC,UAAU,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QACnC,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,UAAU,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QACrC,CAAC;QACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QACvC,CAAC;QACD,IAAI,OAAO,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YAC5C,UAAU,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QAC3D,CAAC;QACD,IAAI,OAAO,CAAC,qBAAqB,KAAK,SAAS,EAAE,CAAC;YAChD,UAAU,CAAC,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;QACnE,CAAC;QACD,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAClC,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,0BAA0B;QACzE,CAAC;QAED,yCAAyC;QACzC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAEtD,OAAO;YACL,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACJ,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC;oBACvC,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,WAAW,EAAE,IAAI,CAAC,WAAW;iBAC9B,CAAC,CAAC;aACJ;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB;SACzE,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB,CAAC,IAAuB;IAChD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IAEpC,sCAAsC;IACtC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAC9D,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,gBAAgB,CAAC,OAAmB;IACxD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;IAEzC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IAED,IAAI,aAAqB,CAAC;IAE1B,wCAAwC;IACxC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,aAAa,GAAG,OAAO,CAAC,MAAM;YAC5B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/D,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;SAAM,CAAC;QACN,sDAAsD;QACtD,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,IAAA,oBAAW,EAAC,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC/D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scrape.d.ts","sourceRoot":"","sources":["../../src/commands/scrape.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"scrape.d.ts","sourceRoot":"","sources":["../../src/commands/scrape.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EAEb,MAAM,iBAAiB,CAAC;AAoCzB;;GAEG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAqEvB;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,IAAI,CAAC,CAef"}
|
package/dist/commands/scrape.js
CHANGED
|
@@ -6,57 +6,74 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.executeScrape = executeScrape;
|
|
7
7
|
exports.handleScrapeCommand = handleScrapeCommand;
|
|
8
8
|
const client_1 = require("../utils/client");
|
|
9
|
-
const config_1 = require("../utils/config");
|
|
10
9
|
const output_1 = require("../utils/output");
|
|
10
|
+
/**
|
|
11
|
+
* Output timing information if requested
|
|
12
|
+
*/
|
|
13
|
+
function outputTiming(options, requestStartTime, requestEndTime, error) {
|
|
14
|
+
if (!options.timing)
|
|
15
|
+
return;
|
|
16
|
+
const requestDuration = requestEndTime - requestStartTime;
|
|
17
|
+
const timingInfo = {
|
|
18
|
+
url: options.url,
|
|
19
|
+
requestTime: new Date(requestStartTime).toISOString(),
|
|
20
|
+
duration: `${requestDuration}ms`,
|
|
21
|
+
status: error ? 'error' : 'success',
|
|
22
|
+
};
|
|
23
|
+
if (error) {
|
|
24
|
+
timingInfo.error = error instanceof Error ? error.message : 'Unknown error';
|
|
25
|
+
}
|
|
26
|
+
console.error('Timing:', JSON.stringify(timingInfo, null, 2));
|
|
27
|
+
}
|
|
11
28
|
/**
|
|
12
29
|
* Execute the scrape command
|
|
13
30
|
*/
|
|
14
31
|
async function executeScrape(options) {
|
|
32
|
+
// Get client instance (updates global config if apiKey provided)
|
|
33
|
+
const app = (0, client_1.getClient)({ apiKey: options.apiKey });
|
|
34
|
+
// Build scrape options
|
|
35
|
+
const formats = [];
|
|
36
|
+
// Add requested formats
|
|
37
|
+
if (options.formats && options.formats.length > 0) {
|
|
38
|
+
formats.push(...options.formats);
|
|
39
|
+
}
|
|
40
|
+
// Add screenshot format if requested and not already included
|
|
41
|
+
if (options.screenshot && !formats.includes('screenshot')) {
|
|
42
|
+
formats.push('screenshot');
|
|
43
|
+
}
|
|
44
|
+
// If no formats specified, default to markdown
|
|
45
|
+
if (formats.length === 0) {
|
|
46
|
+
formats.push('markdown');
|
|
47
|
+
}
|
|
48
|
+
const scrapeParams = {
|
|
49
|
+
formats,
|
|
50
|
+
};
|
|
51
|
+
if (options.onlyMainContent !== undefined) {
|
|
52
|
+
scrapeParams.onlyMainContent = options.onlyMainContent;
|
|
53
|
+
}
|
|
54
|
+
if (options.waitFor !== undefined) {
|
|
55
|
+
scrapeParams.waitFor = options.waitFor;
|
|
56
|
+
}
|
|
57
|
+
if (options.includeTags && options.includeTags.length > 0) {
|
|
58
|
+
scrapeParams.includeTags = options.includeTags;
|
|
59
|
+
}
|
|
60
|
+
if (options.excludeTags && options.excludeTags.length > 0) {
|
|
61
|
+
scrapeParams.excludeTags = options.excludeTags;
|
|
62
|
+
}
|
|
63
|
+
// Execute scrape with timing - only wrap the scrape call in try-catch
|
|
64
|
+
const requestStartTime = Date.now();
|
|
15
65
|
try {
|
|
16
|
-
// Update global config if API key is provided via options
|
|
17
|
-
if (options.apiKey) {
|
|
18
|
-
(0, config_1.updateConfig)({ apiKey: options.apiKey });
|
|
19
|
-
}
|
|
20
|
-
// Get client instance (uses global config)
|
|
21
|
-
const app = (0, client_1.getClient)();
|
|
22
|
-
// Build scrape options
|
|
23
|
-
const formats = [];
|
|
24
|
-
if (options.format) {
|
|
25
|
-
formats.push(options.format);
|
|
26
|
-
}
|
|
27
|
-
if (options.screenshot) {
|
|
28
|
-
// Add screenshot format if not already included
|
|
29
|
-
if (!formats.includes('screenshot')) {
|
|
30
|
-
formats.push('screenshot');
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
// If no formats specified, default to markdown
|
|
34
|
-
if (formats.length === 0) {
|
|
35
|
-
formats.push('markdown');
|
|
36
|
-
}
|
|
37
|
-
const scrapeParams = {
|
|
38
|
-
formats,
|
|
39
|
-
};
|
|
40
|
-
if (options.onlyMainContent !== undefined) {
|
|
41
|
-
scrapeParams.onlyMainContent = options.onlyMainContent;
|
|
42
|
-
}
|
|
43
|
-
if (options.waitFor !== undefined) {
|
|
44
|
-
scrapeParams.waitFor = options.waitFor;
|
|
45
|
-
}
|
|
46
|
-
if (options.includeTags && options.includeTags.length > 0) {
|
|
47
|
-
scrapeParams.includeTags = options.includeTags;
|
|
48
|
-
}
|
|
49
|
-
if (options.excludeTags && options.excludeTags.length > 0) {
|
|
50
|
-
scrapeParams.excludeTags = options.excludeTags;
|
|
51
|
-
}
|
|
52
|
-
// Execute scrape
|
|
53
66
|
const result = await app.scrape(options.url, scrapeParams);
|
|
67
|
+
const requestEndTime = Date.now();
|
|
68
|
+
outputTiming(options, requestStartTime, requestEndTime);
|
|
54
69
|
return {
|
|
55
70
|
success: true,
|
|
56
71
|
data: result,
|
|
57
72
|
};
|
|
58
73
|
}
|
|
59
74
|
catch (error) {
|
|
75
|
+
const requestEndTime = Date.now();
|
|
76
|
+
outputTiming(options, requestStartTime, requestEndTime, error);
|
|
60
77
|
return {
|
|
61
78
|
success: false,
|
|
62
79
|
error: error instanceof Error ? error.message : 'Unknown error occurred',
|
|
@@ -68,6 +85,14 @@ async function executeScrape(options) {
|
|
|
68
85
|
*/
|
|
69
86
|
async function handleScrapeCommand(options) {
|
|
70
87
|
const result = await executeScrape(options);
|
|
71
|
-
|
|
88
|
+
// Determine effective formats for output handling
|
|
89
|
+
const effectiveFormats = options.formats && options.formats.length > 0
|
|
90
|
+
? [...options.formats]
|
|
91
|
+
: ['markdown'];
|
|
92
|
+
// Add screenshot to effective formats if it was requested separately
|
|
93
|
+
if (options.screenshot && !effectiveFormats.includes('screenshot')) {
|
|
94
|
+
effectiveFormats.push('screenshot');
|
|
95
|
+
}
|
|
96
|
+
(0, output_1.handleScrapeOutput)(result, effectiveFormats, options.output, options.pretty);
|
|
72
97
|
}
|
|
73
98
|
//# sourceMappingURL=scrape.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scrape.js","sourceRoot":"","sources":["../../src/commands/scrape.ts"],"names":[],"mappings":";AAAA;;GAEG;;
|
|
1
|
+
{"version":3,"file":"scrape.js","sourceRoot":"","sources":["../../src/commands/scrape.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -11,6 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
11
11
|
const commander_1 = require("commander");
|
|
12
12
|
const scrape_1 = require("./commands/scrape");
|
|
13
13
|
const config_1 = require("./utils/config");
|
|
14
|
+
const client_1 = require("./utils/client");
|
|
14
15
|
const config_2 = require("./commands/config");
|
|
15
16
|
const credit_usage_1 = require("./commands/credit-usage");
|
|
16
17
|
const crawl_1 = require("./commands/crawl");
|
|
@@ -33,7 +34,7 @@ program
|
|
|
33
34
|
// Update global config if API key is provided via global option
|
|
34
35
|
const globalOptions = thisCommand.opts();
|
|
35
36
|
if (globalOptions.apiKey) {
|
|
36
|
-
(0,
|
|
37
|
+
(0, client_1.getClient)({ apiKey: globalOptions.apiKey });
|
|
37
38
|
}
|
|
38
39
|
});
|
|
39
40
|
/**
|
|
@@ -45,7 +46,7 @@ function createScrapeCommand() {
|
|
|
45
46
|
.argument('[url]', 'URL to scrape')
|
|
46
47
|
.option('-u, --url <url>', 'URL to scrape (alternative to positional argument)')
|
|
47
48
|
.option('-H, --html', 'Output raw HTML (shortcut for --format html)')
|
|
48
|
-
.option('-f, --format <
|
|
49
|
+
.option('-f, --format <formats>', 'Output format(s). Multiple formats can be specified with commas (e.g., "markdown,links,images"). Available: markdown, html, rawHtml, links, images, screenshot, summary, changeTracking, json, attributes, branding. Single format outputs raw content; multiple formats output JSON.', 'markdown')
|
|
49
50
|
.option('--only-main-content', 'Include only main content', false)
|
|
50
51
|
.option('--wait-for <ms>', 'Wait time before scraping in milliseconds', parseInt)
|
|
51
52
|
.option('--screenshot', 'Take a screenshot', false)
|
|
@@ -54,6 +55,7 @@ function createScrapeCommand() {
|
|
|
54
55
|
.option('-k, --api-key <key>', 'Firecrawl API key (overrides global --api-key)')
|
|
55
56
|
.option('-o, --output <path>', 'Output file path (default: stdout)')
|
|
56
57
|
.option('--pretty', 'Pretty print JSON output', false)
|
|
58
|
+
.option('--timing', 'Show request timing and other useful information', false)
|
|
57
59
|
.action(async (positionalUrl, options) => {
|
|
58
60
|
// Use positional URL if provided, otherwise use --url option
|
|
59
61
|
const url = positionalUrl || options.url;
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAEA;;;GAGG;;;;;AAEH,yCAAoC;AACpC,8CAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types/scrape.d.ts
CHANGED
|
@@ -5,8 +5,8 @@ export type ScrapeFormat = 'markdown' | 'html' | 'rawHtml' | 'links' | 'images'
|
|
|
5
5
|
export interface ScrapeOptions {
|
|
6
6
|
/** URL to scrape */
|
|
7
7
|
url: string;
|
|
8
|
-
/** Output format
|
|
9
|
-
|
|
8
|
+
/** Output format(s) - single format or array of formats */
|
|
9
|
+
formats?: ScrapeFormat[];
|
|
10
10
|
/** Include only main content */
|
|
11
11
|
onlyMainContent?: boolean;
|
|
12
12
|
/** Wait time before scraping (ms) */
|
|
@@ -23,6 +23,8 @@ export interface ScrapeOptions {
|
|
|
23
23
|
output?: string;
|
|
24
24
|
/** Pretty print JSON output */
|
|
25
25
|
pretty?: boolean;
|
|
26
|
+
/** Show request timing and other useful information */
|
|
27
|
+
timing?: boolean;
|
|
26
28
|
}
|
|
27
29
|
export interface ScrapeResult {
|
|
28
30
|
success: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scrape.d.ts","sourceRoot":"","sources":["../../src/types/scrape.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,YAAY,GACpB,UAAU,GACV,MAAM,GACN,SAAS,GACT,OAAO,GACP,QAAQ,GACR,YAAY,GACZ,SAAS,GACT,gBAAgB,GAChB,MAAM,GACN,YAAY,GACZ,UAAU,CAAC;AAEf,MAAM,WAAW,aAAa;IAC5B,oBAAoB;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,
|
|
1
|
+
{"version":3,"file":"scrape.d.ts","sourceRoot":"","sources":["../../src/types/scrape.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,YAAY,GACpB,UAAU,GACV,MAAM,GACN,SAAS,GACT,OAAO,GACP,QAAQ,GACR,YAAY,GACZ,SAAS,GACT,gBAAgB,GAChB,MAAM,GACN,YAAY,GACZ,UAAU,CAAC;AAEf,MAAM,WAAW,aAAa;IAC5B,oBAAoB;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,2DAA2D;IAC3D,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,gCAAgC;IAChC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uBAAuB;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+BAA+B;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,uDAAuD;IACvD,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/utils/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/utils/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAIL,KAAK,YAAY,EAClB,MAAM,UAAU,CAAC;AAIlB;;;GAGG;AACH,wBAAgB,SAAS,CACvB,OAAO,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,GACxC,SAAS,CAoEX;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,SAAS,CAS1E;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAElC"}
|
package/dist/utils/client.js
CHANGED
|
@@ -20,8 +20,29 @@ let clientInstance = null;
|
|
|
20
20
|
function getClient(options) {
|
|
21
21
|
// Helper to convert null to undefined and ensure we have a string or undefined
|
|
22
22
|
const normalizeApiKey = (value) => value === null || value === undefined ? undefined : value;
|
|
23
|
-
// If options provided, create a new instance
|
|
23
|
+
// If options provided, update global config and create a new instance
|
|
24
24
|
if (options) {
|
|
25
|
+
// Update global config with provided options (for future calls)
|
|
26
|
+
// Only include properties that are explicitly provided (not undefined)
|
|
27
|
+
const configUpdate = {};
|
|
28
|
+
if (options.apiKey !== undefined) {
|
|
29
|
+
configUpdate.apiKey = normalizeApiKey(options.apiKey);
|
|
30
|
+
}
|
|
31
|
+
if (options.apiUrl !== undefined) {
|
|
32
|
+
configUpdate.apiUrl = normalizeApiKey(options.apiUrl);
|
|
33
|
+
}
|
|
34
|
+
if (options.timeoutMs !== undefined) {
|
|
35
|
+
configUpdate.timeoutMs = options.timeoutMs;
|
|
36
|
+
}
|
|
37
|
+
if (options.maxRetries !== undefined) {
|
|
38
|
+
configUpdate.maxRetries = options.maxRetries;
|
|
39
|
+
}
|
|
40
|
+
if (options.backoffFactor !== undefined) {
|
|
41
|
+
configUpdate.backoffFactor = options.backoffFactor;
|
|
42
|
+
}
|
|
43
|
+
if (Object.keys(configUpdate).length > 0) {
|
|
44
|
+
(0, config_1.updateConfig)(configUpdate);
|
|
45
|
+
}
|
|
25
46
|
const config = (0, config_1.getConfig)();
|
|
26
47
|
const apiKey = normalizeApiKey(options.apiKey) ?? config.apiKey;
|
|
27
48
|
const apiUrl = normalizeApiKey(options.apiUrl) ?? config.apiUrl;
|
package/dist/utils/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/utils/client.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/utils/client.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/options.d.ts
CHANGED
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Option parsing utilities
|
|
3
3
|
*/
|
|
4
|
-
import type { ScrapeOptions } from '../types/scrape';
|
|
4
|
+
import type { ScrapeOptions, ScrapeFormat } from '../types/scrape';
|
|
5
|
+
/**
|
|
6
|
+
* Parse format string into array of ScrapeFormat
|
|
7
|
+
* Handles comma-separated values: "markdown,links,images"
|
|
8
|
+
* Case-insensitive input, returns correct camelCase for API
|
|
9
|
+
*/
|
|
10
|
+
export declare function parseFormats(formatString: string): ScrapeFormat[];
|
|
5
11
|
/**
|
|
6
12
|
* Convert commander options to ScrapeOptions
|
|
7
13
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/utils/options.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/utils/options.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AA0BnE;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,YAAY,EAAE,CA2BjE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,GAAG,GAAG,aAAa,CAwB9D"}
|
package/dist/utils/options.js
CHANGED
|
@@ -3,14 +3,68 @@
|
|
|
3
3
|
* Option parsing utilities
|
|
4
4
|
*/
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.parseFormats = parseFormats;
|
|
6
7
|
exports.parseScrapeOptions = parseScrapeOptions;
|
|
8
|
+
/**
|
|
9
|
+
* Valid scrape format values
|
|
10
|
+
*/
|
|
11
|
+
const VALID_FORMATS = [
|
|
12
|
+
'markdown',
|
|
13
|
+
'html',
|
|
14
|
+
'rawHtml',
|
|
15
|
+
'links',
|
|
16
|
+
'images',
|
|
17
|
+
'screenshot',
|
|
18
|
+
'summary',
|
|
19
|
+
'changeTracking',
|
|
20
|
+
'json',
|
|
21
|
+
'attributes',
|
|
22
|
+
'branding',
|
|
23
|
+
];
|
|
24
|
+
/**
|
|
25
|
+
* Map from lowercase to correct camelCase format
|
|
26
|
+
*/
|
|
27
|
+
const FORMAT_MAP = Object.fromEntries(VALID_FORMATS.map((f) => [f.toLowerCase(), f]));
|
|
28
|
+
/**
|
|
29
|
+
* Parse format string into array of ScrapeFormat
|
|
30
|
+
* Handles comma-separated values: "markdown,links,images"
|
|
31
|
+
* Case-insensitive input, returns correct camelCase for API
|
|
32
|
+
*/
|
|
33
|
+
function parseFormats(formatString) {
|
|
34
|
+
const inputFormats = formatString
|
|
35
|
+
.split(',')
|
|
36
|
+
.map((f) => f.trim().toLowerCase())
|
|
37
|
+
.filter((f) => f.length > 0);
|
|
38
|
+
// Validate and map to correct casing
|
|
39
|
+
const invalidFormats = [];
|
|
40
|
+
const validFormats = [];
|
|
41
|
+
for (const input of inputFormats) {
|
|
42
|
+
const mapped = FORMAT_MAP[input];
|
|
43
|
+
if (mapped) {
|
|
44
|
+
validFormats.push(mapped);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
invalidFormats.push(input);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
if (invalidFormats.length > 0) {
|
|
51
|
+
throw new Error(`Invalid format(s): ${invalidFormats.join(', ')}. Valid formats are: ${VALID_FORMATS.join(', ')}`);
|
|
52
|
+
}
|
|
53
|
+
// Remove duplicates while preserving order
|
|
54
|
+
return [...new Set(validFormats)];
|
|
55
|
+
}
|
|
7
56
|
/**
|
|
8
57
|
* Convert commander options to ScrapeOptions
|
|
9
58
|
*/
|
|
10
59
|
function parseScrapeOptions(options) {
|
|
60
|
+
// Parse formats from comma-separated string
|
|
61
|
+
let formats;
|
|
62
|
+
if (options.format) {
|
|
63
|
+
formats = parseFormats(options.format);
|
|
64
|
+
}
|
|
11
65
|
return {
|
|
12
66
|
url: options.url,
|
|
13
|
-
|
|
67
|
+
formats,
|
|
14
68
|
onlyMainContent: options.onlyMainContent,
|
|
15
69
|
waitFor: options.waitFor,
|
|
16
70
|
screenshot: options.screenshot,
|
|
@@ -23,6 +77,7 @@ function parseScrapeOptions(options) {
|
|
|
23
77
|
apiKey: options.apiKey,
|
|
24
78
|
output: options.output,
|
|
25
79
|
pretty: options.pretty,
|
|
80
|
+
timing: options.timing,
|
|
26
81
|
};
|
|
27
82
|
}
|
|
28
83
|
//# sourceMappingURL=options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/utils/options.ts"],"names":[],"mappings":";AAAA;;GAEG;;
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/utils/options.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAiCH,oCA2BC;AAKD,gDAwBC;AArFD;;GAEG;AACH,MAAM,aAAa,GAAmB;IACpC,UAAU;IACV,MAAM;IACN,SAAS;IACT,OAAO;IACP,QAAQ;IACR,YAAY;IACZ,SAAS;IACT,gBAAgB;IAChB,MAAM;IACN,YAAY;IACZ,UAAU;CACX,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,GAAiC,MAAM,CAAC,WAAW,CACjE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CACf,CAAC;AAElC;;;;GAIG;AACH,SAAgB,YAAY,CAAC,YAAoB;IAC/C,MAAM,YAAY,GAAG,YAAY;SAC9B,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;SAClC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE/B,qCAAqC;IACrC,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,MAAM,YAAY,GAAmB,EAAE,CAAC;IAExC,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,MAAM,EAAE,CAAC;YACX,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CACb,sBAAsB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAClG,CAAC;IACJ,CAAC;IAED,2CAA2C;IAC3C,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,OAAY;IAC7C,4CAA4C;IAC5C,IAAI,OAAmC,CAAC;IACxC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAED,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO;QACP,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;YAC9B,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC7D,CAAC,CAAC,SAAS;QACb,WAAW,EAAE,OAAO,CAAC,WAAW;YAC9B,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC7D,CAAC,CAAC,SAAS;QACb,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC;AACJ,CAAC"}
|
package/dist/utils/output.d.ts
CHANGED
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Output utilities for CLI
|
|
3
3
|
*/
|
|
4
|
-
import type { ScrapeResult } from '../types/scrape';
|
|
5
|
-
import type { ScrapeFormat } from '../types/scrape';
|
|
4
|
+
import type { ScrapeResult, ScrapeFormat } from '../types/scrape';
|
|
6
5
|
/**
|
|
7
6
|
* Write output to file or stdout
|
|
8
7
|
*/
|
|
9
8
|
export declare function writeOutput(content: string, outputPath?: string, silent?: boolean): void;
|
|
10
9
|
/**
|
|
11
10
|
* Handle scrape result output
|
|
12
|
-
*
|
|
13
|
-
*
|
|
11
|
+
*
|
|
12
|
+
* Output behavior:
|
|
13
|
+
* - Single text format (html, markdown, links, images, summary, rawHtml): raw content
|
|
14
|
+
* - Single complex format (screenshot, json, branding, etc.): JSON output
|
|
15
|
+
* - Multiple formats: JSON with all requested data
|
|
14
16
|
*/
|
|
15
|
-
export declare function handleScrapeOutput(result: ScrapeResult,
|
|
17
|
+
export declare function handleScrapeOutput(result: ScrapeResult, formats: ScrapeFormat[], outputPath?: string, pretty?: boolean): void;
|
|
16
18
|
//# sourceMappingURL=output.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAuFlE;;GAEG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,GAAE,OAAe,GACtB,IAAI,CAmBN;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,YAAY,EAAE,EACvB,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,GAAE,OAAe,GACtB,IAAI,CAkDN"}
|
package/dist/utils/output.js
CHANGED
|
@@ -40,44 +40,77 @@ exports.writeOutput = writeOutput;
|
|
|
40
40
|
exports.handleScrapeOutput = handleScrapeOutput;
|
|
41
41
|
const fs = __importStar(require("fs"));
|
|
42
42
|
const path = __importStar(require("path"));
|
|
43
|
+
/**
|
|
44
|
+
* Text formats that can be output as raw content (curl-like)
|
|
45
|
+
*/
|
|
46
|
+
const RAW_TEXT_FORMATS = [
|
|
47
|
+
'html',
|
|
48
|
+
'rawHtml',
|
|
49
|
+
'markdown',
|
|
50
|
+
'links',
|
|
51
|
+
'images',
|
|
52
|
+
'summary',
|
|
53
|
+
];
|
|
43
54
|
/**
|
|
44
55
|
* Extract content from Firecrawl Document based on format
|
|
45
56
|
*/
|
|
46
57
|
function extractContent(data, format) {
|
|
47
58
|
if (!data)
|
|
48
59
|
return null;
|
|
49
|
-
//
|
|
50
|
-
if (format) {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
60
|
+
// Handle html/rawHtml formats - extract HTML content directly
|
|
61
|
+
if (format === 'html' || format === 'rawHtml') {
|
|
62
|
+
return data.html || data.rawHtml || data[format] || null;
|
|
63
|
+
}
|
|
64
|
+
// Handle markdown format
|
|
65
|
+
if (format === 'markdown') {
|
|
66
|
+
return data.markdown || data[format] || null;
|
|
67
|
+
}
|
|
68
|
+
// Handle links format (array of URLs -> newline-separated string)
|
|
69
|
+
if (format === 'links') {
|
|
70
|
+
const links = data.links || data[format];
|
|
71
|
+
if (Array.isArray(links)) {
|
|
72
|
+
return links.join('\n');
|
|
54
73
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
74
|
+
return links || null;
|
|
75
|
+
}
|
|
76
|
+
// Handle images format (array of URLs -> newline-separated string)
|
|
77
|
+
if (format === 'images') {
|
|
78
|
+
const images = data.images || data[format];
|
|
79
|
+
if (Array.isArray(images)) {
|
|
80
|
+
return images.join('\n');
|
|
58
81
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
82
|
+
return images || null;
|
|
83
|
+
}
|
|
84
|
+
// Handle summary format
|
|
85
|
+
if (format === 'summary') {
|
|
86
|
+
return data.summary || data[format] || null;
|
|
87
|
+
}
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Extract multiple format contents from response data
|
|
92
|
+
*/
|
|
93
|
+
function extractMultipleFormats(data, formats) {
|
|
94
|
+
const result = {};
|
|
95
|
+
for (const format of formats) {
|
|
96
|
+
const key = format;
|
|
97
|
+
if (data[key] !== undefined) {
|
|
98
|
+
result[key] = data[key];
|
|
62
99
|
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
100
|
+
else if (format === 'html' && data.rawHtml !== undefined) {
|
|
101
|
+
// Fallback for html -> rawHtml
|
|
102
|
+
result[key] = data.rawHtml;
|
|
66
103
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
104
|
+
else if (format === 'rawHtml' && data.html !== undefined) {
|
|
105
|
+
// Fallback for rawHtml -> html
|
|
106
|
+
result[key] = data.html;
|
|
70
107
|
}
|
|
71
108
|
}
|
|
72
|
-
//
|
|
73
|
-
if (
|
|
74
|
-
|
|
75
|
-
}
|
|
76
|
-
// If it's an object, try to find string content
|
|
77
|
-
if (typeof data === 'object') {
|
|
78
|
-
return data.html || data.markdown || data.rawHtml || data.content || null;
|
|
109
|
+
// Always include metadata if present
|
|
110
|
+
if (data.metadata) {
|
|
111
|
+
result.metadata = data.metadata;
|
|
79
112
|
}
|
|
80
|
-
return
|
|
113
|
+
return result;
|
|
81
114
|
}
|
|
82
115
|
/**
|
|
83
116
|
* Write output to file or stdout
|
|
@@ -105,10 +138,13 @@ function writeOutput(content, outputPath, silent = false) {
|
|
|
105
138
|
}
|
|
106
139
|
/**
|
|
107
140
|
* Handle scrape result output
|
|
108
|
-
*
|
|
109
|
-
*
|
|
141
|
+
*
|
|
142
|
+
* Output behavior:
|
|
143
|
+
* - Single text format (html, markdown, links, images, summary, rawHtml): raw content
|
|
144
|
+
* - Single complex format (screenshot, json, branding, etc.): JSON output
|
|
145
|
+
* - Multiple formats: JSON with all requested data
|
|
110
146
|
*/
|
|
111
|
-
function handleScrapeOutput(result,
|
|
147
|
+
function handleScrapeOutput(result, formats, outputPath, pretty = false) {
|
|
112
148
|
if (!result.success) {
|
|
113
149
|
// Always use stderr for errors to allow piping
|
|
114
150
|
console.error('Error:', result.error);
|
|
@@ -117,41 +153,40 @@ function handleScrapeOutput(result, format, outputPath, pretty = false) {
|
|
|
117
153
|
if (!result.data) {
|
|
118
154
|
return;
|
|
119
155
|
}
|
|
120
|
-
//
|
|
121
|
-
const
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
'summary',
|
|
128
|
-
];
|
|
129
|
-
const shouldOutputRaw = format && rawTextFormats.includes(format);
|
|
130
|
-
if (shouldOutputRaw) {
|
|
131
|
-
// Extract and output raw content
|
|
132
|
-
const content = extractContent(result.data, format);
|
|
156
|
+
// Determine output mode based on number of formats
|
|
157
|
+
const isSingleFormat = formats.length === 1;
|
|
158
|
+
const singleFormat = isSingleFormat ? formats[0] : null;
|
|
159
|
+
const isRawTextFormat = singleFormat && RAW_TEXT_FORMATS.includes(singleFormat);
|
|
160
|
+
// Single raw text format: output raw content (current behavior)
|
|
161
|
+
if (isSingleFormat && isRawTextFormat && singleFormat) {
|
|
162
|
+
const content = extractContent(result.data, singleFormat);
|
|
133
163
|
if (content !== null) {
|
|
134
164
|
writeOutput(content, outputPath, !!outputPath);
|
|
135
165
|
return;
|
|
136
166
|
}
|
|
137
167
|
}
|
|
138
|
-
//
|
|
139
|
-
|
|
168
|
+
// Multiple formats or complex format: output JSON
|
|
169
|
+
let outputData;
|
|
170
|
+
if (isSingleFormat) {
|
|
171
|
+
// Single complex format - output entire data object
|
|
172
|
+
outputData = result.data;
|
|
173
|
+
}
|
|
174
|
+
else {
|
|
175
|
+
// Multiple formats - extract only requested formats
|
|
176
|
+
outputData = extractMultipleFormats(result.data, formats);
|
|
177
|
+
}
|
|
140
178
|
let jsonContent;
|
|
141
179
|
try {
|
|
142
180
|
jsonContent = pretty
|
|
143
|
-
? JSON.stringify(
|
|
144
|
-
: JSON.stringify(
|
|
181
|
+
? JSON.stringify(outputData, null, 2)
|
|
182
|
+
: JSON.stringify(outputData);
|
|
145
183
|
}
|
|
146
184
|
catch (error) {
|
|
147
|
-
// If stringification fails, try to create a minimal error response
|
|
148
185
|
jsonContent = JSON.stringify({
|
|
149
186
|
error: 'Failed to serialize response',
|
|
150
187
|
message: error instanceof Error ? error.message : 'Unknown error',
|
|
151
188
|
});
|
|
152
189
|
}
|
|
153
|
-
// Ensure clean JSON output (no extra newlines or text before JSON)
|
|
154
|
-
// Output directly to stdout without any prefix
|
|
155
190
|
writeOutput(jsonContent, outputPath, !!outputPath);
|
|
156
191
|
}
|
|
157
192
|
//# sourceMappingURL=output.js.map
|
package/dist/utils/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED