From 1ced9aafc00c10992bab8bd3f1b6b1397f05b7b9 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 19 Dec 2023 00:33:38 -0500
Subject: Make JSON.parse usage safer (#373)

* Make JSON.parse usage safer

* Fix any type

* Add readResponseJson

* Use readResponseJson

* Additional updates

* Rename files

* Add types
---
 dev/schema-validate.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'dev/schema-validate.js')

diff --git a/dev/schema-validate.js b/dev/schema-validate.js
index 81953f49..57faf96c 100644
--- a/dev/schema-validate.js
+++ b/dev/schema-validate.js
@@ -20,6 +20,7 @@ import Ajv from 'ajv';
 import {readFileSync} from 'fs';
 import {JsonSchema} from '../ext/js/data/json-schema.js';
 import {DataError} from './data-error.js';
+import {parseJson} from './json.js';
 
 class JsonSchemaAjv {
     /**
@@ -32,7 +33,8 @@ class JsonSchemaAjv {
             allowUnionTypes: true
         });
         const metaSchemaPath = require.resolve('ajv/dist/refs/json-schema-draft-07.json');
-        const metaSchema = JSON.parse(readFileSync(metaSchemaPath, {encoding: 'utf8'}));
+        /** @type {import('ajv').AnySchemaObject} */
+        const metaSchema = parseJson(readFileSync(metaSchemaPath, {encoding: 'utf8'}));
         ajv.addMetaSchema(metaSchema);
         /** @type {import('ajv').ValidateFunction} */
         this._validate = ajv.compile(/** @type {import('ajv').Schema} */ (schema));
@@ -46,7 +48,7 @@ class JsonSchemaAjv {
         if (this._validate(data)) { return; }
         const {errors} = this._validate;
         const error = new DataError('Schema validation failed');
-        error.data = JSON.parse(JSON.stringify(errors));
+        error.data = parseJson(JSON.stringify(errors));
         throw error;
     }
 }
-- 
cgit v1.2.3