feedsmith 2.9.2 → 2.9.4
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/common/utils.cjs +8 -0
- package/dist/common/utils.js +8 -1
- package/dist/feeds/atom/parse/config.cjs +1 -2
- package/dist/feeds/atom/parse/config.js +1 -2
- package/dist/feeds/json/parse/utils.cjs +29 -29
- package/dist/feeds/json/parse/utils.js +30 -30
- package/dist/feeds/rdf/parse/config.cjs +1 -2
- package/dist/feeds/rdf/parse/config.js +1 -2
- package/dist/feeds/rss/parse/config.cjs +1 -2
- package/dist/feeds/rss/parse/config.js +1 -2
- package/dist/opml/parse/config.cjs +1 -2
- package/dist/opml/parse/config.js +1 -2
- package/package.json +5 -5
- package/dist/node_modules/path-expression-matcher/src/Expression.cjs +0 -153
- package/dist/node_modules/path-expression-matcher/src/Expression.js +0 -153
package/dist/common/utils.cjs
CHANGED
|
@@ -115,6 +115,13 @@ const parseString = (value) => {
|
|
|
115
115
|
}
|
|
116
116
|
if (typeof value === "number") return value.toString();
|
|
117
117
|
};
|
|
118
|
+
const parseJsonString = (value) => {
|
|
119
|
+
if (typeof value === "string") {
|
|
120
|
+
if (value === "") return;
|
|
121
|
+
return value.trim() || void 0;
|
|
122
|
+
}
|
|
123
|
+
if (typeof value === "number") return value.toString();
|
|
124
|
+
};
|
|
118
125
|
const parseNumber = (value) => {
|
|
119
126
|
if (typeof value === "number") return value;
|
|
120
127
|
if (isNonEmptyString(value)) {
|
|
@@ -462,6 +469,7 @@ exports.parseBoolean = parseBoolean;
|
|
|
462
469
|
exports.parseCsvOf = parseCsvOf;
|
|
463
470
|
exports.parseDate = parseDate;
|
|
464
471
|
exports.parseJsonObject = parseJsonObject;
|
|
472
|
+
exports.parseJsonString = parseJsonString;
|
|
465
473
|
exports.parseNumber = parseNumber;
|
|
466
474
|
exports.parseSingular = parseSingular;
|
|
467
475
|
exports.parseSingularOf = parseSingularOf;
|
package/dist/common/utils.js
CHANGED
|
@@ -115,6 +115,13 @@ const parseString = (value) => {
|
|
|
115
115
|
}
|
|
116
116
|
if (typeof value === "number") return value.toString();
|
|
117
117
|
};
|
|
118
|
+
const parseJsonString = (value) => {
|
|
119
|
+
if (typeof value === "string") {
|
|
120
|
+
if (value === "") return;
|
|
121
|
+
return value.trim() || void 0;
|
|
122
|
+
}
|
|
123
|
+
if (typeof value === "number") return value.toString();
|
|
124
|
+
};
|
|
118
125
|
const parseNumber = (value) => {
|
|
119
126
|
if (typeof value === "number") return value;
|
|
120
127
|
if (isNonEmptyString(value)) {
|
|
@@ -436,4 +443,4 @@ const expandStopNodes = (stopNodes, feedContainerPaths) => {
|
|
|
436
443
|
return [...set];
|
|
437
444
|
};
|
|
438
445
|
//#endregion
|
|
439
|
-
export { createNamespaceNormalizator, detectNamespaces, expandStopNodes, generateArrayOrSingular, generateBoolean, generateCdataString, generateCsvOf, generateNamespaceAttrs, generateNumber, generatePlainString, generateRdfResource, generateRfc3339Date, generateRfc822Date, generateSingularOrArray, generateTextOrCdataString, generateXml, generateYesNoBoolean, isNonEmptyString, isNonEmptyStringOrNumber, isObject, isPresent, parseArrayOf, parseBoolean, parseCsvOf, parseDate, parseJsonObject, parseNumber, parseSingular, parseSingularOf, parseString, parseYesNoBoolean, retrieveRdfResourceOrText, retrieveText, trimArray, trimObject };
|
|
446
|
+
export { createNamespaceNormalizator, detectNamespaces, expandStopNodes, generateArrayOrSingular, generateBoolean, generateCdataString, generateCsvOf, generateNamespaceAttrs, generateNumber, generatePlainString, generateRdfResource, generateRfc3339Date, generateRfc822Date, generateSingularOrArray, generateTextOrCdataString, generateXml, generateYesNoBoolean, isNonEmptyString, isNonEmptyStringOrNumber, isObject, isPresent, parseArrayOf, parseBoolean, parseCsvOf, parseDate, parseJsonObject, parseJsonString, parseNumber, parseSingular, parseSingularOf, parseString, parseYesNoBoolean, retrieveRdfResourceOrText, retrieveText, trimArray, trimObject };
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
const require_config = require("../../../common/config.cjs");
|
|
2
2
|
const require_utils = require("../../../common/utils.cjs");
|
|
3
|
-
const require_Expression = require("../../../node_modules/path-expression-matcher/src/Expression.cjs");
|
|
4
3
|
let fast_xml_parser = require("fast-xml-parser");
|
|
5
4
|
//#region src/feeds/atom/parse/config.ts
|
|
6
5
|
const stopNodes = [
|
|
@@ -71,7 +70,7 @@ const stopNodes = [
|
|
|
71
70
|
];
|
|
72
71
|
const parser = new fast_xml_parser.XMLParser({
|
|
73
72
|
...require_config.parserConfig,
|
|
74
|
-
stopNodes
|
|
73
|
+
stopNodes
|
|
75
74
|
});
|
|
76
75
|
const normalizeNamespaces = require_utils.createNamespaceNormalizator(require_config.namespaceUris, require_config.namespacePrefixes, ["atom"]);
|
|
77
76
|
//#endregion
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { namespacePrefixes, namespaceStopNodes, namespaceUris, parserConfig } from "../../../common/config.js";
|
|
2
2
|
import { createNamespaceNormalizator, expandStopNodes } from "../../../common/utils.js";
|
|
3
|
-
import Expression from "../../../node_modules/path-expression-matcher/src/Expression.js";
|
|
4
3
|
import { XMLParser } from "fast-xml-parser";
|
|
5
4
|
//#region src/feeds/atom/parse/config.ts
|
|
6
5
|
const stopNodes = [
|
|
@@ -71,7 +70,7 @@ const stopNodes = [
|
|
|
71
70
|
];
|
|
72
71
|
const parser = new XMLParser({
|
|
73
72
|
...parserConfig,
|
|
74
|
-
stopNodes
|
|
73
|
+
stopNodes
|
|
75
74
|
});
|
|
76
75
|
const normalizeNamespaces = createNamespaceNormalizator(namespaceUris, namespacePrefixes, ["atom"]);
|
|
77
76
|
//#endregion
|
|
@@ -11,12 +11,12 @@ const parseAuthor = (value) => {
|
|
|
11
11
|
if (require_utils.isObject(value)) {
|
|
12
12
|
const get = createCaseInsensitiveGetter(value);
|
|
13
13
|
return require_utils.trimObject({
|
|
14
|
-
name: require_utils.parseSingularOf(get("name"), require_utils.
|
|
15
|
-
url: require_utils.parseSingularOf(get("url"), require_utils.
|
|
16
|
-
avatar: require_utils.parseSingularOf(get("avatar"), require_utils.
|
|
14
|
+
name: require_utils.parseSingularOf(get("name"), require_utils.parseJsonString),
|
|
15
|
+
url: require_utils.parseSingularOf(get("url"), require_utils.parseJsonString),
|
|
16
|
+
avatar: require_utils.parseSingularOf(get("avatar"), require_utils.parseJsonString)
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
|
-
if (require_utils.isNonEmptyStringOrNumber(value)) return require_utils.trimObject({ name: require_utils.
|
|
19
|
+
if (require_utils.isNonEmptyStringOrNumber(value)) return require_utils.trimObject({ name: require_utils.parseJsonString(value) });
|
|
20
20
|
};
|
|
21
21
|
const retrieveAuthors = (value) => {
|
|
22
22
|
if (!require_utils.isObject(value)) return;
|
|
@@ -29,9 +29,9 @@ const parseAttachment = (value) => {
|
|
|
29
29
|
if (!require_utils.isObject(value)) return;
|
|
30
30
|
const get = createCaseInsensitiveGetter(value);
|
|
31
31
|
return require_utils.trimObject({
|
|
32
|
-
url: require_utils.parseSingularOf(get("url"), require_utils.
|
|
33
|
-
mime_type: require_utils.parseSingularOf(get("mime_type"), require_utils.
|
|
34
|
-
title: require_utils.parseSingularOf(get("title"), require_utils.
|
|
32
|
+
url: require_utils.parseSingularOf(get("url"), require_utils.parseJsonString),
|
|
33
|
+
mime_type: require_utils.parseSingularOf(get("mime_type"), require_utils.parseJsonString),
|
|
34
|
+
title: require_utils.parseSingularOf(get("title"), require_utils.parseJsonString),
|
|
35
35
|
size_in_bytes: require_utils.parseSingularOf(get("size_in_bytes"), require_utils.parseNumber),
|
|
36
36
|
duration_in_seconds: require_utils.parseSingularOf(get("duration_in_seconds"), require_utils.parseNumber)
|
|
37
37
|
});
|
|
@@ -40,20 +40,20 @@ const parseItem = (value) => {
|
|
|
40
40
|
if (!require_utils.isObject(value)) return;
|
|
41
41
|
const get = createCaseInsensitiveGetter(value);
|
|
42
42
|
return require_utils.trimObject({
|
|
43
|
-
id: require_utils.parseSingularOf(get("id"), require_utils.
|
|
44
|
-
url: require_utils.parseSingularOf(get("url"), require_utils.
|
|
45
|
-
external_url: require_utils.parseSingularOf(get("external_url"), require_utils.
|
|
46
|
-
title: require_utils.parseSingularOf(get("title"), require_utils.
|
|
47
|
-
content_html: require_utils.parseSingularOf(get("content_html"), require_utils.
|
|
48
|
-
content_text: require_utils.parseSingularOf(get("content_text"), require_utils.
|
|
49
|
-
summary: require_utils.parseSingularOf(get("summary"), require_utils.
|
|
50
|
-
image: require_utils.parseSingularOf(get("image"), require_utils.
|
|
51
|
-
banner_image: require_utils.parseSingularOf(get("banner_image"), require_utils.
|
|
43
|
+
id: require_utils.parseSingularOf(get("id"), require_utils.parseJsonString),
|
|
44
|
+
url: require_utils.parseSingularOf(get("url"), require_utils.parseJsonString),
|
|
45
|
+
external_url: require_utils.parseSingularOf(get("external_url"), require_utils.parseJsonString),
|
|
46
|
+
title: require_utils.parseSingularOf(get("title"), require_utils.parseJsonString),
|
|
47
|
+
content_html: require_utils.parseSingularOf(get("content_html"), require_utils.parseJsonString),
|
|
48
|
+
content_text: require_utils.parseSingularOf(get("content_text"), require_utils.parseJsonString),
|
|
49
|
+
summary: require_utils.parseSingularOf(get("summary"), require_utils.parseJsonString),
|
|
50
|
+
image: require_utils.parseSingularOf(get("image"), require_utils.parseJsonString),
|
|
51
|
+
banner_image: require_utils.parseSingularOf(get("banner_image"), require_utils.parseJsonString),
|
|
52
52
|
date_published: require_utils.parseSingularOf(get("date_published"), require_utils.parseDate),
|
|
53
53
|
date_modified: require_utils.parseSingularOf(get("date_modified"), require_utils.parseDate),
|
|
54
|
-
tags: require_utils.parseArrayOf(get("tags"), require_utils.
|
|
54
|
+
tags: require_utils.parseArrayOf(get("tags"), require_utils.parseJsonString),
|
|
55
55
|
authors: retrieveAuthors(value),
|
|
56
|
-
language: require_utils.parseSingularOf(get("language"), require_utils.
|
|
56
|
+
language: require_utils.parseSingularOf(get("language"), require_utils.parseJsonString),
|
|
57
57
|
attachments: require_utils.parseArrayOf(get("attachments"), parseAttachment)
|
|
58
58
|
});
|
|
59
59
|
};
|
|
@@ -61,23 +61,23 @@ const parseHub = (value) => {
|
|
|
61
61
|
if (!require_utils.isObject(value)) return;
|
|
62
62
|
const get = createCaseInsensitiveGetter(value);
|
|
63
63
|
return require_utils.trimObject({
|
|
64
|
-
type: require_utils.parseSingularOf(get("type"), require_utils.
|
|
65
|
-
url: require_utils.parseSingularOf(get("url"), require_utils.
|
|
64
|
+
type: require_utils.parseSingularOf(get("type"), require_utils.parseJsonString),
|
|
65
|
+
url: require_utils.parseSingularOf(get("url"), require_utils.parseJsonString)
|
|
66
66
|
});
|
|
67
67
|
};
|
|
68
68
|
const parseFeed = (value, options) => {
|
|
69
69
|
if (!require_utils.isObject(value)) return;
|
|
70
70
|
const get = createCaseInsensitiveGetter(value);
|
|
71
71
|
return require_utils.trimObject({
|
|
72
|
-
title: require_utils.parseSingularOf(get("title"), require_utils.
|
|
73
|
-
home_page_url: require_utils.parseSingularOf(get("home_page_url"), require_utils.
|
|
74
|
-
feed_url: require_utils.parseSingularOf(get("feed_url"), require_utils.
|
|
75
|
-
description: require_utils.parseSingularOf(get("description"), require_utils.
|
|
76
|
-
user_comment: require_utils.parseSingularOf(get("user_comment"), require_utils.
|
|
77
|
-
next_url: require_utils.parseSingularOf(get("next_url"), require_utils.
|
|
78
|
-
icon: require_utils.parseSingularOf(get("icon"), require_utils.
|
|
79
|
-
favicon: require_utils.parseSingularOf(get("favicon"), require_utils.
|
|
80
|
-
language: require_utils.parseSingularOf(get("language"), require_utils.
|
|
72
|
+
title: require_utils.parseSingularOf(get("title"), require_utils.parseJsonString),
|
|
73
|
+
home_page_url: require_utils.parseSingularOf(get("home_page_url"), require_utils.parseJsonString),
|
|
74
|
+
feed_url: require_utils.parseSingularOf(get("feed_url"), require_utils.parseJsonString),
|
|
75
|
+
description: require_utils.parseSingularOf(get("description"), require_utils.parseJsonString),
|
|
76
|
+
user_comment: require_utils.parseSingularOf(get("user_comment"), require_utils.parseJsonString),
|
|
77
|
+
next_url: require_utils.parseSingularOf(get("next_url"), require_utils.parseJsonString),
|
|
78
|
+
icon: require_utils.parseSingularOf(get("icon"), require_utils.parseJsonString),
|
|
79
|
+
favicon: require_utils.parseSingularOf(get("favicon"), require_utils.parseJsonString),
|
|
80
|
+
language: require_utils.parseSingularOf(get("language"), require_utils.parseJsonString),
|
|
81
81
|
expired: require_utils.parseSingularOf(get("expired"), require_utils.parseBoolean),
|
|
82
82
|
hubs: require_utils.parseArrayOf(get("hubs"), parseHub),
|
|
83
83
|
authors: retrieveAuthors(value),
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isNonEmptyStringOrNumber, isObject, parseArrayOf, parseBoolean, parseDate, parseNumber, parseSingularOf,
|
|
1
|
+
import { isNonEmptyStringOrNumber, isObject, parseArrayOf, parseBoolean, parseDate, parseJsonString, parseNumber, parseSingularOf, trimObject } from "../../../common/utils.js";
|
|
2
2
|
//#region src/feeds/json/parse/utils.ts
|
|
3
3
|
const createCaseInsensitiveGetter = (value) => {
|
|
4
4
|
return (requestedKey) => {
|
|
@@ -11,12 +11,12 @@ const parseAuthor = (value) => {
|
|
|
11
11
|
if (isObject(value)) {
|
|
12
12
|
const get = createCaseInsensitiveGetter(value);
|
|
13
13
|
return trimObject({
|
|
14
|
-
name: parseSingularOf(get("name"),
|
|
15
|
-
url: parseSingularOf(get("url"),
|
|
16
|
-
avatar: parseSingularOf(get("avatar"),
|
|
14
|
+
name: parseSingularOf(get("name"), parseJsonString),
|
|
15
|
+
url: parseSingularOf(get("url"), parseJsonString),
|
|
16
|
+
avatar: parseSingularOf(get("avatar"), parseJsonString)
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
|
-
if (isNonEmptyStringOrNumber(value)) return trimObject({ name:
|
|
19
|
+
if (isNonEmptyStringOrNumber(value)) return trimObject({ name: parseJsonString(value) });
|
|
20
20
|
};
|
|
21
21
|
const retrieveAuthors = (value) => {
|
|
22
22
|
if (!isObject(value)) return;
|
|
@@ -29,9 +29,9 @@ const parseAttachment = (value) => {
|
|
|
29
29
|
if (!isObject(value)) return;
|
|
30
30
|
const get = createCaseInsensitiveGetter(value);
|
|
31
31
|
return trimObject({
|
|
32
|
-
url: parseSingularOf(get("url"),
|
|
33
|
-
mime_type: parseSingularOf(get("mime_type"),
|
|
34
|
-
title: parseSingularOf(get("title"),
|
|
32
|
+
url: parseSingularOf(get("url"), parseJsonString),
|
|
33
|
+
mime_type: parseSingularOf(get("mime_type"), parseJsonString),
|
|
34
|
+
title: parseSingularOf(get("title"), parseJsonString),
|
|
35
35
|
size_in_bytes: parseSingularOf(get("size_in_bytes"), parseNumber),
|
|
36
36
|
duration_in_seconds: parseSingularOf(get("duration_in_seconds"), parseNumber)
|
|
37
37
|
});
|
|
@@ -40,20 +40,20 @@ const parseItem = (value) => {
|
|
|
40
40
|
if (!isObject(value)) return;
|
|
41
41
|
const get = createCaseInsensitiveGetter(value);
|
|
42
42
|
return trimObject({
|
|
43
|
-
id: parseSingularOf(get("id"),
|
|
44
|
-
url: parseSingularOf(get("url"),
|
|
45
|
-
external_url: parseSingularOf(get("external_url"),
|
|
46
|
-
title: parseSingularOf(get("title"),
|
|
47
|
-
content_html: parseSingularOf(get("content_html"),
|
|
48
|
-
content_text: parseSingularOf(get("content_text"),
|
|
49
|
-
summary: parseSingularOf(get("summary"),
|
|
50
|
-
image: parseSingularOf(get("image"),
|
|
51
|
-
banner_image: parseSingularOf(get("banner_image"),
|
|
43
|
+
id: parseSingularOf(get("id"), parseJsonString),
|
|
44
|
+
url: parseSingularOf(get("url"), parseJsonString),
|
|
45
|
+
external_url: parseSingularOf(get("external_url"), parseJsonString),
|
|
46
|
+
title: parseSingularOf(get("title"), parseJsonString),
|
|
47
|
+
content_html: parseSingularOf(get("content_html"), parseJsonString),
|
|
48
|
+
content_text: parseSingularOf(get("content_text"), parseJsonString),
|
|
49
|
+
summary: parseSingularOf(get("summary"), parseJsonString),
|
|
50
|
+
image: parseSingularOf(get("image"), parseJsonString),
|
|
51
|
+
banner_image: parseSingularOf(get("banner_image"), parseJsonString),
|
|
52
52
|
date_published: parseSingularOf(get("date_published"), parseDate),
|
|
53
53
|
date_modified: parseSingularOf(get("date_modified"), parseDate),
|
|
54
|
-
tags: parseArrayOf(get("tags"),
|
|
54
|
+
tags: parseArrayOf(get("tags"), parseJsonString),
|
|
55
55
|
authors: retrieveAuthors(value),
|
|
56
|
-
language: parseSingularOf(get("language"),
|
|
56
|
+
language: parseSingularOf(get("language"), parseJsonString),
|
|
57
57
|
attachments: parseArrayOf(get("attachments"), parseAttachment)
|
|
58
58
|
});
|
|
59
59
|
};
|
|
@@ -61,23 +61,23 @@ const parseHub = (value) => {
|
|
|
61
61
|
if (!isObject(value)) return;
|
|
62
62
|
const get = createCaseInsensitiveGetter(value);
|
|
63
63
|
return trimObject({
|
|
64
|
-
type: parseSingularOf(get("type"),
|
|
65
|
-
url: parseSingularOf(get("url"),
|
|
64
|
+
type: parseSingularOf(get("type"), parseJsonString),
|
|
65
|
+
url: parseSingularOf(get("url"), parseJsonString)
|
|
66
66
|
});
|
|
67
67
|
};
|
|
68
68
|
const parseFeed = (value, options) => {
|
|
69
69
|
if (!isObject(value)) return;
|
|
70
70
|
const get = createCaseInsensitiveGetter(value);
|
|
71
71
|
return trimObject({
|
|
72
|
-
title: parseSingularOf(get("title"),
|
|
73
|
-
home_page_url: parseSingularOf(get("home_page_url"),
|
|
74
|
-
feed_url: parseSingularOf(get("feed_url"),
|
|
75
|
-
description: parseSingularOf(get("description"),
|
|
76
|
-
user_comment: parseSingularOf(get("user_comment"),
|
|
77
|
-
next_url: parseSingularOf(get("next_url"),
|
|
78
|
-
icon: parseSingularOf(get("icon"),
|
|
79
|
-
favicon: parseSingularOf(get("favicon"),
|
|
80
|
-
language: parseSingularOf(get("language"),
|
|
72
|
+
title: parseSingularOf(get("title"), parseJsonString),
|
|
73
|
+
home_page_url: parseSingularOf(get("home_page_url"), parseJsonString),
|
|
74
|
+
feed_url: parseSingularOf(get("feed_url"), parseJsonString),
|
|
75
|
+
description: parseSingularOf(get("description"), parseJsonString),
|
|
76
|
+
user_comment: parseSingularOf(get("user_comment"), parseJsonString),
|
|
77
|
+
next_url: parseSingularOf(get("next_url"), parseJsonString),
|
|
78
|
+
icon: parseSingularOf(get("icon"), parseJsonString),
|
|
79
|
+
favicon: parseSingularOf(get("favicon"), parseJsonString),
|
|
80
|
+
language: parseSingularOf(get("language"), parseJsonString),
|
|
81
81
|
expired: parseSingularOf(get("expired"), parseBoolean),
|
|
82
82
|
hubs: parseArrayOf(get("hubs"), parseHub),
|
|
83
83
|
authors: retrieveAuthors(value),
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
const require_config = require("../../../common/config.cjs");
|
|
2
2
|
const require_utils = require("../../../common/utils.cjs");
|
|
3
|
-
const require_Expression = require("../../../node_modules/path-expression-matcher/src/Expression.cjs");
|
|
4
3
|
let fast_xml_parser = require("fast-xml-parser");
|
|
5
4
|
//#region src/feeds/rdf/parse/config.ts
|
|
6
5
|
const stopNodes = [
|
|
@@ -26,7 +25,7 @@ const stopNodes = [
|
|
|
26
25
|
];
|
|
27
26
|
const parser = new fast_xml_parser.XMLParser({
|
|
28
27
|
...require_config.parserConfig,
|
|
29
|
-
stopNodes
|
|
28
|
+
stopNodes
|
|
30
29
|
});
|
|
31
30
|
const normalizeNamespaces = require_utils.createNamespaceNormalizator(require_config.namespaceUris, require_config.namespacePrefixes, ["rdf", "rss"]);
|
|
32
31
|
//#endregion
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { namespacePrefixes, namespaceStopNodes, namespaceUris, parserConfig } from "../../../common/config.js";
|
|
2
2
|
import { createNamespaceNormalizator, expandStopNodes } from "../../../common/utils.js";
|
|
3
|
-
import Expression from "../../../node_modules/path-expression-matcher/src/Expression.js";
|
|
4
3
|
import { XMLParser } from "fast-xml-parser";
|
|
5
4
|
//#region src/feeds/rdf/parse/config.ts
|
|
6
5
|
const stopNodes = [
|
|
@@ -26,7 +25,7 @@ const stopNodes = [
|
|
|
26
25
|
];
|
|
27
26
|
const parser = new XMLParser({
|
|
28
27
|
...parserConfig,
|
|
29
|
-
stopNodes
|
|
28
|
+
stopNodes
|
|
30
29
|
});
|
|
31
30
|
const normalizeNamespaces = createNamespaceNormalizator(namespaceUris, namespacePrefixes, ["rdf", "rss"]);
|
|
32
31
|
//#endregion
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
const require_config = require("../../../common/config.cjs");
|
|
2
2
|
const require_utils = require("../../../common/utils.cjs");
|
|
3
|
-
const require_Expression = require("../../../node_modules/path-expression-matcher/src/Expression.cjs");
|
|
4
3
|
let fast_xml_parser = require("fast-xml-parser");
|
|
5
4
|
//#region src/feeds/rss/parse/config.ts
|
|
6
5
|
const sharedStopNodes = [
|
|
@@ -54,7 +53,7 @@ const stopNodes = [
|
|
|
54
53
|
];
|
|
55
54
|
const parser = new fast_xml_parser.XMLParser({
|
|
56
55
|
...require_config.parserConfig,
|
|
57
|
-
stopNodes
|
|
56
|
+
stopNodes
|
|
58
57
|
});
|
|
59
58
|
const normalizeNamespaces = require_utils.createNamespaceNormalizator(require_config.namespaceUris, require_config.namespacePrefixes);
|
|
60
59
|
//#endregion
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { namespacePrefixes, namespaceStopNodes, namespaceUris, parserConfig } from "../../../common/config.js";
|
|
2
2
|
import { createNamespaceNormalizator, expandStopNodes } from "../../../common/utils.js";
|
|
3
|
-
import Expression from "../../../node_modules/path-expression-matcher/src/Expression.js";
|
|
4
3
|
import { XMLParser } from "fast-xml-parser";
|
|
5
4
|
//#region src/feeds/rss/parse/config.ts
|
|
6
5
|
const sharedStopNodes = [
|
|
@@ -54,7 +53,7 @@ const stopNodes = [
|
|
|
54
53
|
];
|
|
55
54
|
const parser = new XMLParser({
|
|
56
55
|
...parserConfig,
|
|
57
|
-
stopNodes
|
|
56
|
+
stopNodes
|
|
58
57
|
});
|
|
59
58
|
const normalizeNamespaces = createNamespaceNormalizator(namespaceUris, namespacePrefixes);
|
|
60
59
|
//#endregion
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
const require_config = require("../../common/config.cjs");
|
|
2
|
-
const require_Expression = require("../../node_modules/path-expression-matcher/src/Expression.cjs");
|
|
3
2
|
let fast_xml_parser = require("fast-xml-parser");
|
|
4
3
|
//#region src/opml/parse/config.ts
|
|
5
4
|
const stopNodes = [
|
|
@@ -19,7 +18,7 @@ const stopNodes = [
|
|
|
19
18
|
];
|
|
20
19
|
const parser = new fast_xml_parser.XMLParser({
|
|
21
20
|
...require_config.parserConfig,
|
|
22
|
-
stopNodes
|
|
21
|
+
stopNodes
|
|
23
22
|
});
|
|
24
23
|
//#endregion
|
|
25
24
|
exports.parser = parser;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { parserConfig } from "../../common/config.js";
|
|
2
|
-
import Expression from "../../node_modules/path-expression-matcher/src/Expression.js";
|
|
3
2
|
import { XMLParser } from "fast-xml-parser";
|
|
4
3
|
//#region src/opml/parse/config.ts
|
|
5
4
|
const stopNodes = [
|
|
@@ -19,7 +18,7 @@ const stopNodes = [
|
|
|
19
18
|
];
|
|
20
19
|
const parser = new XMLParser({
|
|
21
20
|
...parserConfig,
|
|
22
|
-
stopNodes
|
|
21
|
+
stopNodes
|
|
23
22
|
});
|
|
24
23
|
//#endregion
|
|
25
24
|
export { parser };
|
package/package.json
CHANGED
|
@@ -72,13 +72,13 @@
|
|
|
72
72
|
},
|
|
73
73
|
"dependencies": {
|
|
74
74
|
"entities": "^7.0.1",
|
|
75
|
-
"fast-xml-parser": "~5.
|
|
75
|
+
"fast-xml-parser": "~5.7.2"
|
|
76
76
|
},
|
|
77
77
|
"devDependencies": {
|
|
78
|
-
"@types/bun": "^1.3.
|
|
79
|
-
"kvalita": "^1.
|
|
80
|
-
"tsdown": "^0.21.
|
|
78
|
+
"@types/bun": "^1.3.13",
|
|
79
|
+
"kvalita": "^1.13.0",
|
|
80
|
+
"tsdown": "^0.21.10",
|
|
81
81
|
"vitepress": "^2.0.0-alpha.17"
|
|
82
82
|
},
|
|
83
|
-
"version": "2.9.
|
|
83
|
+
"version": "2.9.4"
|
|
84
84
|
}
|
|
@@ -1,153 +0,0 @@
|
|
|
1
|
-
//#region node_modules/path-expression-matcher/src/Expression.js
|
|
2
|
-
/**
|
|
3
|
-
* Expression - Parses and stores a tag pattern expression
|
|
4
|
-
*
|
|
5
|
-
* Patterns are parsed once and stored in an optimized structure for fast matching.
|
|
6
|
-
*
|
|
7
|
-
* @example
|
|
8
|
-
* const expr = new Expression("root.users.user");
|
|
9
|
-
* const expr2 = new Expression("..user[id]:first");
|
|
10
|
-
* const expr3 = new Expression("root/users/user", { separator: '/' });
|
|
11
|
-
*/
|
|
12
|
-
var Expression = class {
|
|
13
|
-
/**
|
|
14
|
-
* Create a new Expression
|
|
15
|
-
* @param {string} pattern - Pattern string (e.g., "root.users.user", "..user[id]")
|
|
16
|
-
* @param {Object} options - Configuration options
|
|
17
|
-
* @param {string} options.separator - Path separator (default: '.')
|
|
18
|
-
*/
|
|
19
|
-
constructor(pattern, options = {}, data) {
|
|
20
|
-
this.pattern = pattern;
|
|
21
|
-
this.separator = options.separator || ".";
|
|
22
|
-
this.segments = this._parse(pattern);
|
|
23
|
-
this.data = data;
|
|
24
|
-
this._hasDeepWildcard = this.segments.some((seg) => seg.type === "deep-wildcard");
|
|
25
|
-
this._hasAttributeCondition = this.segments.some((seg) => seg.attrName !== void 0);
|
|
26
|
-
this._hasPositionSelector = this.segments.some((seg) => seg.position !== void 0);
|
|
27
|
-
}
|
|
28
|
-
/**
|
|
29
|
-
* Parse pattern string into segments
|
|
30
|
-
* @private
|
|
31
|
-
* @param {string} pattern - Pattern to parse
|
|
32
|
-
* @returns {Array} Array of segment objects
|
|
33
|
-
*/
|
|
34
|
-
_parse(pattern) {
|
|
35
|
-
const segments = [];
|
|
36
|
-
let i = 0;
|
|
37
|
-
let currentPart = "";
|
|
38
|
-
while (i < pattern.length) if (pattern[i] === this.separator) if (i + 1 < pattern.length && pattern[i + 1] === this.separator) {
|
|
39
|
-
if (currentPart.trim()) {
|
|
40
|
-
segments.push(this._parseSegment(currentPart.trim()));
|
|
41
|
-
currentPart = "";
|
|
42
|
-
}
|
|
43
|
-
segments.push({ type: "deep-wildcard" });
|
|
44
|
-
i += 2;
|
|
45
|
-
} else {
|
|
46
|
-
if (currentPart.trim()) segments.push(this._parseSegment(currentPart.trim()));
|
|
47
|
-
currentPart = "";
|
|
48
|
-
i++;
|
|
49
|
-
}
|
|
50
|
-
else {
|
|
51
|
-
currentPart += pattern[i];
|
|
52
|
-
i++;
|
|
53
|
-
}
|
|
54
|
-
if (currentPart.trim()) segments.push(this._parseSegment(currentPart.trim()));
|
|
55
|
-
return segments;
|
|
56
|
-
}
|
|
57
|
-
/**
|
|
58
|
-
* Parse a single segment
|
|
59
|
-
* @private
|
|
60
|
-
* @param {string} part - Segment string (e.g., "user", "ns::user", "user[id]", "ns::user:first")
|
|
61
|
-
* @returns {Object} Segment object
|
|
62
|
-
*/
|
|
63
|
-
_parseSegment(part) {
|
|
64
|
-
const segment = { type: "tag" };
|
|
65
|
-
let bracketContent = null;
|
|
66
|
-
let withoutBrackets = part;
|
|
67
|
-
const bracketMatch = part.match(/^([^\[]+)(\[[^\]]*\])(.*)$/);
|
|
68
|
-
if (bracketMatch) {
|
|
69
|
-
withoutBrackets = bracketMatch[1] + bracketMatch[3];
|
|
70
|
-
if (bracketMatch[2]) {
|
|
71
|
-
const content = bracketMatch[2].slice(1, -1);
|
|
72
|
-
if (content) bracketContent = content;
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
let namespace = void 0;
|
|
76
|
-
let tagAndPosition = withoutBrackets;
|
|
77
|
-
if (withoutBrackets.includes("::")) {
|
|
78
|
-
const nsIndex = withoutBrackets.indexOf("::");
|
|
79
|
-
namespace = withoutBrackets.substring(0, nsIndex).trim();
|
|
80
|
-
tagAndPosition = withoutBrackets.substring(nsIndex + 2).trim();
|
|
81
|
-
if (!namespace) throw new Error(`Invalid namespace in pattern: ${part}`);
|
|
82
|
-
}
|
|
83
|
-
let tag = void 0;
|
|
84
|
-
let positionMatch = null;
|
|
85
|
-
if (tagAndPosition.includes(":")) {
|
|
86
|
-
const colonIndex = tagAndPosition.lastIndexOf(":");
|
|
87
|
-
const tagPart = tagAndPosition.substring(0, colonIndex).trim();
|
|
88
|
-
const posPart = tagAndPosition.substring(colonIndex + 1).trim();
|
|
89
|
-
if ([
|
|
90
|
-
"first",
|
|
91
|
-
"last",
|
|
92
|
-
"odd",
|
|
93
|
-
"even"
|
|
94
|
-
].includes(posPart) || /^nth\(\d+\)$/.test(posPart)) {
|
|
95
|
-
tag = tagPart;
|
|
96
|
-
positionMatch = posPart;
|
|
97
|
-
} else tag = tagAndPosition;
|
|
98
|
-
} else tag = tagAndPosition;
|
|
99
|
-
if (!tag) throw new Error(`Invalid segment pattern: ${part}`);
|
|
100
|
-
segment.tag = tag;
|
|
101
|
-
if (namespace) segment.namespace = namespace;
|
|
102
|
-
if (bracketContent) if (bracketContent.includes("=")) {
|
|
103
|
-
const eqIndex = bracketContent.indexOf("=");
|
|
104
|
-
segment.attrName = bracketContent.substring(0, eqIndex).trim();
|
|
105
|
-
segment.attrValue = bracketContent.substring(eqIndex + 1).trim();
|
|
106
|
-
} else segment.attrName = bracketContent.trim();
|
|
107
|
-
if (positionMatch) {
|
|
108
|
-
const nthMatch = positionMatch.match(/^nth\((\d+)\)$/);
|
|
109
|
-
if (nthMatch) {
|
|
110
|
-
segment.position = "nth";
|
|
111
|
-
segment.positionValue = parseInt(nthMatch[1], 10);
|
|
112
|
-
} else segment.position = positionMatch;
|
|
113
|
-
}
|
|
114
|
-
return segment;
|
|
115
|
-
}
|
|
116
|
-
/**
|
|
117
|
-
* Get the number of segments
|
|
118
|
-
* @returns {number}
|
|
119
|
-
*/
|
|
120
|
-
get length() {
|
|
121
|
-
return this.segments.length;
|
|
122
|
-
}
|
|
123
|
-
/**
|
|
124
|
-
* Check if expression contains deep wildcard
|
|
125
|
-
* @returns {boolean}
|
|
126
|
-
*/
|
|
127
|
-
hasDeepWildcard() {
|
|
128
|
-
return this._hasDeepWildcard;
|
|
129
|
-
}
|
|
130
|
-
/**
|
|
131
|
-
* Check if expression has attribute conditions
|
|
132
|
-
* @returns {boolean}
|
|
133
|
-
*/
|
|
134
|
-
hasAttributeCondition() {
|
|
135
|
-
return this._hasAttributeCondition;
|
|
136
|
-
}
|
|
137
|
-
/**
|
|
138
|
-
* Check if expression has position selectors
|
|
139
|
-
* @returns {boolean}
|
|
140
|
-
*/
|
|
141
|
-
hasPositionSelector() {
|
|
142
|
-
return this._hasPositionSelector;
|
|
143
|
-
}
|
|
144
|
-
/**
|
|
145
|
-
* Get string representation
|
|
146
|
-
* @returns {string}
|
|
147
|
-
*/
|
|
148
|
-
toString() {
|
|
149
|
-
return this.pattern;
|
|
150
|
-
}
|
|
151
|
-
};
|
|
152
|
-
//#endregion
|
|
153
|
-
exports.default = Expression;
|
|
@@ -1,153 +0,0 @@
|
|
|
1
|
-
//#region node_modules/path-expression-matcher/src/Expression.js
|
|
2
|
-
/**
|
|
3
|
-
* Expression - Parses and stores a tag pattern expression
|
|
4
|
-
*
|
|
5
|
-
* Patterns are parsed once and stored in an optimized structure for fast matching.
|
|
6
|
-
*
|
|
7
|
-
* @example
|
|
8
|
-
* const expr = new Expression("root.users.user");
|
|
9
|
-
* const expr2 = new Expression("..user[id]:first");
|
|
10
|
-
* const expr3 = new Expression("root/users/user", { separator: '/' });
|
|
11
|
-
*/
|
|
12
|
-
var Expression = class {
|
|
13
|
-
/**
|
|
14
|
-
* Create a new Expression
|
|
15
|
-
* @param {string} pattern - Pattern string (e.g., "root.users.user", "..user[id]")
|
|
16
|
-
* @param {Object} options - Configuration options
|
|
17
|
-
* @param {string} options.separator - Path separator (default: '.')
|
|
18
|
-
*/
|
|
19
|
-
constructor(pattern, options = {}, data) {
|
|
20
|
-
this.pattern = pattern;
|
|
21
|
-
this.separator = options.separator || ".";
|
|
22
|
-
this.segments = this._parse(pattern);
|
|
23
|
-
this.data = data;
|
|
24
|
-
this._hasDeepWildcard = this.segments.some((seg) => seg.type === "deep-wildcard");
|
|
25
|
-
this._hasAttributeCondition = this.segments.some((seg) => seg.attrName !== void 0);
|
|
26
|
-
this._hasPositionSelector = this.segments.some((seg) => seg.position !== void 0);
|
|
27
|
-
}
|
|
28
|
-
/**
|
|
29
|
-
* Parse pattern string into segments
|
|
30
|
-
* @private
|
|
31
|
-
* @param {string} pattern - Pattern to parse
|
|
32
|
-
* @returns {Array} Array of segment objects
|
|
33
|
-
*/
|
|
34
|
-
_parse(pattern) {
|
|
35
|
-
const segments = [];
|
|
36
|
-
let i = 0;
|
|
37
|
-
let currentPart = "";
|
|
38
|
-
while (i < pattern.length) if (pattern[i] === this.separator) if (i + 1 < pattern.length && pattern[i + 1] === this.separator) {
|
|
39
|
-
if (currentPart.trim()) {
|
|
40
|
-
segments.push(this._parseSegment(currentPart.trim()));
|
|
41
|
-
currentPart = "";
|
|
42
|
-
}
|
|
43
|
-
segments.push({ type: "deep-wildcard" });
|
|
44
|
-
i += 2;
|
|
45
|
-
} else {
|
|
46
|
-
if (currentPart.trim()) segments.push(this._parseSegment(currentPart.trim()));
|
|
47
|
-
currentPart = "";
|
|
48
|
-
i++;
|
|
49
|
-
}
|
|
50
|
-
else {
|
|
51
|
-
currentPart += pattern[i];
|
|
52
|
-
i++;
|
|
53
|
-
}
|
|
54
|
-
if (currentPart.trim()) segments.push(this._parseSegment(currentPart.trim()));
|
|
55
|
-
return segments;
|
|
56
|
-
}
|
|
57
|
-
/**
|
|
58
|
-
* Parse a single segment
|
|
59
|
-
* @private
|
|
60
|
-
* @param {string} part - Segment string (e.g., "user", "ns::user", "user[id]", "ns::user:first")
|
|
61
|
-
* @returns {Object} Segment object
|
|
62
|
-
*/
|
|
63
|
-
_parseSegment(part) {
|
|
64
|
-
const segment = { type: "tag" };
|
|
65
|
-
let bracketContent = null;
|
|
66
|
-
let withoutBrackets = part;
|
|
67
|
-
const bracketMatch = part.match(/^([^\[]+)(\[[^\]]*\])(.*)$/);
|
|
68
|
-
if (bracketMatch) {
|
|
69
|
-
withoutBrackets = bracketMatch[1] + bracketMatch[3];
|
|
70
|
-
if (bracketMatch[2]) {
|
|
71
|
-
const content = bracketMatch[2].slice(1, -1);
|
|
72
|
-
if (content) bracketContent = content;
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
let namespace = void 0;
|
|
76
|
-
let tagAndPosition = withoutBrackets;
|
|
77
|
-
if (withoutBrackets.includes("::")) {
|
|
78
|
-
const nsIndex = withoutBrackets.indexOf("::");
|
|
79
|
-
namespace = withoutBrackets.substring(0, nsIndex).trim();
|
|
80
|
-
tagAndPosition = withoutBrackets.substring(nsIndex + 2).trim();
|
|
81
|
-
if (!namespace) throw new Error(`Invalid namespace in pattern: ${part}`);
|
|
82
|
-
}
|
|
83
|
-
let tag = void 0;
|
|
84
|
-
let positionMatch = null;
|
|
85
|
-
if (tagAndPosition.includes(":")) {
|
|
86
|
-
const colonIndex = tagAndPosition.lastIndexOf(":");
|
|
87
|
-
const tagPart = tagAndPosition.substring(0, colonIndex).trim();
|
|
88
|
-
const posPart = tagAndPosition.substring(colonIndex + 1).trim();
|
|
89
|
-
if ([
|
|
90
|
-
"first",
|
|
91
|
-
"last",
|
|
92
|
-
"odd",
|
|
93
|
-
"even"
|
|
94
|
-
].includes(posPart) || /^nth\(\d+\)$/.test(posPart)) {
|
|
95
|
-
tag = tagPart;
|
|
96
|
-
positionMatch = posPart;
|
|
97
|
-
} else tag = tagAndPosition;
|
|
98
|
-
} else tag = tagAndPosition;
|
|
99
|
-
if (!tag) throw new Error(`Invalid segment pattern: ${part}`);
|
|
100
|
-
segment.tag = tag;
|
|
101
|
-
if (namespace) segment.namespace = namespace;
|
|
102
|
-
if (bracketContent) if (bracketContent.includes("=")) {
|
|
103
|
-
const eqIndex = bracketContent.indexOf("=");
|
|
104
|
-
segment.attrName = bracketContent.substring(0, eqIndex).trim();
|
|
105
|
-
segment.attrValue = bracketContent.substring(eqIndex + 1).trim();
|
|
106
|
-
} else segment.attrName = bracketContent.trim();
|
|
107
|
-
if (positionMatch) {
|
|
108
|
-
const nthMatch = positionMatch.match(/^nth\((\d+)\)$/);
|
|
109
|
-
if (nthMatch) {
|
|
110
|
-
segment.position = "nth";
|
|
111
|
-
segment.positionValue = parseInt(nthMatch[1], 10);
|
|
112
|
-
} else segment.position = positionMatch;
|
|
113
|
-
}
|
|
114
|
-
return segment;
|
|
115
|
-
}
|
|
116
|
-
/**
|
|
117
|
-
* Get the number of segments
|
|
118
|
-
* @returns {number}
|
|
119
|
-
*/
|
|
120
|
-
get length() {
|
|
121
|
-
return this.segments.length;
|
|
122
|
-
}
|
|
123
|
-
/**
|
|
124
|
-
* Check if expression contains deep wildcard
|
|
125
|
-
* @returns {boolean}
|
|
126
|
-
*/
|
|
127
|
-
hasDeepWildcard() {
|
|
128
|
-
return this._hasDeepWildcard;
|
|
129
|
-
}
|
|
130
|
-
/**
|
|
131
|
-
* Check if expression has attribute conditions
|
|
132
|
-
* @returns {boolean}
|
|
133
|
-
*/
|
|
134
|
-
hasAttributeCondition() {
|
|
135
|
-
return this._hasAttributeCondition;
|
|
136
|
-
}
|
|
137
|
-
/**
|
|
138
|
-
* Check if expression has position selectors
|
|
139
|
-
* @returns {boolean}
|
|
140
|
-
*/
|
|
141
|
-
hasPositionSelector() {
|
|
142
|
-
return this._hasPositionSelector;
|
|
143
|
-
}
|
|
144
|
-
/**
|
|
145
|
-
* Get string representation
|
|
146
|
-
* @returns {string}
|
|
147
|
-
*/
|
|
148
|
-
toString() {
|
|
149
|
-
return this.pattern;
|
|
150
|
-
}
|
|
151
|
-
};
|
|
152
|
-
//#endregion
|
|
153
|
-
export { Expression as default };
|