From 4751417bf6ded3651ec3f797e640f410076e612d Mon Sep 17 00:00:00 2001 From: ShareVB Date: Thu, 8 May 2025 13:30:50 +0200 Subject: [PATCH] feat(JS to Object): handle backquotes --- src/tools/javascript-to-json/index.ts | 2 +- src/tools/javascript-to-json/javascript-to-json.vue | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/tools/javascript-to-json/index.ts b/src/tools/javascript-to-json/index.ts index 8312eafd..cd2d9da0 100644 --- a/src/tools/javascript-to-json/index.ts +++ b/src/tools/javascript-to-json/index.ts @@ -6,7 +6,7 @@ export const tool = defineTool({ name: translate('tools.javascript-to-json.title'), path: '/javascript-to-json', description: translate('tools.javascript-to-json.description'), - keywords: ['javascript', 'to', 'json'], + keywords: ['javascript', 'json'], component: () => import('./javascript-to-json.vue'), icon: Braces, createdAt: new Date('2024-03-29'), diff --git a/src/tools/javascript-to-json/javascript-to-json.vue b/src/tools/javascript-to-json/javascript-to-json.vue index 328a445a..771eb4bb 100644 --- a/src/tools/javascript-to-json/javascript-to-json.vue +++ b/src/tools/javascript-to-json/javascript-to-json.vue @@ -4,12 +4,21 @@ import type { UseValidationRule } from '@/composable/validation'; import { isNotThrowing } from '@/utils/boolean'; import { withDefaultOnError } from '@/utils/defaults'; +function parseJSON(value: string) { + try { + return JSON5.parse(value); + } + catch { + return JSON5.parse(value.replace(/`((?:[^`]|\\`)*)`/g, (_m, s) => `"${s.replace(/"/g, '\\""').replace(/\r/g, '\\r').replace(/\n/g, '\\n')}"`)); + } +} + const indentSize = useStorage('json-prettify:indent-size', 3); -const transformer = (value: string) => withDefaultOnError(() => JSON.stringify(JSON5.parse(value), null, indentSize.value), ''); +const transformer = (value: string) => withDefaultOnError(() => JSON.stringify(parseJSON(value), null, indentSize.value), ''); const rules: UseValidationRule[] = [ { - validator: (value: string) => value === '' || isNotThrowing(() => JSON.stringify(JSON5.parse(value))), + validator: (value: string) => value === '' || isNotThrowing(() => JSON.stringify(parseJSON(value))), message: 'Provided JS Object is not valid.', }, ];