feedsmith 2.6.0 → 2.6.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/common/parse.cjs +4 -2
- package/dist/common/parse.js +4 -2
- package/dist/common/utils.cjs +11 -0
- package/dist/common/utils.js +11 -1
- package/dist/feeds/json/detect/index.cjs +3 -2
- package/dist/feeds/json/detect/index.js +4 -3
- package/dist/feeds/json/parse/index.cjs +5 -3
- package/dist/feeds/json/parse/index.js +4 -2
- package/package.json +1 -1
package/dist/common/parse.cjs
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
const require_utils = require('./utils.cjs');
|
|
1
2
|
const require_index = require('../feeds/atom/detect/index.cjs');
|
|
2
3
|
const require_config = require('./config.cjs');
|
|
3
4
|
const require_index$1 = require('../feeds/atom/parse/index.cjs');
|
|
@@ -22,9 +23,10 @@ const parse$4 = (value, options) => {
|
|
|
22
23
|
format: "rdf",
|
|
23
24
|
feed: require_index$5.parse(value, options)
|
|
24
25
|
};
|
|
25
|
-
|
|
26
|
+
const json = require_utils.parseJsonObject(value);
|
|
27
|
+
if (require_index$2.detect(json)) return {
|
|
26
28
|
format: "json",
|
|
27
|
-
feed: require_index$3.parse(
|
|
29
|
+
feed: require_index$3.parse(json, options)
|
|
28
30
|
};
|
|
29
31
|
throw new Error(require_config.locales.unrecognizedFeedFormat);
|
|
30
32
|
};
|
package/dist/common/parse.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { parseJsonObject } from "./utils.js";
|
|
1
2
|
import { detect } from "../feeds/atom/detect/index.js";
|
|
2
3
|
import { locales } from "./config.js";
|
|
3
4
|
import { parse } from "../feeds/atom/parse/index.js";
|
|
@@ -22,9 +23,10 @@ const parse$4 = (value, options) => {
|
|
|
22
23
|
format: "rdf",
|
|
23
24
|
feed: parse$2(value, options)
|
|
24
25
|
};
|
|
25
|
-
|
|
26
|
+
const json = parseJsonObject(value);
|
|
27
|
+
if (detect$1(json)) return {
|
|
26
28
|
format: "json",
|
|
27
|
-
feed: parse$1(
|
|
29
|
+
feed: parse$1(json, options)
|
|
28
30
|
};
|
|
29
31
|
throw new Error(locales.unrecognizedFeedFormat);
|
|
30
32
|
};
|
package/dist/common/utils.cjs
CHANGED
|
@@ -345,6 +345,16 @@ const createNamespaceNormalizator = (namespaceUris, namespacePrefixes, primaryNa
|
|
|
345
345
|
};
|
|
346
346
|
return normalizeRoot;
|
|
347
347
|
};
|
|
348
|
+
const parseJsonObject = (value) => {
|
|
349
|
+
if (isObject(value)) return value;
|
|
350
|
+
if (!isNonEmptyString(value) || value.length < 2) return;
|
|
351
|
+
const startsWithBrace = value.charAt(0) === "{" || /^\s*\{/.test(value);
|
|
352
|
+
const endsWithBrace = value.charAt(value.length - 1) === "}" || /\}\s*$/.test(value);
|
|
353
|
+
if (!startsWithBrace || !endsWithBrace) return;
|
|
354
|
+
try {
|
|
355
|
+
return JSON.parse(value);
|
|
356
|
+
} catch {}
|
|
357
|
+
};
|
|
348
358
|
|
|
349
359
|
//#endregion
|
|
350
360
|
exports.createNamespaceNormalizator = createNamespaceNormalizator;
|
|
@@ -371,6 +381,7 @@ exports.parseArrayOf = parseArrayOf;
|
|
|
371
381
|
exports.parseBoolean = parseBoolean;
|
|
372
382
|
exports.parseCsvOf = parseCsvOf;
|
|
373
383
|
exports.parseDate = parseDate;
|
|
384
|
+
exports.parseJsonObject = parseJsonObject;
|
|
374
385
|
exports.parseNumber = parseNumber;
|
|
375
386
|
exports.parseSingular = parseSingular;
|
|
376
387
|
exports.parseSingularOf = parseSingularOf;
|
package/dist/common/utils.js
CHANGED
|
@@ -345,6 +345,16 @@ const createNamespaceNormalizator = (namespaceUris, namespacePrefixes, primaryNa
|
|
|
345
345
|
};
|
|
346
346
|
return normalizeRoot;
|
|
347
347
|
};
|
|
348
|
+
const parseJsonObject = (value) => {
|
|
349
|
+
if (isObject(value)) return value;
|
|
350
|
+
if (!isNonEmptyString(value) || value.length < 2) return;
|
|
351
|
+
const startsWithBrace = value.charAt(0) === "{" || /^\s*\{/.test(value);
|
|
352
|
+
const endsWithBrace = value.charAt(value.length - 1) === "}" || /\}\s*$/.test(value);
|
|
353
|
+
if (!startsWithBrace || !endsWithBrace) return;
|
|
354
|
+
try {
|
|
355
|
+
return JSON.parse(value);
|
|
356
|
+
} catch {}
|
|
357
|
+
};
|
|
348
358
|
|
|
349
359
|
//#endregion
|
|
350
|
-
export { createNamespaceNormalizator, detectNamespaces, generateArrayOrSingular, generateBoolean, generateCdataString, generateCsvOf, generateNamespaceAttrs, generateNumber, generatePlainString, generateRdfResource, generateRfc3339Date, generateRfc822Date, generateSingularOrArray, generateTextOrCdataString, generateXml, generateYesNoBoolean, isNonEmptyString, isNonEmptyStringOrNumber, isObject, isPresent, parseArrayOf, parseBoolean, parseCsvOf, parseDate, parseNumber, parseSingular, parseSingularOf, parseString, parseYesNoBoolean, retrieveRdfResourceOrText, retrieveText, trimArray, trimObject };
|
|
360
|
+
export { createNamespaceNormalizator, detectNamespaces, 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 };
|
|
@@ -3,8 +3,9 @@ const require_utils$1 = require('../parse/utils.cjs');
|
|
|
3
3
|
|
|
4
4
|
//#region src/feeds/json/detect/index.ts
|
|
5
5
|
const detect = (value) => {
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
const json = require_utils.parseJsonObject(value);
|
|
7
|
+
if (!require_utils.isObject(json)) return false;
|
|
8
|
+
const get = require_utils$1.createCaseInsensitiveGetter(json);
|
|
8
9
|
const version = get("version");
|
|
9
10
|
if (require_utils.isNonEmptyString(version)) return version.includes("jsonfeed.org/version/");
|
|
10
11
|
const hasTitle = require_utils.isNonEmptyString(get("title"));
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { isNonEmptyString, isObject } from "../../../common/utils.js";
|
|
1
|
+
import { isNonEmptyString, isObject, parseJsonObject } from "../../../common/utils.js";
|
|
2
2
|
import { createCaseInsensitiveGetter } from "../parse/utils.js";
|
|
3
3
|
|
|
4
4
|
//#region src/feeds/json/detect/index.ts
|
|
5
5
|
const detect = (value) => {
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
const json = parseJsonObject(value);
|
|
7
|
+
if (!isObject(json)) return false;
|
|
8
|
+
const get = createCaseInsensitiveGetter(json);
|
|
8
9
|
const version = get("version");
|
|
9
10
|
if (isNonEmptyString(version)) return version.includes("jsonfeed.org/version/");
|
|
10
11
|
const hasTitle = isNonEmptyString(get("title"));
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
+
const require_utils = require('../../../common/utils.cjs');
|
|
1
2
|
const require_config = require('../../../common/config.cjs');
|
|
2
|
-
const require_utils = require('./utils.cjs');
|
|
3
|
+
const require_utils$1 = require('./utils.cjs');
|
|
3
4
|
const require_index = require('../detect/index.cjs');
|
|
4
5
|
|
|
5
6
|
//#region src/feeds/json/parse/index.ts
|
|
6
7
|
const parse = (value, options) => {
|
|
7
|
-
|
|
8
|
-
|
|
8
|
+
const json = require_utils.parseJsonObject(value);
|
|
9
|
+
if (!require_index.detect(json)) throw new Error(require_config.locales.invalidFeedFormat);
|
|
10
|
+
const parsed = require_utils$1.parseFeed(json, options);
|
|
9
11
|
if (!parsed) throw new Error(require_config.locales.invalidFeedFormat);
|
|
10
12
|
return parsed;
|
|
11
13
|
};
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
+
import { parseJsonObject } from "../../../common/utils.js";
|
|
1
2
|
import { locales } from "../../../common/config.js";
|
|
2
3
|
import { parseFeed } from "./utils.js";
|
|
3
4
|
import { detect } from "../detect/index.js";
|
|
4
5
|
|
|
5
6
|
//#region src/feeds/json/parse/index.ts
|
|
6
7
|
const parse = (value, options) => {
|
|
7
|
-
|
|
8
|
-
|
|
8
|
+
const json = parseJsonObject(value);
|
|
9
|
+
if (!detect(json)) throw new Error(locales.invalidFeedFormat);
|
|
10
|
+
const parsed = parseFeed(json, options);
|
|
9
11
|
if (!parsed) throw new Error(locales.invalidFeedFormat);
|
|
10
12
|
return parsed;
|
|
11
13
|
};
|
package/package.json
CHANGED