diff --git a/package.json b/package.json
index 4b98bf40..c98d734b 100644
--- a/package.json
+++ b/package.json
@@ -174,6 +174,7 @@
"json-editor-vue": "^0.16.0",
"json-to-ts": "^1.7.0",
"json5": "^2.2.3",
+ "jsonrepair": "^3.12.0",
"jsonar-mod": "^1.9.0",
"jsonlint-mod": "^1.7.6",
"jsonpath": "^1.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4e14924b..c033da18 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -428,6 +428,9 @@ dependencies:
jsonpath:
specifier: ^1.1.1
version: 1.1.1
+ jsonrepair:
+ specifier: ^3.12.0
+ version: 3.12.0
jsstack.js:
specifier: ^2.0.0
version: 2.0.0
@@ -12906,8 +12909,8 @@ packages:
engines: {node: '>=0.10.0'}
dev: true
- /jsonrepair@3.11.2:
- resolution: {integrity: sha512-ejydGcTq0qKk1r0NUBwjtvswbPFhs19+QEfwSeGwB8KJZ59W7/AOFmQh04c68mkJ+2hGk+OkOmkr2bKG4tGlLQ==}
+ /jsonrepair@3.12.0:
+ resolution: {integrity: sha512-SWfjz8SuQ0wZjwsxtSJ3Zy8vvLg6aO/kxcp9TWNPGwJKgTZVfhNEQBMk/vPOpYCDFWRxD6QWuI6IHR1t615f0w==}
hasBin: true
dev: false
@@ -17668,7 +17671,7 @@ packages:
immutable-json-patch: 6.0.1
jmespath: 0.16.0
json-source-map: 0.6.1
- jsonrepair: 3.11.2
+ jsonrepair: 3.12.0
lodash-es: 4.17.21
memoize-one: 6.0.0
natural-compare-lite: 1.4.0
diff --git a/src/tools/json-viewer/json-viewer.vue b/src/tools/json-viewer/json-viewer.vue
index 21c518e6..5ddcaaf6 100644
--- a/src/tools/json-viewer/json-viewer.vue
+++ b/src/tools/json-viewer/json-viewer.vue
@@ -1,27 +1,36 @@
@@ -37,6 +46,9 @@ const rawJsonValidation = useValidation({
+
+
+
diff --git a/src/tools/json-viewer/json.models.test.ts b/src/tools/json-viewer/json.models.test.ts
index 9bdcb231..9ce1bb26 100644
--- a/src/tools/json-viewer/json.models.test.ts
+++ b/src/tools/json-viewer/json.models.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, it } from 'vitest';
-import { sortObjectKeys } from './json.models';
+import { formatJson, sortObjectKeys } from './json.models';
describe('json models', () => {
describe('sortObjectKeys', () => {
@@ -13,4 +13,19 @@ describe('json models', () => {
);
});
});
+
+ describe('formatJson', () => {
+ describe('repairJson', () => {
+ it('repairs and formats JSON when repairJson is true', () => {
+ const rawJson = '{"foo": "bar", "baz":}';
+ const result = formatJson({ rawJson, sortKeys: false, repairJson: true });
+ expect(result).to.equal(JSON.stringify({ foo: 'bar', baz: null }, null, 3));
+ });
+
+ it('throws an error for invalid JSON when repairJson is false', () => {
+ const rawJson = '{"foo": "bar", "baz":}';
+ expect(() => formatJson({ rawJson, sortKeys: false, repairJson: false })).to.throw();
+ });
+ });
+ });
});
diff --git a/src/tools/json-viewer/json.models.ts b/src/tools/json-viewer/json.models.ts
index 7998ac53..a99c4999 100644
--- a/src/tools/json-viewer/json.models.ts
+++ b/src/tools/json-viewer/json.models.ts
@@ -1,5 +1,6 @@
import { type MaybeRef, get } from '@vueuse/core';
import JSON5 from 'json5';
+import { jsonrepair } from 'jsonrepair';
export { sortObjectKeys, formatJson };
@@ -31,14 +32,17 @@ function formatJson({
sortKeys = true,
indentSize = 3,
unescapeUnicode = false,
+ repairJson = false,
}: {
rawJson: MaybeRef
sortKeys?: MaybeRef
indentSize?: MaybeRef
unescapeUnicode?: MaybeRef
+ repairJson?: MaybeRef
}) {
- const raw = get(rawJson);
- const parsedObject = JSON5.parse(get(unescapeUnicode) ? unescapeUnicodeJSON(raw) : raw);
+ const unwrappedJson = get(rawJson);
+ const jsonString = get(repairJson) ? jsonrepair(unwrappedJson) : unwrappedJson;
+ const parsedObject = JSON5.parse(get(unescapeUnicode) ? unescapeUnicodeJSON(jsonString) : jsonString);
return JSON.stringify(get(sortKeys) ? sortObjectKeys(parsedObject) : parsedObject, null, get(indentSize));
}