fix: Replace ajv@6 with ajv-draft-04

Support JSON Schema draft 04 by a more modern package.

Author: prantlf

.ncurc.yml

@@ -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,20 +15,18 @@
     }
     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)
       })
   } 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()

lib/validator.js

@@ -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",

package.json

@@ -4,11 +4,11 @@ import json from '@rollup/plugin-json'
 import { minify } from 'rollup-plugin-swc-minify'
 
 export default {
-  input: 'src/ajv7.js',
+  input: 'src/ajv.js',
   output: {
-    file: 'web/ajv7.min.js',
+    file: 'web/ajv.min.js',
     format: 'umd',
-    name: 'ajv7',
+    name: 'ajv',
     sourcemap: true,
     plugins: [minify()]
   },

pnpm-lock.yaml

@@ -1,9 +1,9 @@
+import Ajv04 from 'ajv-draft-04'
 import Ajv07 from 'ajv'
 import AjvJTD from 'ajv/dist/jtd'
 import Ajv2019 from 'ajv/dist/2019'
 import Ajv2020 from 'ajv/dist/2020'
 
-import Schema04 from 'ajv6/lib/refs/json-schema-draft-04.json'
 import Schema06 from 'ajv/dist/refs/json-schema-draft-06.json'
 
-export { Ajv07, AjvJTD, Ajv2019, Ajv2020, Schema04, Schema06 }
+export { Ajv04, Ajv07, AjvJTD, Ajv2019, Ajv2020, Schema06 }

rollup.config.mjs

@@ -329,3 +329,10 @@ test('test schema validation failure', function () {
     validate(data, { ignoreComments: !nativeParser })
   }, 'should throw error')
 })
+
+test('test JSON Type Definitions validation success', function () {
+  const data = fs.readFileSync(path.join(__dirname, '/passes/data-jtd.json')).toString()
+  const schema = fs.readFileSync(path.join(__dirname, '/passes/schema-jtd.json')).toString()
+  const validate = validator.compile(schema, { environment: 'jtd' })
+  assert.doesNotThrow(function () { validate(parse(data)) }, 'should pass')
+})

src/ajv7.js src/ajv.jssrc/ajv7.js renamed to src/ajv.js

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
-  "title": "Schema for 3.json",
+  "title": "Schema for data-04.json",
   "properties": {
     "JSON Test Pattern pass3": {
       "type": "object",

test/parse1.js

@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "title": "Schema for 4.json",
+  "title": "Schema for data-07.json",
   "properties": {
     "test": {
       "type": "string",

test/passes/schema-04.json

@@ -1,8 +1,8 @@
 import tehanu from 'tehanu'
 import { strict as assert } from 'assert'
-import { parse } from '../lib/jsonlint'
-import { compile } from '../lib/validator'
-import { print } from '../lib/printer'
+import { parse } from '../lib/jsonlint.js'
+import { compile } from '../lib/validator.js'
+import { print } from '../lib/printer.js'
 
 const test = tehanu(import.meta.url)