fix json parsing

wjdgustn · Oct 16, 2021 · 1317313 · 1317313
1 parent ce2b4e8
commit 1317313
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,5 +19,8 @@
   "homepage": "https://github.com/wjdgustn/level-file-checker#readme",
   "devDependencies": {
     "pkg": "^5.1.0"
+  },
+  "dependencies": {
+    "json5": "^2.2.0"
   }
 }
diff --git a/utils.js b/utils.js
@@ -1,14 +1,20 @@
+const JSON5 = require('json5');
+
 String.prototype.replaceAll = function(org, dest) {
     return this.split(org).join(dest);
 }
 
 module.exports.ADOFAIParser = level => {
-    return JSON.parse(String(level).trim()
-        .replaceAll(', ,', ',')
-        .replaceAll('}\n', '},\n')
-        .replaceAll('},\n\t]', '}\n\t]')
-        .replaceAll(', },', ' },')
-        .replaceAll(', }', ' }')
-        .replaceAll('\n', '')
-        .replaceAll('}\n', '},\n'));
+    try {
+        return JSON5.parse(String(level).trim());
+    } catch (e) {
+        return JSON5.parse(String(level).trim()
+            .replaceAll(', ,', ',')
+            .replaceAll('}\n', '},\n')
+            .replaceAll('},\n\t]', '}\n\t]')
+            .replaceAll(', },', ' },')
+            .replaceAll(', }', ' }')
+            .replaceAll('\n', '')
+            .replaceAll('}\n', '},\n'));
+    }
 }