feedsmith 2.9.1 → 3.0.0-beta.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.
Files changed (166) hide show
  1. package/README.md +3 -9
  2. package/dist/common/config.cjs +2 -1
  3. package/dist/common/config.js +2 -1
  4. package/dist/common/errors.cjs +30 -0
  5. package/dist/common/errors.d.cts +15 -0
  6. package/dist/common/errors.d.ts +15 -0
  7. package/dist/common/errors.js +27 -0
  8. package/dist/common/parse.cjs +2 -1
  9. package/dist/common/parse.d.cts +10 -11
  10. package/dist/common/parse.d.ts +10 -11
  11. package/dist/common/parse.js +2 -1
  12. package/dist/common/types.d.cts +24 -12
  13. package/dist/common/types.d.ts +24 -12
  14. package/dist/common/utils.cjs +65 -34
  15. package/dist/common/utils.js +66 -33
  16. package/dist/feeds/atom/common/types.d.cts +65 -52
  17. package/dist/feeds/atom/common/types.d.ts +65 -52
  18. package/dist/feeds/atom/detect/index.cjs +4 -2
  19. package/dist/feeds/atom/detect/index.js +4 -2
  20. package/dist/feeds/atom/generate/index.cjs +2 -1
  21. package/dist/feeds/atom/generate/index.d.cts +2 -2
  22. package/dist/feeds/atom/generate/index.d.ts +2 -2
  23. package/dist/feeds/atom/generate/index.js +2 -1
  24. package/dist/feeds/atom/generate/utils.cjs +23 -6
  25. package/dist/feeds/atom/generate/utils.js +20 -3
  26. package/dist/feeds/atom/parse/index.cjs +10 -3
  27. package/dist/feeds/atom/parse/index.d.cts +2 -2
  28. package/dist/feeds/atom/parse/index.d.ts +2 -2
  29. package/dist/feeds/atom/parse/index.js +10 -3
  30. package/dist/feeds/atom/parse/utils.cjs +61 -31
  31. package/dist/feeds/atom/parse/utils.js +59 -29
  32. package/dist/feeds/json/common/types.d.cts +19 -19
  33. package/dist/feeds/json/common/types.d.ts +19 -19
  34. package/dist/feeds/json/generate/index.cjs +5 -1
  35. package/dist/feeds/json/generate/index.d.cts +2 -2
  36. package/dist/feeds/json/generate/index.d.ts +2 -2
  37. package/dist/feeds/json/generate/index.js +5 -1
  38. package/dist/feeds/json/generate/utils.cjs +7 -2
  39. package/dist/feeds/json/generate/utils.js +8 -3
  40. package/dist/feeds/json/parse/index.cjs +3 -2
  41. package/dist/feeds/json/parse/index.d.cts +2 -2
  42. package/dist/feeds/json/parse/index.d.ts +2 -2
  43. package/dist/feeds/json/parse/index.js +3 -2
  44. package/dist/feeds/json/parse/utils.cjs +4 -4
  45. package/dist/feeds/json/parse/utils.js +4 -4
  46. package/dist/feeds/rdf/common/types.d.cts +31 -28
  47. package/dist/feeds/rdf/common/types.d.ts +31 -28
  48. package/dist/feeds/rdf/detect/index.cjs +4 -2
  49. package/dist/feeds/rdf/detect/index.js +4 -2
  50. package/dist/feeds/rdf/parse/index.cjs +10 -3
  51. package/dist/feeds/rdf/parse/index.d.cts +2 -2
  52. package/dist/feeds/rdf/parse/index.d.ts +2 -2
  53. package/dist/feeds/rdf/parse/index.js +10 -3
  54. package/dist/feeds/rdf/parse/utils.cjs +23 -20
  55. package/dist/feeds/rdf/parse/utils.js +15 -12
  56. package/dist/feeds/rss/common/types.d.cts +76 -74
  57. package/dist/feeds/rss/common/types.d.ts +76 -74
  58. package/dist/feeds/rss/detect/index.cjs +6 -3
  59. package/dist/feeds/rss/detect/index.js +6 -3
  60. package/dist/feeds/rss/generate/index.cjs +2 -1
  61. package/dist/feeds/rss/generate/index.d.cts +2 -2
  62. package/dist/feeds/rss/generate/index.d.ts +2 -2
  63. package/dist/feeds/rss/generate/index.js +2 -1
  64. package/dist/feeds/rss/generate/utils.cjs +36 -36
  65. package/dist/feeds/rss/generate/utils.js +10 -10
  66. package/dist/feeds/rss/parse/index.cjs +10 -3
  67. package/dist/feeds/rss/parse/index.d.cts +2 -2
  68. package/dist/feeds/rss/parse/index.d.ts +2 -2
  69. package/dist/feeds/rss/parse/index.js +10 -3
  70. package/dist/feeds/rss/parse/utils.cjs +138 -38
  71. package/dist/feeds/rss/parse/utils.js +119 -19
  72. package/dist/index.cjs +5 -0
  73. package/dist/index.d.cts +37 -16
  74. package/dist/index.d.ts +37 -16
  75. package/dist/index.js +2 -1
  76. package/dist/namespaces/app/common/types.d.cts +1 -3
  77. package/dist/namespaces/app/common/types.d.ts +1 -3
  78. package/dist/namespaces/app/parse/utils.cjs +2 -2
  79. package/dist/namespaces/app/parse/utils.js +2 -2
  80. package/dist/namespaces/atom/common/types.d.cts +3 -3
  81. package/dist/namespaces/atom/common/types.d.ts +3 -3
  82. package/dist/namespaces/atom/parse/utils.cjs +4 -2
  83. package/dist/namespaces/atom/parse/utils.js +4 -2
  84. package/dist/namespaces/dc/common/types.d.cts +4 -19
  85. package/dist/namespaces/dc/common/types.d.ts +4 -19
  86. package/dist/namespaces/dc/generate/utils.cjs +15 -15
  87. package/dist/namespaces/dc/generate/utils.js +16 -16
  88. package/dist/namespaces/dc/parse/utils.cjs +4 -17
  89. package/dist/namespaces/dc/parse/utils.js +5 -18
  90. package/dist/namespaces/dcterms/common/types.d.cts +23 -59
  91. package/dist/namespaces/dcterms/common/types.d.ts +23 -59
  92. package/dist/namespaces/dcterms/generate/utils.cjs +55 -55
  93. package/dist/namespaces/dcterms/generate/utils.js +56 -56
  94. package/dist/namespaces/dcterms/parse/utils.cjs +23 -57
  95. package/dist/namespaces/dcterms/parse/utils.js +24 -58
  96. package/dist/namespaces/georss/common/types.d.cts +21 -19
  97. package/dist/namespaces/georss/common/types.d.ts +21 -19
  98. package/dist/namespaces/georss/generate/utils.cjs +2 -2
  99. package/dist/namespaces/georss/generate/utils.js +2 -2
  100. package/dist/namespaces/georss/parse/utils.cjs +2 -1
  101. package/dist/namespaces/georss/parse/utils.js +2 -1
  102. package/dist/namespaces/googleplay/common/types.d.cts +9 -7
  103. package/dist/namespaces/googleplay/common/types.d.ts +9 -7
  104. package/dist/namespaces/itunes/common/types.d.cts +9 -5
  105. package/dist/namespaces/itunes/common/types.d.ts +9 -5
  106. package/dist/namespaces/itunes/parse/utils.cjs +3 -2
  107. package/dist/namespaces/itunes/parse/utils.js +3 -2
  108. package/dist/namespaces/media/common/types.d.cts +85 -84
  109. package/dist/namespaces/media/common/types.d.ts +85 -84
  110. package/dist/namespaces/media/generate/utils.cjs +1 -1
  111. package/dist/namespaces/media/generate/utils.js +2 -2
  112. package/dist/namespaces/media/parse/utils.cjs +1 -2
  113. package/dist/namespaces/media/parse/utils.js +1 -2
  114. package/dist/namespaces/opensearch/common/types.d.cts +7 -5
  115. package/dist/namespaces/opensearch/common/types.d.ts +7 -5
  116. package/dist/namespaces/podcast/common/types.d.cts +136 -142
  117. package/dist/namespaces/podcast/common/types.d.ts +136 -142
  118. package/dist/namespaces/podcast/generate/utils.cjs +6 -6
  119. package/dist/namespaces/podcast/generate/utils.js +7 -7
  120. package/dist/namespaces/podcast/parse/utils.cjs +17 -21
  121. package/dist/namespaces/podcast/parse/utils.js +17 -21
  122. package/dist/namespaces/prism/common/types.d.cts +2 -4
  123. package/dist/namespaces/prism/common/types.d.ts +2 -4
  124. package/dist/namespaces/prism/parse/utils.cjs +19 -19
  125. package/dist/namespaces/prism/parse/utils.js +19 -19
  126. package/dist/namespaces/psc/common/types.d.cts +8 -6
  127. package/dist/namespaces/psc/common/types.d.ts +8 -6
  128. package/dist/namespaces/rawvoice/common/types.d.cts +24 -24
  129. package/dist/namespaces/rawvoice/common/types.d.ts +24 -24
  130. package/dist/namespaces/rawvoice/parse/utils.cjs +8 -8
  131. package/dist/namespaces/rawvoice/parse/utils.js +8 -8
  132. package/dist/namespaces/source/common/types.d.cts +20 -18
  133. package/dist/namespaces/source/common/types.d.ts +20 -18
  134. package/dist/namespaces/spotify/common/types.d.cts +22 -20
  135. package/dist/namespaces/spotify/common/types.d.ts +22 -20
  136. package/dist/namespaces/sy/common/types.d.cts +1 -3
  137. package/dist/namespaces/sy/common/types.d.ts +1 -3
  138. package/dist/namespaces/sy/parse/utils.cjs +2 -2
  139. package/dist/namespaces/sy/parse/utils.js +2 -2
  140. package/dist/namespaces/thr/common/types.d.cts +7 -7
  141. package/dist/namespaces/thr/common/types.d.ts +7 -7
  142. package/dist/namespaces/thr/parse/utils.cjs +2 -2
  143. package/dist/namespaces/thr/parse/utils.js +2 -2
  144. package/dist/namespaces/xml/common/types.d.cts +11 -0
  145. package/dist/namespaces/xml/common/types.d.ts +11 -0
  146. package/dist/namespaces/xml/generate/utils.cjs +13 -0
  147. package/dist/namespaces/xml/generate/utils.js +13 -0
  148. package/dist/namespaces/xml/parse/utils.cjs +13 -0
  149. package/dist/namespaces/xml/parse/utils.js +13 -0
  150. package/dist/opml/common/types.d.cts +18 -13
  151. package/dist/opml/common/types.d.ts +18 -13
  152. package/dist/opml/generate/index.cjs +2 -1
  153. package/dist/opml/generate/index.d.cts +3 -3
  154. package/dist/opml/generate/index.d.ts +3 -3
  155. package/dist/opml/generate/index.js +2 -1
  156. package/dist/opml/parse/index.cjs +9 -2
  157. package/dist/opml/parse/index.d.cts +2 -3
  158. package/dist/opml/parse/index.d.ts +2 -3
  159. package/dist/opml/parse/index.js +9 -2
  160. package/dist/opml/parse/utils.cjs +5 -5
  161. package/dist/opml/parse/utils.js +5 -5
  162. package/package.json +7 -24
  163. package/dist/types.cjs +0 -0
  164. package/dist/types.d.cts +0 -7
  165. package/dist/types.d.ts +0 -7
  166. package/dist/types.js +0 -1
@@ -1,4 +1,4 @@
1
- import { DateLike } from "../../../common/types.js";
1
+ import { Requirable, Strict } from "../../../common/types.js";
2
2
 
3
3
  //#region src/feeds/json/common/types.d.ts
4
4
  declare namespace Json {
@@ -7,15 +7,15 @@ declare namespace Json {
7
7
  url?: string;
8
8
  avatar?: string;
9
9
  };
10
- type Attachment = {
11
- url: string;
12
- mime_type: string;
10
+ type Attachment<TStrict extends boolean = false> = Strict<{
11
+ url: Requirable<string>;
12
+ mime_type: Requirable<string>;
13
13
  title?: string;
14
14
  size_in_bytes?: number;
15
15
  duration_in_seconds?: number;
16
- };
17
- type Item<TDate extends DateLike> = {
18
- id: string;
16
+ }, TStrict>;
17
+ type Item<TDate, TStrict extends boolean = false> = Strict<{
18
+ id: Requirable<string>;
19
19
  url?: string;
20
20
  external_url?: string;
21
21
  title?: string;
@@ -29,18 +29,18 @@ declare namespace Json {
29
29
  tags?: Array<string>;
30
30
  authors?: Array<Author>;
31
31
  language?: string;
32
- attachments?: Array<Attachment>;
33
- } & ({
32
+ attachments?: Array<Attachment<TStrict>>;
33
+ }, TStrict> & (TStrict extends true ? {
34
34
  content_html: string;
35
35
  } | {
36
36
  content_text: string;
37
- });
38
- type Hub = {
39
- type: string;
40
- url: string;
41
- };
42
- type Feed<TDate extends DateLike> = {
43
- title: string;
37
+ } : unknown);
38
+ type Hub<TStrict extends boolean = false> = Strict<{
39
+ type: Requirable<string>;
40
+ url: Requirable<string>;
41
+ }, TStrict>;
42
+ type Feed<TDate, TStrict extends boolean = false> = Strict<{
43
+ title: Requirable<string>;
44
44
  home_page_url?: string;
45
45
  feed_url?: string;
46
46
  description?: string;
@@ -50,10 +50,10 @@ declare namespace Json {
50
50
  favicon?: string;
51
51
  language?: string;
52
52
  expired?: boolean;
53
- hubs?: Array<Hub>;
53
+ hubs?: Array<Hub<TStrict>>;
54
54
  authors?: Array<Author>;
55
- items: Array<Item<TDate>>;
56
- };
55
+ items: Requirable<Array<Item<TDate, TStrict>>>;
56
+ }, TStrict>;
57
57
  }
58
58
  //#endregion
59
59
  export { Json };
@@ -1,7 +1,11 @@
1
+ const require_errors = require("../../../common/errors.cjs");
2
+ const require_config = require("../../../common/config.cjs");
1
3
  const require_utils = require("./utils.cjs");
2
4
  //#region src/feeds/json/generate/index.ts
3
5
  const generate = (value) => {
4
- return require_utils.generateFeed(value);
6
+ const generated = require_utils.generateFeed(value);
7
+ if (!generated) throw new require_errors.GenerateError(require_config.locales.invalidInputJson);
8
+ return generated;
5
9
  };
6
10
  //#endregion
7
11
  exports.generate = generate;
@@ -1,7 +1,7 @@
1
- import { DateLike, DeepPartial, JsonGenerateMain } from "../../../common/types.cjs";
1
+ import { DateLike, GenerateMainJson } from "../../../common/types.cjs";
2
2
  import { Json } from "../common/types.cjs";
3
3
 
4
4
  //#region src/feeds/json/generate/index.d.ts
5
- declare const generate: JsonGenerateMain<Json.Feed<Date>, DeepPartial<Json.Feed<DateLike>>>;
5
+ declare const generate: GenerateMainJson<Json.Feed<DateLike>, Json.Feed<Date, true>>;
6
6
  //#endregion
7
7
  export { generate };
@@ -1,7 +1,7 @@
1
- import { DateLike, DeepPartial, JsonGenerateMain } from "../../../common/types.js";
1
+ import { DateLike, GenerateMainJson } from "../../../common/types.js";
2
2
  import { Json } from "../common/types.js";
3
3
 
4
4
  //#region src/feeds/json/generate/index.d.ts
5
- declare const generate: JsonGenerateMain<Json.Feed<Date>, DeepPartial<Json.Feed<DateLike>>>;
5
+ declare const generate: GenerateMainJson<Json.Feed<DateLike>, Json.Feed<Date, true>>;
6
6
  //#endregion
7
7
  export { generate };
@@ -1,7 +1,11 @@
1
+ import { GenerateError } from "../../../common/errors.js";
2
+ import { locales } from "../../../common/config.js";
1
3
  import { generateFeed } from "./utils.js";
2
4
  //#region src/feeds/json/generate/index.ts
3
5
  const generate = (value) => {
4
- return generateFeed(value);
6
+ const generated = generateFeed(value);
7
+ if (!generated) throw new GenerateError(locales.invalidInputJson);
8
+ return generated;
5
9
  };
6
10
  //#endregion
7
11
  export { generate };
@@ -8,11 +8,16 @@ const generateItem = (item) => {
8
8
  });
9
9
  };
10
10
  const generateFeed = (feed) => {
11
- return require_utils.trimObject({
12
- version: "https://jsonfeed.org/version/1.1",
11
+ if (!require_utils.isObject(feed)) return;
12
+ const trimmed = require_utils.trimObject({
13
13
  ...feed,
14
14
  items: require_utils.trimArray(feed?.items, generateItem)
15
15
  });
16
+ if (!trimmed) return;
17
+ return {
18
+ version: "https://jsonfeed.org/version/1.1",
19
+ ...trimmed
20
+ };
16
21
  };
17
22
  //#endregion
18
23
  exports.generateFeed = generateFeed;
@@ -1,4 +1,4 @@
1
- import { generateRfc3339Date, trimArray, trimObject } from "../../../common/utils.js";
1
+ import { generateRfc3339Date, isObject, trimArray, trimObject } from "../../../common/utils.js";
2
2
  //#region src/feeds/json/generate/utils.ts
3
3
  const generateItem = (item) => {
4
4
  return trimObject({
@@ -8,11 +8,16 @@ const generateItem = (item) => {
8
8
  });
9
9
  };
10
10
  const generateFeed = (feed) => {
11
- return trimObject({
12
- version: "https://jsonfeed.org/version/1.1",
11
+ if (!isObject(feed)) return;
12
+ const trimmed = trimObject({
13
13
  ...feed,
14
14
  items: trimArray(feed?.items, generateItem)
15
15
  });
16
+ if (!trimmed) return;
17
+ return {
18
+ version: "https://jsonfeed.org/version/1.1",
19
+ ...trimmed
20
+ };
16
21
  };
17
22
  //#endregion
18
23
  export { generateFeed };
@@ -1,3 +1,4 @@
1
+ const require_errors = require("../../../common/errors.cjs");
1
2
  const require_config = require("../../../common/config.cjs");
2
3
  const require_utils = require("../../../common/utils.cjs");
3
4
  const require_utils$1 = require("./utils.cjs");
@@ -5,9 +6,9 @@ const require_index = require("../detect/index.cjs");
5
6
  //#region src/feeds/json/parse/index.ts
6
7
  const parse = (value, options) => {
7
8
  const json = require_utils.parseJsonObject(value);
8
- if (!require_index.detect(json)) throw new Error(require_config.locales.invalidFeedFormat);
9
+ if (!require_index.detect(json)) throw new require_errors.DetectError(require_config.locales.invalidFeedFormat);
9
10
  const parsed = require_utils$1.parseFeed(json, options);
10
- if (!parsed) throw new Error(require_config.locales.invalidFeedFormat);
11
+ if (!parsed) throw new require_errors.ParseError(require_config.locales.invalidFeedFormat);
11
12
  return parsed;
12
13
  };
13
14
  //#endregion
@@ -1,7 +1,7 @@
1
- import { DeepPartial, ParseOptions } from "../../../common/types.cjs";
1
+ import { ParseMainOptions } from "../../../common/types.cjs";
2
2
  import { Json } from "../common/types.cjs";
3
3
 
4
4
  //#region src/feeds/json/parse/index.d.ts
5
- declare const parse: (value: unknown, options?: ParseOptions) => DeepPartial<Json.Feed<string>>;
5
+ declare const parse: <TDate = string>(value: unknown, options?: ParseMainOptions<TDate>) => Json.Feed<TDate>;
6
6
  //#endregion
7
7
  export { parse };
@@ -1,7 +1,7 @@
1
- import { DeepPartial, ParseOptions } from "../../../common/types.js";
1
+ import { ParseMainOptions } from "../../../common/types.js";
2
2
  import { Json } from "../common/types.js";
3
3
 
4
4
  //#region src/feeds/json/parse/index.d.ts
5
- declare const parse: (value: unknown, options?: ParseOptions) => DeepPartial<Json.Feed<string>>;
5
+ declare const parse: <TDate = string>(value: unknown, options?: ParseMainOptions<TDate>) => Json.Feed<TDate>;
6
6
  //#endregion
7
7
  export { parse };
@@ -1,3 +1,4 @@
1
+ import { DetectError, ParseError } from "../../../common/errors.js";
1
2
  import { locales } from "../../../common/config.js";
2
3
  import { parseJsonObject } from "../../../common/utils.js";
3
4
  import { parseFeed } from "./utils.js";
@@ -5,9 +6,9 @@ import { detect } from "../detect/index.js";
5
6
  //#region src/feeds/json/parse/index.ts
6
7
  const parse = (value, options) => {
7
8
  const json = parseJsonObject(value);
8
- if (!detect(json)) throw new Error(locales.invalidFeedFormat);
9
+ if (!detect(json)) throw new DetectError(locales.invalidFeedFormat);
9
10
  const parsed = parseFeed(json, options);
10
- if (!parsed) throw new Error(locales.invalidFeedFormat);
11
+ if (!parsed) throw new ParseError(locales.invalidFeedFormat);
11
12
  return parsed;
12
13
  };
13
14
  //#endregion
@@ -36,7 +36,7 @@ const parseAttachment = (value) => {
36
36
  duration_in_seconds: require_utils.parseSingularOf(get("duration_in_seconds"), require_utils.parseNumber)
37
37
  });
38
38
  };
39
- const parseItem = (value) => {
39
+ const parseItem = (value, options) => {
40
40
  if (!require_utils.isObject(value)) return;
41
41
  const get = createCaseInsensitiveGetter(value);
42
42
  return require_utils.trimObject({
@@ -49,8 +49,8 @@ const parseItem = (value) => {
49
49
  summary: require_utils.parseSingularOf(get("summary"), require_utils.parseString),
50
50
  image: require_utils.parseSingularOf(get("image"), require_utils.parseString),
51
51
  banner_image: require_utils.parseSingularOf(get("banner_image"), require_utils.parseString),
52
- date_published: require_utils.parseSingularOf(get("date_published"), require_utils.parseDate),
53
- date_modified: require_utils.parseSingularOf(get("date_modified"), require_utils.parseDate),
52
+ date_published: require_utils.parseSingularOf(get("date_published"), (value) => require_utils.parseDate(value, options?.parseDateFn)),
53
+ date_modified: require_utils.parseSingularOf(get("date_modified"), (value) => require_utils.parseDate(value, options?.parseDateFn)),
54
54
  tags: require_utils.parseArrayOf(get("tags"), require_utils.parseString),
55
55
  authors: retrieveAuthors(value),
56
56
  language: require_utils.parseSingularOf(get("language"), require_utils.parseString),
@@ -81,7 +81,7 @@ const parseFeed = (value, options) => {
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),
84
- items: require_utils.parseArrayOf(get("items"), parseItem, options?.maxItems)
84
+ items: require_utils.parseArrayOf(get("items"), (value) => parseItem(value, options), options?.maxItems)
85
85
  });
86
86
  };
87
87
  //#endregion
@@ -36,7 +36,7 @@ const parseAttachment = (value) => {
36
36
  duration_in_seconds: parseSingularOf(get("duration_in_seconds"), parseNumber)
37
37
  });
38
38
  };
39
- const parseItem = (value) => {
39
+ const parseItem = (value, options) => {
40
40
  if (!isObject(value)) return;
41
41
  const get = createCaseInsensitiveGetter(value);
42
42
  return trimObject({
@@ -49,8 +49,8 @@ const parseItem = (value) => {
49
49
  summary: parseSingularOf(get("summary"), parseString),
50
50
  image: parseSingularOf(get("image"), parseString),
51
51
  banner_image: parseSingularOf(get("banner_image"), parseString),
52
- date_published: parseSingularOf(get("date_published"), parseDate),
53
- date_modified: parseSingularOf(get("date_modified"), parseDate),
52
+ date_published: parseSingularOf(get("date_published"), (value) => parseDate(value, options?.parseDateFn)),
53
+ date_modified: parseSingularOf(get("date_modified"), (value) => parseDate(value, options?.parseDateFn)),
54
54
  tags: parseArrayOf(get("tags"), parseString),
55
55
  authors: retrieveAuthors(value),
56
56
  language: parseSingularOf(get("language"), parseString),
@@ -81,7 +81,7 @@ const parseFeed = (value, options) => {
81
81
  expired: parseSingularOf(get("expired"), parseBoolean),
82
82
  hubs: parseArrayOf(get("hubs"), parseHub),
83
83
  authors: retrieveAuthors(value),
84
- items: parseArrayOf(get("items"), parseItem, options?.maxItems)
84
+ items: parseArrayOf(get("items"), (value) => parseItem(value, options), options?.maxItems)
85
85
  });
86
86
  };
87
87
  //#endregion
@@ -1,4 +1,4 @@
1
- import { DateLike } from "../../../common/types.cjs";
1
+ import { Requirable, Strict } from "../../../common/types.cjs";
2
2
  import { AdminNs } from "../../../namespaces/admin/common/types.cjs";
3
3
  import { DcNs } from "../../../namespaces/dc/common/types.cjs";
4
4
  import { DcTermsNs } from "../../../namespaces/dcterms/common/types.cjs";
@@ -7,55 +7,58 @@ import { MediaNs } from "../../../namespaces/media/common/types.cjs";
7
7
  import { SlashNs } from "../../../namespaces/slash/common/types.cjs";
8
8
  import { SyNs } from "../../../namespaces/sy/common/types.cjs";
9
9
  import { WfwNs } from "../../../namespaces/wfw/common/types.cjs";
10
+ import { XmlNs } from "../../../namespaces/xml/common/types.cjs";
10
11
  import { AtomNs } from "../../../namespaces/atom/common/types.cjs";
11
12
  import { ContentNs } from "../../../namespaces/content/common/types.cjs";
12
13
  import { RdfNs } from "../../../namespaces/rdf/common/types.cjs";
13
14
 
14
15
  //#region src/feeds/rdf/common/types.d.ts
15
16
  declare namespace Rdf {
16
- type Image = {
17
- title: string;
18
- link: string;
19
- url?: string;
17
+ type Image<TStrict extends boolean = false> = Strict<{
18
+ title: Requirable<string>;
19
+ link: Requirable<string>;
20
+ url: Requirable<string>;
20
21
  rdf?: RdfNs.About;
21
- };
22
- type TextInput = {
23
- title: string;
24
- description: string;
25
- name: string;
26
- link: string;
22
+ }, TStrict>;
23
+ type TextInput<TStrict extends boolean = false> = Strict<{
24
+ title: Requirable<string>;
25
+ description: Requirable<string>;
26
+ name: Requirable<string>;
27
+ link: Requirable<string>;
27
28
  rdf?: RdfNs.About;
28
- };
29
- type Item<TDate extends DateLike> = {
30
- title: string;
31
- link: string;
29
+ }, TStrict>;
30
+ type Item<TDate, TStrict extends boolean = false> = Strict<{
31
+ title: Requirable<string>;
32
+ link: Requirable<string>;
32
33
  description?: string;
33
34
  rdf?: RdfNs.About;
34
35
  atom?: AtomNs.Entry<TDate>;
35
36
  dc?: DcNs.ItemOrFeed<TDate>;
36
37
  content?: ContentNs.Item;
37
38
  slash?: SlashNs.Item;
38
- media?: MediaNs.ItemOrFeed;
39
- georss?: GeoRssNs.ItemOrFeed;
39
+ media?: MediaNs.ItemOrFeed<TStrict>;
40
+ georss?: GeoRssNs.ItemOrFeed<TStrict>;
40
41
  dcterms?: DcTermsNs.ItemOrFeed<TDate>;
41
42
  wfw?: WfwNs.Item;
42
- };
43
- type Feed<TDate extends DateLike> = {
44
- title: string;
45
- link: string;
46
- description: string;
47
- image?: Image;
48
- items?: Array<Item<TDate>>;
49
- textInput?: TextInput;
43
+ xml?: XmlNs.ItemOrFeed;
44
+ }, TStrict>;
45
+ type Feed<TDate, TStrict extends boolean = false> = Strict<{
46
+ title: Requirable<string>;
47
+ link: Requirable<string>;
48
+ description: Requirable<string>;
49
+ image?: Image<TStrict>;
50
+ items?: Array<Item<TDate, TStrict>>;
51
+ textInput?: TextInput<TStrict>;
50
52
  rdf?: RdfNs.About;
51
53
  atom?: AtomNs.Feed<TDate>;
52
54
  dc?: DcNs.ItemOrFeed<TDate>;
53
55
  sy?: SyNs.Feed<TDate>;
54
- media?: MediaNs.ItemOrFeed;
55
- georss?: GeoRssNs.ItemOrFeed;
56
+ media?: MediaNs.ItemOrFeed<TStrict>;
57
+ georss?: GeoRssNs.ItemOrFeed<TStrict>;
56
58
  dcterms?: DcTermsNs.ItemOrFeed<TDate>;
57
59
  admin?: AdminNs.Feed;
58
- };
60
+ xml?: XmlNs.ItemOrFeed;
61
+ }, TStrict>;
59
62
  }
60
63
  //#endregion
61
64
  export { Rdf };
@@ -1,4 +1,4 @@
1
- import { DateLike } from "../../../common/types.js";
1
+ import { Requirable, Strict } from "../../../common/types.js";
2
2
  import { AdminNs } from "../../../namespaces/admin/common/types.js";
3
3
  import { DcNs } from "../../../namespaces/dc/common/types.js";
4
4
  import { DcTermsNs } from "../../../namespaces/dcterms/common/types.js";
@@ -7,55 +7,58 @@ import { MediaNs } from "../../../namespaces/media/common/types.js";
7
7
  import { SlashNs } from "../../../namespaces/slash/common/types.js";
8
8
  import { SyNs } from "../../../namespaces/sy/common/types.js";
9
9
  import { WfwNs } from "../../../namespaces/wfw/common/types.js";
10
+ import { XmlNs } from "../../../namespaces/xml/common/types.js";
10
11
  import { AtomNs } from "../../../namespaces/atom/common/types.js";
11
12
  import { ContentNs } from "../../../namespaces/content/common/types.js";
12
13
  import { RdfNs } from "../../../namespaces/rdf/common/types.js";
13
14
 
14
15
  //#region src/feeds/rdf/common/types.d.ts
15
16
  declare namespace Rdf {
16
- type Image = {
17
- title: string;
18
- link: string;
19
- url?: string;
17
+ type Image<TStrict extends boolean = false> = Strict<{
18
+ title: Requirable<string>;
19
+ link: Requirable<string>;
20
+ url: Requirable<string>;
20
21
  rdf?: RdfNs.About;
21
- };
22
- type TextInput = {
23
- title: string;
24
- description: string;
25
- name: string;
26
- link: string;
22
+ }, TStrict>;
23
+ type TextInput<TStrict extends boolean = false> = Strict<{
24
+ title: Requirable<string>;
25
+ description: Requirable<string>;
26
+ name: Requirable<string>;
27
+ link: Requirable<string>;
27
28
  rdf?: RdfNs.About;
28
- };
29
- type Item<TDate extends DateLike> = {
30
- title: string;
31
- link: string;
29
+ }, TStrict>;
30
+ type Item<TDate, TStrict extends boolean = false> = Strict<{
31
+ title: Requirable<string>;
32
+ link: Requirable<string>;
32
33
  description?: string;
33
34
  rdf?: RdfNs.About;
34
35
  atom?: AtomNs.Entry<TDate>;
35
36
  dc?: DcNs.ItemOrFeed<TDate>;
36
37
  content?: ContentNs.Item;
37
38
  slash?: SlashNs.Item;
38
- media?: MediaNs.ItemOrFeed;
39
- georss?: GeoRssNs.ItemOrFeed;
39
+ media?: MediaNs.ItemOrFeed<TStrict>;
40
+ georss?: GeoRssNs.ItemOrFeed<TStrict>;
40
41
  dcterms?: DcTermsNs.ItemOrFeed<TDate>;
41
42
  wfw?: WfwNs.Item;
42
- };
43
- type Feed<TDate extends DateLike> = {
44
- title: string;
45
- link: string;
46
- description: string;
47
- image?: Image;
48
- items?: Array<Item<TDate>>;
49
- textInput?: TextInput;
43
+ xml?: XmlNs.ItemOrFeed;
44
+ }, TStrict>;
45
+ type Feed<TDate, TStrict extends boolean = false> = Strict<{
46
+ title: Requirable<string>;
47
+ link: Requirable<string>;
48
+ description: Requirable<string>;
49
+ image?: Image<TStrict>;
50
+ items?: Array<Item<TDate, TStrict>>;
51
+ textInput?: TextInput<TStrict>;
50
52
  rdf?: RdfNs.About;
51
53
  atom?: AtomNs.Feed<TDate>;
52
54
  dc?: DcNs.ItemOrFeed<TDate>;
53
55
  sy?: SyNs.Feed<TDate>;
54
- media?: MediaNs.ItemOrFeed;
55
- georss?: GeoRssNs.ItemOrFeed;
56
+ media?: MediaNs.ItemOrFeed<TStrict>;
57
+ georss?: GeoRssNs.ItemOrFeed<TStrict>;
56
58
  dcterms?: DcTermsNs.ItemOrFeed<TDate>;
57
59
  admin?: AdminNs.Feed;
58
- };
60
+ xml?: XmlNs.ItemOrFeed;
61
+ }, TStrict>;
59
62
  }
60
63
  //#endregion
61
64
  export { Rdf };
@@ -11,12 +11,14 @@ const rssNamespaceUris = [
11
11
  "http://channel.netscape.com/rdf/simple/0.9",
12
12
  "https://channel.netscape.com/rdf/simple/0.9"
13
13
  ];
14
+ const rdfElementRegex = /(?:^|[\s>])<(?:\w+:)?rdf[\s>]/im;
15
+ const rdfElementsRegex = /(<(?:\w+:)?(channel|item|title|link|description)[\s>])/i;
14
16
  const detect = (value) => {
15
17
  if (!require_utils.isNonEmptyString(value)) return false;
16
- if (!/(?:^|[\s>])<(?:\w+:)?rdf[\s>]/im.test(value)) return false;
18
+ if (!rdfElementRegex.test(value)) return false;
17
19
  const hasRdfNamespace = require_config.namespaceUris.rdf.some((uri) => value.includes(uri));
18
20
  const hasRssNamespace = rssNamespaceUris.some((uri) => value.includes(uri));
19
- const hasRdfElements = /(<(?:\w+:)?(channel|item|title|link|description)[\s>])/i.test(value);
21
+ const hasRdfElements = rdfElementsRegex.test(value);
20
22
  return hasRdfNamespace || hasRssNamespace || hasRdfElements;
21
23
  };
22
24
  //#endregion
@@ -11,12 +11,14 @@ const rssNamespaceUris = [
11
11
  "http://channel.netscape.com/rdf/simple/0.9",
12
12
  "https://channel.netscape.com/rdf/simple/0.9"
13
13
  ];
14
+ const rdfElementRegex = /(?:^|[\s>])<(?:\w+:)?rdf[\s>]/im;
15
+ const rdfElementsRegex = /(<(?:\w+:)?(channel|item|title|link|description)[\s>])/i;
14
16
  const detect = (value) => {
15
17
  if (!isNonEmptyString(value)) return false;
16
- if (!/(?:^|[\s>])<(?:\w+:)?rdf[\s>]/im.test(value)) return false;
18
+ if (!rdfElementRegex.test(value)) return false;
17
19
  const hasRdfNamespace = namespaceUris.rdf.some((uri) => value.includes(uri));
18
20
  const hasRssNamespace = rssNamespaceUris.some((uri) => value.includes(uri));
19
- const hasRdfElements = /(<(?:\w+:)?(channel|item|title|link|description)[\s>])/i.test(value);
21
+ const hasRdfElements = rdfElementsRegex.test(value);
20
22
  return hasRdfNamespace || hasRssNamespace || hasRdfElements;
21
23
  };
22
24
  //#endregion
@@ -1,12 +1,19 @@
1
+ const require_errors = require("../../../common/errors.cjs");
1
2
  const require_config = require("../../../common/config.cjs");
2
3
  const require_index = require("../detect/index.cjs");
3
4
  const require_config$1 = require("./config.cjs");
4
5
  const require_utils = require("./utils.cjs");
5
6
  //#region src/feeds/rdf/parse/index.ts
6
7
  const parse = (value, options) => {
7
- if (!require_index.detect(value)) throw new Error(require_config.locales.invalidFeedFormat);
8
- const parsed = require_utils.retrieveFeed(require_config$1.normalizeNamespaces(require_config$1.parser.parse(value)), options);
9
- if (!parsed) throw new Error(require_config.locales.invalidFeedFormat);
8
+ if (!require_index.detect(value)) throw new require_errors.DetectError(require_config.locales.invalidFeedFormat);
9
+ let normalized;
10
+ try {
11
+ normalized = require_config$1.normalizeNamespaces(require_config$1.parser.parse(value));
12
+ } catch {
13
+ throw new require_errors.MalformedError(require_config.locales.invalidFeedFormat);
14
+ }
15
+ const parsed = require_utils.retrieveFeed(normalized, options);
16
+ if (!parsed) throw new require_errors.ParseError(require_config.locales.invalidFeedFormat);
10
17
  return parsed;
11
18
  };
12
19
  //#endregion
@@ -1,7 +1,7 @@
1
- import { DeepPartial, ParseOptions } from "../../../common/types.cjs";
1
+ import { ParseMainOptions } from "../../../common/types.cjs";
2
2
  import { Rdf } from "../common/types.cjs";
3
3
 
4
4
  //#region src/feeds/rdf/parse/index.d.ts
5
- declare const parse: (value: unknown, options?: ParseOptions) => DeepPartial<Rdf.Feed<string>>;
5
+ declare const parse: <TDate = string>(value: unknown, options?: ParseMainOptions<TDate>) => Rdf.Feed<TDate>;
6
6
  //#endregion
7
7
  export { parse };
@@ -1,7 +1,7 @@
1
- import { DeepPartial, ParseOptions } from "../../../common/types.js";
1
+ import { ParseMainOptions } from "../../../common/types.js";
2
2
  import { Rdf } from "../common/types.js";
3
3
 
4
4
  //#region src/feeds/rdf/parse/index.d.ts
5
- declare const parse: (value: unknown, options?: ParseOptions) => DeepPartial<Rdf.Feed<string>>;
5
+ declare const parse: <TDate = string>(value: unknown, options?: ParseMainOptions<TDate>) => Rdf.Feed<TDate>;
6
6
  //#endregion
7
7
  export { parse };
@@ -1,12 +1,19 @@
1
+ import { DetectError, MalformedError, ParseError } from "../../../common/errors.js";
1
2
  import { locales } from "../../../common/config.js";
2
3
  import { detect } from "../detect/index.js";
3
4
  import { normalizeNamespaces, parser } from "./config.js";
4
5
  import { retrieveFeed } from "./utils.js";
5
6
  //#region src/feeds/rdf/parse/index.ts
6
7
  const parse = (value, options) => {
7
- if (!detect(value)) throw new Error(locales.invalidFeedFormat);
8
- const parsed = retrieveFeed(normalizeNamespaces(parser.parse(value)), options);
9
- if (!parsed) throw new Error(locales.invalidFeedFormat);
8
+ if (!detect(value)) throw new DetectError(locales.invalidFeedFormat);
9
+ let normalized;
10
+ try {
11
+ normalized = normalizeNamespaces(parser.parse(value));
12
+ } catch {
13
+ throw new MalformedError(locales.invalidFeedFormat);
14
+ }
15
+ const parsed = retrieveFeed(normalized, options);
16
+ if (!parsed) throw new ParseError(locales.invalidFeedFormat);
10
17
  return parsed;
11
18
  };
12
19
  //#endregion