@prantlf/jsonlint 13.0.0 → 13.1.0

package/lib/validator.js

@@ -2,12 +2,11 @@
   if (typeof exports === 'object' && typeof module !== 'undefined') {
     const jsonlint = require('./jsonlint')
     const ajv = {
-      AjvOld: 'ajv6',
+      Ajv04: 'ajv-draft-04',
       Ajv07: 'ajv',
       AjvJTD: 'ajv/dist/jtd',
       Ajv2019: 'ajv/dist/2019',
       Ajv2020: 'ajv/dist/2020',
-      Schema04: 'ajv6/lib/refs/json-schema-draft-04.json',
       Schema06: 'ajv/dist/refs/json-schema-draft-06.json'
     }
     const requireAjv = name => {
@@ -16,11 +15,10 @@
     }
     factory(exports, jsonlint, requireAjv)
   } else if (typeof define === 'function' && define.amd) {
-    define('jsonlint-validator', ['exports', 'jsonlint', 'ajv', 'ajv7'],
-      function (exports, jsonlint, ajv, ajv7) {
+    define('jsonlint-validator', ['exports', 'jsonlint', 'ajv'],
+      function (exports, jsonlint, ajv) {
         const requireAjv = name => {
-          if (name === 'AjvOld') return ajv
-          const exported = ajv7[name]
+          const exported = ajv[name]
           return !exported.$schema && exported.default || exported
         }
         factory(exports, jsonlint, requireAjv)
@@ -28,8 +26,7 @@
   } else {
     global = global || self
     const requireAjv = name => {
-      if (name === 'AjvOld') return global.Ajv
-      const exported = global.ajv7[name]
+      const exported = global.ajv[name]
       return !exported.$schema && exported.default || exported
     }
     factory(global.jsonlintValidator = {}, global.jsonlint, requireAjv)
@@ -114,9 +111,8 @@
       const Ajv = requireAjv('Ajv07')
       ajv = new Ajv()
     } else if (environment === 'json-schema-draft-04' || environment === 'draft-04') {
-      const Ajv = requireAjv('AjvOld')
-      ajv = new Ajv({ schemaId: 'id' })
-      ajv.addMetaSchema(requireAjv('Schema04'))
+      const Ajv = requireAjv('Ajv04')
+      ajv = new Ajv()
     } else if (environment === 'json-schema-draft-2019-09' || environment === 'draft-2019-09') {
       const Ajv = requireAjv('Ajv2019')
       ajv = new Ajv()
@@ -127,28 +123,33 @@
       const Ajv = requireAjv('AjvJTD')
       ajv = new Ajv()
     } else {
-      throw new RangeError('Unsupported environment for the JSON Schema validation: "' +
-        environment + '".')
+      throw new RangeError(`Unsupported environment for the JSON Schema validation: "${environment}".`)
     }
     return ajv
   }
 
   function compileSchema (ajv, schema, parseOptions) {
-    let parsed
-    try {
-      parsed = jsonlint.parse(schema, parseOptions)
-    } catch (error) {
-      error.message = 'Parsing the JSON Schema failed.\n' + error.message
-      throw error
-    }
+    if (!Array.isArray(schema)) schema = [schema]
+    const [main, ...others] = schema.map((schema, index) => {
+      if (typeof schema !== 'string') return schema
+      try {
+        return jsonlint.parse(schema, parseOptions)
+      } catch (error) {
+        error.message = `Parsing the JSON Schema #${index + 1} failed.\n${error.message}`
+        throw error
+      }
+    })
     try {
-      return ajv.compile(parsed)
+      for (const schema of others) {
+        ajv.addSchema(schema)
+      }
+      return ajv.compile(main)
     } catch (originalError) {
       const errors = ajv.errors
       const betterError = errors
         ? createError(errors, parsed, schema, parseOptions)
         : originalError
-      betterError.message = 'Compiling the JSON Schema failed.\n' + betterError.message
+      betterError.message = `Compiling the JSON Schema failed.\n${betterError.message}`
       throw betterError
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prantlf/jsonlint",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "description": "JSON/CJSON/JSON5 parser, syntax and schema validator and pretty-printer.",
   "author": "Ferdinand Prantl <prantlf@gmail.com> (http://prantl.tk)",
   "contributors": [
@@ -41,7 +41,7 @@
   "scripts": {
     "build": "npm run compile:jsonlint && rollup -c && npm run minify && npm run compile:tests",
     "compile:jsonlint": "cat.js src/prefix.js.txt src/unicode.js src/custom-parser.js src/pointer.js src/native-parser.js src/configurable-parser.js src/suffix.js.txt > lib/jsonlint.js",
-    "minify": "esbuild --minify --sourcemap --outfile=web/jsonlint.min.js lib/jsonlint.js && esbuild --minify --sourcemap --outfile=web/validator.min.js lib/validator.js && esbuild --minify --sourcemap --outfile=web/formatter.min.js lib/formatter.js && esbuild --minify --sourcemap --outfile=web/sorter.min.js lib/sorter.js && esbuild --minify --sourcemap --outfile=web/printer.min.js lib/printer.js && esbuild --minify --sourcemap --outfile=web/ajv.min.js node_modules/ajv6/dist/ajv.bundle.js",
+    "minify": "esbuild --minify --sourcemap --outfile=web/jsonlint.min.js lib/jsonlint.js && esbuild --minify --sourcemap --outfile=web/validator.min.js lib/validator.js && esbuild --minify --sourcemap --outfile=web/formatter.min.js lib/formatter.js && esbuild --minify --sourcemap --outfile=web/sorter.min.js lib/sorter.js && esbuild --minify --sourcemap --outfile=web/printer.min.js lib/printer.js",
     "compile:tests": "tsc --moduleResolution node --module es2022 test/types.test.ts && mv.js test/types.test.js test/types.test.mjs",
     "test": "denolint && c8 node test/types.test.mjs && c8 --no-clean node test/parse1 && c8 --no-clean node test/parse1 --native-parser && c8 --no-clean node test/parse2 && c8 --no-clean node test/parse3 && c8 --no-clean node test/parse4 && c8 --no-clean node test/parse5 && c8 --no-clean node test/portable && c8 --no-clean node test/tokenize && c8 --no-clean node test/print && c8 --no-clean node lib/cli package.json test/recursive && c8 --no-clean node lib/cli -sq test/passes/hasOwnProperty.json && c8 --no-clean node lib/cli -s -e json-schema-draft-04 -V test/passes/schema-04.json test/passes/data-04.json && c8 --no-clean node lib/cli -s -e json-schema-draft-07 -V test/passes/schema-07.json test/passes/data-07.json && c8 --no-clean node lib/cli -C test/passes/comments.txt && c8 --no-clean node lib/cli -pS test/passes/strings.txt && c8 --no-clean node lib/cli -M json5 test/passes/json5.text && c8 --no-clean node lib/cli -v && c8 --no-clean node lib/cli -h && c8 --no-clean node lib/cli -Pc test/fails/10.json || c8 --no-clean node lib/cli -f test/.jsonrc.yml 'test/**/*.json' '!**/fails' && c8 report",
     "start": "http-server -c 5",
@@ -74,7 +74,7 @@
   },
   "dependencies": {
     "ajv": "8.12.0",
-    "ajv6": "npm:ajv@6.12.6",
+    "ajv-draft-04": "1.0.0",
     "commander": "10.0.0",
     "cosmiconfig": "8.1.0",
     "diff": "5.1.0",