xscrape 1.1.0 → 1.1.1
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 +23 -11
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +23 -11
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
|
@@ -37,19 +37,21 @@ module.exports = __toCommonJS(src_exports);
|
|
|
37
37
|
|
|
38
38
|
// src/createScraper.ts
|
|
39
39
|
var cheerio = __toESM(require("cheerio"), 1);
|
|
40
|
-
var
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
40
|
+
var extractData = (fields, $context) => {
|
|
41
|
+
const data = {};
|
|
42
|
+
for (const key in fields) {
|
|
43
|
+
const fieldDef = fields[key];
|
|
44
|
+
if ("fields" in fieldDef) {
|
|
45
|
+
const nestedData = extractData(
|
|
46
|
+
fieldDef.fields,
|
|
47
|
+
$context
|
|
48
|
+
);
|
|
49
|
+
data[key] = nestedData;
|
|
50
|
+
} else {
|
|
51
|
+
const elements = $context(fieldDef.selector);
|
|
50
52
|
let values = [];
|
|
51
53
|
elements.each((_, element) => {
|
|
52
|
-
const value = fieldDef.attribute ? $(element).attr(fieldDef.attribute) : $(element).text();
|
|
54
|
+
const value = fieldDef.attribute ? $context(element).attr(fieldDef.attribute) : $context(element).text().trim();
|
|
53
55
|
if (value !== void 0) {
|
|
54
56
|
values.push(value);
|
|
55
57
|
}
|
|
@@ -65,6 +67,16 @@ var createScraper = ({
|
|
|
65
67
|
data[key] = fieldDef.transform && value ? fieldDef.transform(value) : value;
|
|
66
68
|
}
|
|
67
69
|
}
|
|
70
|
+
}
|
|
71
|
+
return data;
|
|
72
|
+
};
|
|
73
|
+
var createScraper = ({
|
|
74
|
+
fields,
|
|
75
|
+
validator
|
|
76
|
+
}) => {
|
|
77
|
+
return (html) => {
|
|
78
|
+
const $ = typeof html === "string" ? cheerio.load(html) : html;
|
|
79
|
+
const data = extractData(fields, $);
|
|
68
80
|
return validator.validate(data);
|
|
69
81
|
};
|
|
70
82
|
};
|
package/dist/index.d.cts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as cheerio from 'cheerio';
|
|
1
2
|
import { ZodSchema } from 'zod';
|
|
2
3
|
|
|
3
4
|
type ScrapeConfig<T> = {
|
|
@@ -10,6 +11,9 @@ type FieldDefinition<T> = {
|
|
|
10
11
|
transform?: (value: string) => T;
|
|
11
12
|
defaultValue?: T;
|
|
12
13
|
multiple?: boolean;
|
|
14
|
+
} | NestedFieldDefinition<T>;
|
|
15
|
+
type NestedFieldDefinition<T> = {
|
|
16
|
+
fields: SchemaFieldDefinitions<T>;
|
|
13
17
|
};
|
|
14
18
|
type SchemaFieldDefinitions<T> = {
|
|
15
19
|
[K in keyof T]: FieldDefinition<T[K]>;
|
|
@@ -18,7 +22,7 @@ interface SchemaValidator<T> {
|
|
|
18
22
|
validate(data: unknown): T;
|
|
19
23
|
}
|
|
20
24
|
|
|
21
|
-
declare const createScraper: <T>({ fields, validator, }: ScrapeConfig<T>) => ((html: string) => T);
|
|
25
|
+
declare const createScraper: <T>({ fields, validator, }: ScrapeConfig<T>) => ((html: cheerio.CheerioAPI | string) => T);
|
|
22
26
|
|
|
23
27
|
declare class ZodValidator<T> implements SchemaValidator<T> {
|
|
24
28
|
private schema;
|
package/dist/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as cheerio from 'cheerio';
|
|
1
2
|
import { ZodSchema } from 'zod';
|
|
2
3
|
|
|
3
4
|
type ScrapeConfig<T> = {
|
|
@@ -10,6 +11,9 @@ type FieldDefinition<T> = {
|
|
|
10
11
|
transform?: (value: string) => T;
|
|
11
12
|
defaultValue?: T;
|
|
12
13
|
multiple?: boolean;
|
|
14
|
+
} | NestedFieldDefinition<T>;
|
|
15
|
+
type NestedFieldDefinition<T> = {
|
|
16
|
+
fields: SchemaFieldDefinitions<T>;
|
|
13
17
|
};
|
|
14
18
|
type SchemaFieldDefinitions<T> = {
|
|
15
19
|
[K in keyof T]: FieldDefinition<T[K]>;
|
|
@@ -18,7 +22,7 @@ interface SchemaValidator<T> {
|
|
|
18
22
|
validate(data: unknown): T;
|
|
19
23
|
}
|
|
20
24
|
|
|
21
|
-
declare const createScraper: <T>({ fields, validator, }: ScrapeConfig<T>) => ((html: string) => T);
|
|
25
|
+
declare const createScraper: <T>({ fields, validator, }: ScrapeConfig<T>) => ((html: cheerio.CheerioAPI | string) => T);
|
|
22
26
|
|
|
23
27
|
declare class ZodValidator<T> implements SchemaValidator<T> {
|
|
24
28
|
private schema;
|
package/dist/index.js
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
// src/createScraper.ts
|
|
2
2
|
import * as cheerio from "cheerio";
|
|
3
|
-
var
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
3
|
+
var extractData = (fields, $context) => {
|
|
4
|
+
const data = {};
|
|
5
|
+
for (const key in fields) {
|
|
6
|
+
const fieldDef = fields[key];
|
|
7
|
+
if ("fields" in fieldDef) {
|
|
8
|
+
const nestedData = extractData(
|
|
9
|
+
fieldDef.fields,
|
|
10
|
+
$context
|
|
11
|
+
);
|
|
12
|
+
data[key] = nestedData;
|
|
13
|
+
} else {
|
|
14
|
+
const elements = $context(fieldDef.selector);
|
|
13
15
|
let values = [];
|
|
14
16
|
elements.each((_, element) => {
|
|
15
|
-
const value = fieldDef.attribute ? $(element).attr(fieldDef.attribute) : $(element).text();
|
|
17
|
+
const value = fieldDef.attribute ? $context(element).attr(fieldDef.attribute) : $context(element).text().trim();
|
|
16
18
|
if (value !== void 0) {
|
|
17
19
|
values.push(value);
|
|
18
20
|
}
|
|
@@ -28,6 +30,16 @@ var createScraper = ({
|
|
|
28
30
|
data[key] = fieldDef.transform && value ? fieldDef.transform(value) : value;
|
|
29
31
|
}
|
|
30
32
|
}
|
|
33
|
+
}
|
|
34
|
+
return data;
|
|
35
|
+
};
|
|
36
|
+
var createScraper = ({
|
|
37
|
+
fields,
|
|
38
|
+
validator
|
|
39
|
+
}) => {
|
|
40
|
+
return (html) => {
|
|
41
|
+
const $ = typeof html === "string" ? cheerio.load(html) : html;
|
|
42
|
+
const data = extractData(fields, $);
|
|
31
43
|
return validator.validate(data);
|
|
32
44
|
};
|
|
33
45
|
};
|
package/package.json
CHANGED